diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-12 13:40:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 13:40:23 +0000 |
| commit | 5d61cc77c592d1cf56a71ac9891b210c860b2bae (patch) | |
| tree | 0b682ed612b9914c6d1909dd133a68ace007ef0e /services/audiopolicy/AudioPolicyManager.h | |
| parent | 105e6e0c38947e97f9e199d9f07f9be64ae3cfe1 (diff) | |
| parent | d7986933bcf0b327bc260312b0ff0f83431a158b (diff) | |
| download | frameworks_av-5d61cc77c592d1cf56a71ac9891b210c860b2bae.zip frameworks_av-5d61cc77c592d1cf56a71ac9891b210c860b2bae.tar.gz frameworks_av-5d61cc77c592d1cf56a71ac9891b210c860b2bae.tar.bz2 | |
am d7986933: am 0cbeaf83: am 8cffa91a: Merge "audio policy: suppport for dynamic source" into lmp-mr1-dev
* commit 'd7986933bcf0b327bc260312b0ff0f83431a158b':
audio policy: suppport for dynamic source
Diffstat (limited to 'services/audiopolicy/AudioPolicyManager.h')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index 3eef8fe..9ec3557 100644 --- a/services/audiopolicy/AudioPolicyManager.h +++ b/services/audiopolicy/AudioPolicyManager.h @@ -497,7 +497,7 @@ protected: uint32_t mLatency; // audio_output_flags_t mFlags; // audio_devices_t mDevice; // current device this output is routed to - String8 mPolicyMixAddress; // non empty or "0" when used by a dynamic policy + AudioMix *mPolicyMix; // non NULL when used by a dynamic policy audio_patch_handle_t mPatchHandle; uint32_t mRefCount[AUDIO_STREAM_CNT]; // number of streams of each type using this output nsecs_t mStopTime[AUDIO_STREAM_CNT]; @@ -523,6 +523,7 @@ protected: audio_port_handle_t mId; audio_io_handle_t mIoHandle; // input handle audio_devices_t mDevice; // current device this input is routed to + AudioMix *mPolicyMix; // non NULL when used by a dynamic policy audio_patch_handle_t mPatchHandle; uint32_t mRefCount; // number of AudioRecord clients using // this input @@ -530,9 +531,7 @@ protected: audio_source_t mInputSource; // input source selected by application //(mediarecorder.h) const sp<IOProfile> mProfile; // I/O profile this output derives from - // audio sessions attached to this input and the - // corresponding device address - DefaultKeyedVector<audio_session_t, String8> mSessions; + SortedVector<audio_session_t> mSessions; // audio sessions attached to this input bool mIsSoundTrigger; // used by a soundtrigger capture virtual void toAudioPortConfig(struct audio_port_config *dstConfig, @@ -612,7 +611,7 @@ protected: // select input device corresponding to requested audio source virtual audio_devices_t getDeviceForInputSource(audio_source_t inputSource, - String8 *address = NULL); + AudioMix **policyMix = NULL); // return io handle of active input or 0 if no input is active // Only considers inputs from physical devices (e.g. main mic, headset mic) when |