diff options
| author | Eric Laurent <elaurent@google.com> | 2014-07-28 20:56:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-25 21:16:23 +0000 |
| commit | 03524dcc1215b2c468f5c8c8abe6f1c26239fd71 (patch) | |
| tree | c168e631ce77c50e6627ed783a98f33f901420cb /services/audioflinger/AudioFlinger.h | |
| parent | 7d70c5e5fe787ae5d7af8830864d208749d6337f (diff) | |
| parent | cf2c0210c8afbe7d0661ccbbae3835b5ce73c0bf (diff) | |
| download | frameworks_av-03524dcc1215b2c468f5c8c8abe6f1c26239fd71.zip frameworks_av-03524dcc1215b2c468f5c8c8abe6f1c26239fd71.tar.gz frameworks_av-03524dcc1215b2c468f5c8c8abe6f1c26239fd71.tar.bz2 | |
Merge "AudioFlinger: update openInput() and openOutput()" into lmp-dev
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index ab4c567..754273d 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -158,14 +158,13 @@ public: virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, audio_channel_mask_t channelMask) const; - 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_output_flags_t flags, - const audio_offload_info_t *offloadInfo); + virtual status_t openOutput(audio_module_handle_t module, + audio_io_handle_t *output, + audio_config_t *config, + audio_devices_t *devices, + const String8& address, + uint32_t *latencyMs, + audio_output_flags_t flags); virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1, audio_io_handle_t output2); @@ -176,12 +175,13 @@ public: virtual status_t restoreOutput(audio_io_handle_t output); - 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, - audio_input_flags_t flags); + virtual status_t openInput(audio_module_handle_t module, + audio_io_handle_t *input, + audio_config_t *config, + audio_devices_t *device, + const String8& address, + audio_source_t source, + audio_input_flags_t flags); virtual status_t closeInput(audio_io_handle_t input); @@ -515,12 +515,17 @@ private: MixerThread *checkMixerThread_l(audio_io_handle_t output) const; RecordThread *checkRecordThread_l(audio_io_handle_t input) const; sp<RecordThread> openInput_l(audio_module_handle_t module, + audio_io_handle_t *input, + audio_config_t *config, audio_devices_t device, - struct audio_config *config, + const String8& address, + audio_source_t source, audio_input_flags_t flags); sp<PlaybackThread> openOutput_l(audio_module_handle_t module, - audio_devices_t device, - struct audio_config *config, + audio_io_handle_t *output, + audio_config_t *config, + audio_devices_t devices, + const String8& address, audio_output_flags_t flags); void closeOutputFinish(sp<PlaybackThread> thread); |