DO NOT MERGE: audiopolicy: Remove raw pointer references to AudioMix (addeb8ea) · Commits · e / os / android_frameworks_av

services/audiopolicy/common/managerdefinitions/include/AudioInputDescriptor.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		namespace android {

		class IOProfile;
		class AudioMix;
		class AudioPolicyMix;

		// descriptor for audio inputs. Used to maintain current configuration of each opened audio input
		// and keep track of the usage of this input.
		@@ -44,7 +44,7 @@ public:

		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
		wp<AudioPolicyMix> mPolicyMix; // non NULL when used by a dynamic policy
		const sp<IOProfile> mProfile; // I/O profile this output derives from

		virtual void toAudioPortConfig(struct audio_port_config *dstConfig,

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		namespace android {

		class IOProfile;
		class AudioMix;
		class AudioPolicyMix;
		class AudioPolicyClientInterface;
		class DeviceDescriptor;

		@@ -126,7 +126,7 @@ public:
		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
		wp<AudioPolicyMix> mPolicyMix; // non NULL when used by a dynamic policy
		sp<SwAudioOutputDescriptor> mOutput1; // used by duplicated outputs: first output
		sp<SwAudioOutputDescriptor> mOutput2; // used by duplicated outputs: second output
		uint32_t mDirectOpenCount; // number of clients using this output (direct outputs only)

+6 −9

Original line number	Diff line number	Diff line
		@@ -29,9 +29,11 @@ class SwAudioOutputDescriptor;
		/**
		* custom mix entry in mPolicyMixes
		*/
		class AudioPolicyMix : public RefBase {
		class AudioPolicyMix : public AudioMix, public RefBase {
		public:
		AudioPolicyMix() {}
		AudioPolicyMix(const AudioMix &mix);
		AudioPolicyMix(const AudioPolicyMix&) = delete;
		AudioPolicyMix& operator=(const AudioPolicyMix&) = delete;

		const sp<SwAudioOutputDescriptor> &getOutput() const;

		@@ -39,14 +41,9 @@ public:

		void clearOutput();

		android::AudioMix *getMix();

		void setMix(AudioMix &mix);

		status_t dump(int fd, int spaces, int index) const;

		private:
		AudioMix mMix; // Audio policy mix descriptor
		sp<SwAudioOutputDescriptor> mOutput; // Corresponding output stream
		};

		@@ -76,9 +73,9 @@ public:

		audio_devices_t getDeviceAndMixForInputSource(audio_source_t inputSource,
		audio_devices_t availableDeviceTypes,
		AudioMix **policyMix);
		sp<AudioPolicyMix> *policyMix);

		status_t getInputMixForAttr(audio_attributes_t attr, AudioMix **policyMix);
		status_t getInputMixForAttr(audio_attributes_t attr, sp<AudioPolicyMix> *policyMix);

		status_t dump(int fd) const;
		};

+3 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		namespace android {

		class AudioPolicyClientInterface;
		class AudioPolicyMix;

		class AudioSession : public RefBase, public AudioSessionInfoUpdateListener
		{
		@@ -39,7 +40,7 @@ public:
		audio_input_flags_t flags,
		uid_t uid,
		bool isSoundTrigger,
		AudioMix* policyMix,
		const sp<AudioPolicyMix> &policyMix,
		AudioPolicyClientInterface *clientInterface);

		status_t dump(int fd, int spaces, int index) const;
		@@ -73,7 +74,7 @@ private:
		bool mIsSoundTrigger;
		uint32_t mOpenCount;
		uint32_t mActiveCount;
		AudioMix* mPolicyMix; // non NULL when used by a dynamic policy
		wp<AudioPolicyMix> mPolicyMix; // non NULL when used by a dynamic policy
		AudioPolicyClientInterface* mClientInterface;
		const AudioSessionInfoProvider* mInfoProvider;
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include "AudioInputDescriptor.h"
		#include "IOProfile.h"
		#include "AudioGain.h"
		#include "AudioPolicyMix.h"
		#include "HwModule.h"
		#include <media/AudioPolicy.h>
		#include <policy.h>