Merge "Remove stream type from AudioSystem::getRenderPosition()" (b8f8d231) · Commits · e / os / android_frameworks_av

include/media/AudioSystem.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -124,8 +124,7 @@ public:
		static status_t setVoiceVolume(float volume);

		// return the number of audio frames written by AudioFlinger to audio HAL and
		// audio dsp to DAC since the output on which the specified stream is playing
		// has exited standby.
		// audio dsp to DAC since the specified output I/O handle has exited standby.
		// returned status (from utils/Errors.h) can be:
		// - NO_ERROR: successful operation, halFrames and dspFrames point to valid data
		// - INVALID_OPERATION: Not supported on current hardware platform
		@@ -134,8 +133,7 @@ public:
		// necessary to check returned status before using the returned values.
		static status_t getRenderPosition(audio_io_handle_t output,
		uint32_t *halFrames,
		uint32_t *dspFrames,
		audio_stream_type_t stream = AUDIO_STREAM_DEFAULT);
		uint32_t *dspFrames);

		// return the number of input frames lost by HAL implementation, or 0 if the handle is invalid
		static uint32_t getInputFramesLost(audio_io_handle_t ioHandle);

+1 −9

Original line number	Diff line number	Diff line
		@@ -400,19 +400,11 @@ status_t AudioSystem::setVoiceVolume(float value)
		}

		status_t AudioSystem::getRenderPosition(audio_io_handle_t output, uint32_t *halFrames,
		uint32_t *dspFrames, audio_stream_type_t stream)
		uint32_t *dspFrames)
		{
		const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
		if (af == 0) return PERMISSION_DENIED;

		if (stream == AUDIO_STREAM_DEFAULT) {
		stream = AUDIO_STREAM_MUSIC;
		}

		if (output == 0) {
		output = getOutput(stream);
		}

		return af->getRenderPosition(halFrames, dspFrames, output);
		}