Merge "Use audio_stream_type_t consistently" (0107954f) · Commits · e / os / android_frameworks_av

include/media/AudioSystem.h

+10 −10

Original line number	Diff line number	Diff line
		@@ -55,19 +55,19 @@ public:
		static status_t getMasterMute(bool* mute);

		// set/get stream volume on specified output
		static status_t setStreamVolume(int stream, float value, int output);
		static status_t getStreamVolume(int stream, float* volume, int output);
		static status_t setStreamVolume(audio_stream_type_t stream, float value, int output);
		static status_t getStreamVolume(audio_stream_type_t stream, float* volume, int output);

		// mute/unmute stream
		static status_t setStreamMute(int stream, bool mute);
		static status_t getStreamMute(int stream, bool* mute);
		static status_t setStreamMute(audio_stream_type_t stream, bool mute);
		static status_t getStreamMute(audio_stream_type_t stream, bool* mute);

		// set audio mode in audio hardware (see audio_mode_t)
		static status_t setMode(int mode);

		// returns true in *state if tracks are active on the specified stream or has been active
		// in the past inPastMs milliseconds
		static status_t isStreamActive(int stream, bool *state, uint32_t inPastMs = 0);
		static status_t isStreamActive(audio_stream_type_t stream, bool *state, uint32_t inPastMs = 0);

		// set/get audio hardware parameters. The function accepts a list of parameters
		// key value pairs in the form: key1=value1;key2=value2;...
		@@ -83,11 +83,11 @@ public:
		static float linearToLog(int volume);
		static int logToLinear(float volume);

		static status_t getOutputSamplingRate(int* samplingRate, int stream = AUDIO_STREAM_DEFAULT);
		static status_t getOutputFrameCount(int* frameCount, int stream = AUDIO_STREAM_DEFAULT);
		static status_t getOutputLatency(uint32_t* latency, int stream = AUDIO_STREAM_DEFAULT);
		static status_t getOutputSamplingRate(int* samplingRate, audio_stream_type_t stream = AUDIO_STREAM_DEFAULT);
		static status_t getOutputFrameCount(int* frameCount, audio_stream_type_t stream = AUDIO_STREAM_DEFAULT);
		static status_t getOutputLatency(uint32_t* latency, audio_stream_type_t stream = AUDIO_STREAM_DEFAULT);

		static bool routedToA2dpOutput(int streamType);
		static bool routedToA2dpOutput(audio_stream_type_t streamType);

		static status_t getInputBufferSize(uint32_t sampleRate, int format, int channelCount,
		size_t* buffSize);
		@@ -103,7 +103,7 @@ public:
		// - BAD_VALUE: invalid parameter
		// NOTE: this feature is not supported on all hardware platforms and it is
		// necessary to check returned status before using the returned values.
		static status_t getRenderPosition(uint32_t halFrames, uint32_t dspFrames, int stream = AUDIO_STREAM_DEFAULT);
		static status_t getRenderPosition(uint32_t halFrames, uint32_t dspFrames, audio_stream_type_t stream = AUDIO_STREAM_DEFAULT);

		static unsigned int getInputFramesLost(audio_io_handle_t ioHandle);

