diff options
| author | Eric Laurent <elaurent@google.com> | 2012-03-29 10:12:40 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-04-04 08:44:57 -0700 |
| commit | a4c5a550e2a3bc237179b8684e51718e05894492 (patch) | |
| tree | be7b6d154763ed772738a0126d10e6317920767d /include/media/IAudioFlinger.h | |
| parent | 1a9ed11a472493cac7f6dfcbfac2064526a493ed (diff) | |
| download | frameworks_av-a4c5a550e2a3bc237179b8684e51718e05894492.zip frameworks_av-a4c5a550e2a3bc237179b8684e51718e05894492.tar.gz frameworks_av-a4c5a550e2a3bc237179b8684e51718e05894492.tar.bz2 | |
audio policy: load audio hw modules.
Audio HW modules are now loaded upon request from audio policy manager
according to the configuration in audio_policy.conf.
Removed hard coded HW module loading by AudioFlinger at init time.
Added methods to IAudioFlinger and AudioPolicyInterface
to control the loading of audio HW modules.
Added methods to open an output or input stream on a specific hw module.
Change-Id: I361b294ece1a9b56b2fb39cc64259dbb73b804f4
Diffstat (limited to 'include/media/IAudioFlinger.h')
| -rw-r--r-- | include/media/IAudioFlinger.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 8239b0e..9e938d1 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -29,6 +29,7 @@ #include <media/IAudioFlingerClient.h> #include <system/audio.h> #include <system/audio_policy.h> +#include <hardware/audio_policy.h> #include <hardware/audio_effect.h> #include <media/IEffect.h> #include <media/IEffectClient.h> @@ -126,23 +127,24 @@ public: // retrieve the audio recording buffer size virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) const = 0; - virtual audio_io_handle_t openOutput(uint32_t *pDevices, - uint32_t *pSamplingRate, - audio_format_t *pFormat, - uint32_t *pChannels, - uint32_t *pLatencyMs, - audio_policy_output_flags_t flags) = 0; + virtual audio_io_handle_t openOutput(audio_module_handle_t module, + audio_devices_t *pDevices, + uint32_t *pSamplingRate, + audio_format_t *pFormat, + audio_channel_mask_t *pChannelMask, + uint32_t *pLatencyMs, + audio_policy_output_flags_t flags) = 0; virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1, audio_io_handle_t output2) = 0; virtual status_t closeOutput(audio_io_handle_t output) = 0; virtual status_t suspendOutput(audio_io_handle_t output) = 0; virtual status_t restoreOutput(audio_io_handle_t output) = 0; - virtual audio_io_handle_t openInput(uint32_t *pDevices, - uint32_t *pSamplingRate, - audio_format_t *pFormat, - uint32_t *pChannels, - audio_in_acoustics_t acoustics) = 0; + virtual audio_io_handle_t openInput(audio_module_handle_t module, + audio_devices_t *pDevices, + uint32_t *pSamplingRate, + audio_format_t *pFormat, + audio_channel_mask_t *pChannelMask) = 0; virtual status_t closeInput(audio_io_handle_t input) = 0; virtual status_t setStreamOutput(audio_stream_type_t stream, audio_io_handle_t output) = 0; @@ -178,6 +180,8 @@ public: virtual status_t moveEffects(int session, audio_io_handle_t srcOutput, audio_io_handle_t dstOutput) = 0; + + virtual audio_module_handle_t loadHwModule(const char *name) = 0; }; |