rename audio policy output flags (0ca3cf94) · Commits · e / os / android_frameworks_av

include/media/AudioSystem.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ public:
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		uint32_t channels = AUDIO_CHANNEL_OUT_STEREO,
		audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE);
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE);
		static status_t startOutput(audio_io_handle_t output,
		audio_stream_type_t stream,
		int session = 0);

include/media/AudioTrack.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ public:
		* latency of the track. The actual size selected by the AudioTrack could be
		* larger if the requested size is not compatible with current audio HAL
		* latency.
		* flags: See comments on audio_policy_output_flags_t in <system/audio_policy.h>.
		* flags: See comments on audio_output_flags_t in <system/audio.h>.
		* cbf: Callback function. If not null, this function is called periodically
		* to request new PCM data.
		* user: Context for use by the callback receiver.
		@@ -155,7 +155,7 @@ public:
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		int frameCount = 0,
		audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE,
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		@@ -167,7 +167,7 @@ public:
		int format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		int frameCount = 0,
		uint32_t flags = (uint32_t) AUDIO_POLICY_OUTPUT_FLAG_NONE,
		uint32_t flags = (uint32_t) AUDIO_OUTPUT_FLAG_NONE,
		callback_t cbf = 0,
		void* user = 0,
		int notificationFrames = 0,
		@@ -187,7 +187,7 @@ public:
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		const sp<IMemory>& sharedBuffer = 0,
		audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE,
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		@@ -211,7 +211,7 @@ public:
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		int frameCount = 0,
		audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE,
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		@@ -476,7 +476,7 @@ protected:
		audio_format_t format,
		uint32_t channelMask,
		int frameCount,
		audio_policy_output_flags_t flags,
		audio_output_flags_t flags,
		const sp<IMemory>& sharedBuffer,
		audio_io_handle_t output);
		void flush_l();
		@@ -517,7 +517,7 @@ protected:
		uint32_t mNewPosition;
		uint32_t mUpdatePeriod;
		bool mFlushed; // FIXME will be made obsolete by making flush() synchronous
		audio_policy_output_flags_t mFlags;
		audio_output_flags_t mFlags;
		int mSessionId;
		int mAuxEffectId;
		mutable Mutex mLock;

include/media/IAudioFlinger.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public:
		audio_format_t *pFormat,
		audio_channel_mask_t *pChannelMask,
		uint32_t *pLatencyMs,
		audio_policy_output_flags_t flags) = 0;
		audio_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;

include/media/IAudioPolicyService.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public:
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		uint32_t channels = 0,
		audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE) = 0;
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE) = 0;
		virtual status_t startOutput(audio_io_handle_t output,
		audio_stream_type_t stream,
		int session = 0) = 0;

libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,7 @@ status_t VideoEditorAudioPlayer::start(bool sourceAlreadyStarted) {
		(numChannels == 2)
		? AUDIO_CHANNEL_OUT_STEREO
		: AUDIO_CHANNEL_OUT_MONO,
		0, AUDIO_POLICY_OUTPUT_FLAG_NONE, &AudioCallback, this, 0);
		0, AUDIO_OUTPUT_FLAG_NONE, &AudioCallback, this, 0);

		if ((err = mAudioTrack->initCheck()) != OK) {
		delete mAudioTrack;