include/media/AudioTrack.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ public:
		*/

		static status_t getMinFrameCount(int* frameCount,
		int streamType =-1,
		audio_stream_type_t streamType = AUDIO_STREAM_DEFAULT,
		uint32_t sampleRate = 0);

		/* Constructs an uninitialized AudioTrack. No connection with
		@@ -142,7 +142,7 @@ public:
		* sessionId: Specific session ID, or zero to use default.
		*/

		AudioTrack( int streamType,
		AudioTrack( audio_stream_type_t streamType,
		uint32_t sampleRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		@@ -162,7 +162,7 @@ public:
		* EVENT_UNDERRUN event.
		*/

		AudioTrack( int streamType,
		AudioTrack( audio_stream_type_t streamType,
		uint32_t sampleRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		@@ -186,7 +186,7 @@ public:
		* - BAD_VALUE: invalid parameter (channels, format, sampleRate...)
		* - NO_INIT: audio server or audio hardware not initialized
		* */
		status_t set(int streamType =-1,
		status_t set(audio_stream_type_t streamType = AUDIO_STREAM_DEFAULT,
		uint32_t sampleRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		int channelMask = 0,
		@@ -215,7 +215,7 @@ public:

		/* getters, see constructor */

		int streamType() const;
		audio_stream_type_t streamType() const;
		audio_format_t format() const;
		int channelCount() const;
		uint32_t frameCount() const;
		@@ -433,7 +433,7 @@ private:
		};

		bool processAudioBuffer(const sp<AudioTrackThread>& thread);
		status_t createTrack_l(int streamType,
		status_t createTrack_l(audio_stream_type_t streamType,
		uint32_t sampleRate,
		audio_format_t format,
		uint32_t channelMask,
		@@ -458,7 +458,7 @@ private:

		audio_track_cblk_t* mCblk;
		audio_format_t mFormat;
		uint8_t mStreamType;
		audio_stream_type_t mStreamType;
		uint8_t mChannelCount;
		uint8_t mMuted;
		uint8_t mReserved;

include/media/IAudioFlinger.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public:
		*/
		virtual sp<IAudioTrack> createTrack(
		pid_t pid,
		int streamType,
		audio_stream_type_t streamType,
		uint32_t sampleRate,
		uint32_t format,
		uint32_t channelMask,
		@@ -89,11 +89,11 @@ public:
		/* set/get stream type state. This will probably be used by
		* the preference panel, mostly.
		*/
		virtual status_t setStreamVolume(int stream, float value, int output) = 0;
		virtual status_t setStreamMute(int stream, bool muted) = 0;
		virtual status_t setStreamVolume(audio_stream_type_t stream, float value, int output) = 0;
		virtual status_t setStreamMute(audio_stream_type_t stream, bool muted) = 0;

		virtual float streamVolume(int stream, int output) const = 0;
		virtual bool streamMute(int stream) const = 0;
		virtual float streamVolume(audio_stream_type_t stream, int output) const = 0;
		virtual bool streamMute(audio_stream_type_t stream) const = 0;

		// set audio mode
		virtual status_t setMode(int mode) = 0;
		@@ -129,7 +129,7 @@ public:
		uint32_t acoustics) = 0;
		virtual status_t closeInput(int input) = 0;

		virtual status_t setStreamOutput(uint32_t stream, int output) = 0;
		virtual status_t setStreamOutput(audio_stream_type_t stream, int output) = 0;

		virtual status_t setVoiceVolume(float volume) = 0;

include/media/IAudioPolicyService.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ public:
		int id) = 0;
		virtual status_t unregisterEffect(int id) = 0;
		virtual status_t setEffectEnabled(int id, bool enabled) = 0;
		virtual bool isStreamActive(int stream, uint32_t inPastMs = 0) const = 0;
		virtual bool isStreamActive(audio_stream_type_t stream, uint32_t inPastMs = 0) const = 0;
		virtual status_t queryDefaultPreProcessing(int audioSession,
		effect_descriptor_t *descriptors,
		uint32_t *count) = 0;

include/media/IMediaPlayer.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <binder/IInterface.h>
		#include <binder/Parcel.h>
		#include <utils/KeyedVector.h>
		#include <system/audio.h>

		namespace android {

		@@ -51,7 +52,7 @@ public:
		virtual status_t getCurrentPosition(int* msec) = 0;
		virtual status_t getDuration(int* msec) = 0;
		virtual status_t reset() = 0;
		virtual status_t setAudioStreamType(int type) = 0;
		virtual status_t setAudioStreamType(audio_stream_type_t type) = 0;
		virtual status_t setLooping(int loop) = 0;
		virtual status_t setVolume(float leftVolume, float rightVolume) = 0;
		virtual status_t setAuxEffectSendLevel(float level) = 0;