From 70c236c9290732782d5267935af1475b8d5ae602 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 28 Mar 2012 11:27:13 -0700 Subject: audio policy: load audio hw modules Audio hw modules are now loaded according to configuration data read from audio_policy.conf. They are not loaded anymore from a hardcoded list in AudiFlinger. Output and input streams are opened on the hw module by which they are exposed. Also removed obsolete "acoustics" flags for input streams. Change-Id: I8dc658cc83890d3ac7d5e36c372a03732aa5b0c4 --- audio/AudioPolicyCompatClient.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'audio/AudioPolicyCompatClient.h') diff --git a/audio/AudioPolicyCompatClient.h b/audio/AudioPolicyCompatClient.h index 99dd639..b0fdb91 100644 --- a/audio/AudioPolicyCompatClient.h +++ b/audio/AudioPolicyCompatClient.h @@ -35,22 +35,25 @@ public: void *service) : mServiceOps(serviceOps) , mService(service) {} - virtual audio_io_handle_t openOutput(uint32_t *pDevices, + virtual audio_module_handle_t loadHwModule(const char *moduleName); + + virtual audio_io_handle_t openOutput(audio_module_handle_t module, + audio_devices_t *pDevices, uint32_t *pSamplingRate, - uint32_t *pFormat, - uint32_t *pChannels, + audio_format_t *pFormat, + audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - AudioSystem::output_flags flags); + audio_policy_output_flags_t flags); virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1, audio_io_handle_t output2); virtual status_t closeOutput(audio_io_handle_t output); virtual status_t suspendOutput(audio_io_handle_t output); virtual status_t restoreOutput(audio_io_handle_t output); - virtual audio_io_handle_t openInput(uint32_t *pDevices, + virtual audio_io_handle_t openInput(audio_module_handle_t module, + audio_devices_t *pDevices, uint32_t *pSamplingRate, - uint32_t *pFormat, - uint32_t *pChannels, - audio_in_acoustics_t acoustics); + audio_format_t *pFormat, + audio_channel_mask_t *pChannelMask); virtual status_t closeInput(audio_io_handle_t input); virtual status_t setStreamOutput(AudioSystem::stream_type stream, audio_io_handle_t output); virtual status_t moveEffects(int session, -- cgit v1.2.3