Merge "Use audio_stream_type_t consistently" (3c6b9cca) · Commits · e / os / android_frameworks_base

core/jni/android_media_AudioSystem.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ static jboolean
		android_media_AudioSystem_isStreamActive(JNIEnv *env, jobject thiz, jint stream, jint inPastMs)
		{
		bool state = false;
		AudioSystem::isStreamActive(stream, &state, inPastMs);
		AudioSystem::isStreamActive((audio_stream_type_t) stream, &state, inPastMs);
		return state;
		}

core/jni/android_media_AudioTrack.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ class AudioTrackJniStorage {
		sp<MemoryHeapBase> mMemHeap;
		sp<MemoryBase> mMemBase;
		audiotrack_callback_cookie mCallbackData;
		int mStreamType;
		audio_stream_type_t mStreamType;

		AudioTrackJniStorage() {
		mCallbackData.audioTrack_class = 0;
		@@ -175,11 +175,11 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th
		int afSampleRate;
		int afFrameCount;

		if (AudioSystem::getOutputFrameCount(&afFrameCount, streamType) != NO_ERROR) {
		if (AudioSystem::getOutputFrameCount(&afFrameCount, (audio_stream_type_t) streamType) != NO_ERROR) {
		ALOGE("Error creating AudioTrack: Could not get AudioSystem frame count.");
		return AUDIOTRACK_ERROR_SETUP_AUDIOSYSTEM;
		}
		if (AudioSystem::getOutputSamplingRate(&afSampleRate, streamType) != NO_ERROR) {
		if (AudioSystem::getOutputSamplingRate(&afSampleRate, (audio_stream_type_t) streamType) != NO_ERROR) {
		ALOGE("Error creating AudioTrack: Could not get AudioSystem sampling rate.");
		return AUDIOTRACK_ERROR_SETUP_AUDIOSYSTEM;
		}

core/jni/android_media_ToneGenerator.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ static void android_media_ToneGenerator_release(JNIEnv *env, jobject thiz) {

		static void android_media_ToneGenerator_native_setup(JNIEnv *env, jobject thiz,
		jint streamType, jint volume) {
		ToneGenerator *lpToneGen = new ToneGenerator(streamType, AudioSystem::linearToLog(volume), true);
		ToneGenerator *lpToneGen = new ToneGenerator((audio_stream_type_t) streamType, AudioSystem::linearToLog(volume), true);

		env->SetIntField(thiz, fields.context, 0);

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;