diff options
| author | Dhananjay Kumar <dhakumar@codeaurora.org> | 2015-10-20 17:29:24 +0530 |
|---|---|---|
| committer | Dhananjay Kumar <dhakumar@codeaurora.org> | 2015-10-20 19:53:33 +0530 |
| commit | 99a7726b57ec6f2330a6376339fe43002f1fe940 (patch) | |
| tree | 84d69db562bcc6390942aeffa093f1f51ece5c9d /services/audiopolicy | |
| parent | dc8d9caa08290a0907c23c7874bdca8b2d721634 (diff) | |
| download | frameworks_av-99a7726b57ec6f2330a6376339fe43002f1fe940.zip frameworks_av-99a7726b57ec6f2330a6376339fe43002f1fe940.tar.gz frameworks_av-99a7726b57ec6f2330a6376339fe43002f1fe940.tar.bz2 | |
audio policy: move output handle to AudioOutputDescriptor base class
Output handle of AudioOutputDescriptor is required by derived
implementation of some AudioPolicyManager methods.
These methods need to access attributes of an output which is not
accessible through AudioOutputDescriptor base class unless output
handle is made available here.
Change-Id: I96ef9fd1c5a94874acb897245501ba2f9c9ab0c0
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h | 2 | ||||
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h index 50f622d..e1c2999 100644 --- a/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h +++ b/services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h @@ -72,6 +72,7 @@ public: sp<AudioPort> mPort; audio_devices_t mDevice; // current device this output is routed to audio_patch_handle_t mPatchHandle; + audio_io_handle_t mIoHandle; // output handle uint32_t mRefCount[AUDIO_STREAM_CNT]; // number of streams of each type using this output nsecs_t mStopTime[AUDIO_STREAM_CNT]; float mCurVolume[AUDIO_STREAM_CNT]; // current stream volume in dB @@ -116,7 +117,6 @@ public: virtual void toAudioPort(struct audio_port *port) const; const sp<IOProfile> mProfile; // I/O profile this output derives from - audio_io_handle_t mIoHandle; // output handle uint32_t mLatency; // audio_output_flags_t mFlags; // AudioMix *mPolicyMix; // non NULL when used by a dynamic policy diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp index a278375..5ddeaed 100644 --- a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp +++ b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp @@ -33,7 +33,7 @@ namespace android { AudioOutputDescriptor::AudioOutputDescriptor(const sp<AudioPort>& port, AudioPolicyClientInterface *clientInterface) - : mPort(port), mDevice(AUDIO_DEVICE_NONE), + : mPort(port), mDevice(AUDIO_DEVICE_NONE), mIoHandle(0), mPatchHandle(0), mClientInterface(clientInterface), mId(0) { // clear usage count for all stream types @@ -223,7 +223,7 @@ void AudioOutputDescriptor::log(const char* indent) SwAudioOutputDescriptor::SwAudioOutputDescriptor( const sp<IOProfile>& profile, AudioPolicyClientInterface *clientInterface) : AudioOutputDescriptor(profile, clientInterface), - mProfile(profile), mIoHandle(0), mLatency(0), + mProfile(profile), mLatency(0), mFlags((audio_output_flags_t)0), mPolicyMix(NULL), mOutput1(0), mOutput2(0), mDirectOpenCount(0), mGlobalRefCount(0) { |