Merge "stagefright: Remove unused hooks from AudioPlayer" (f75474b0) · Commits · e / os / android_frameworks_av

include/media/stagefright/AudioPlayer.h

+1 −19

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@

		#include <media/MediaPlayerInterface.h>
		#include <media/stagefright/MediaBuffer.h>
		#include <media/stagefright/TimeSource.h>
		#include <utils/threads.h>

		namespace android {
		@@ -30,7 +29,7 @@ class AudioTrack;
		struct AwesomePlayer;
		class MediaSource;

		class AudioPlayer : public TimeSource {
		class AudioPlayer {
		public:
		enum {
		REACHED_EOS,
		@@ -53,21 +52,11 @@ public:
		// Caller retains ownership of "source".
		void setSource(const sp<MediaSource> &source);

		// Return time in us.
		virtual int64_t getRealTimeUs();

		status_t start(bool sourceAlreadyStarted = false);

		void pause(bool playPendingSamples = false);
		status_t resume();

		// Returns the timestamp of the last buffer played (in us).
		int64_t getMediaTimeUs();

		// Returns true iff a mapping is established, i.e. the AudioPlayer
		// has played at least one frame of audio.
		bool getMediaTimeMapping(int64_t realtime_us, int64_t mediatime_us);

		status_t seekTo(int64_t time_us);

		bool isSeeking();
		@@ -76,10 +65,7 @@ public:
		status_t setPlaybackRate(const AudioPlaybackRate &rate);
		status_t getPlaybackRate(AudioPlaybackRate rate / nonnull */);

		void notifyAudioEOS();

		private:
		friend class VideoEditorAudioPlayer;
		sp<MediaSource> mSource;
		sp<AudioTrack> mAudioTrack;

		@@ -108,7 +94,6 @@ private:
		MediaBuffer *mFirstBuffer;

		sp<MediaPlayerBase::AudioSink> mAudioSink;
		int64_t mPinnedTimeUs;

		bool mPlaying;
		int64_t mStartPosUs;
		@@ -124,11 +109,8 @@ private:

		size_t fillBuffer(void *data, size_t size);

		int64_t getRealTimeUsLocked() const;

		void reset();

		uint32_t getNumFramesPendingPlayout() const;
		int64_t getOutputPlayPositionUs_l();

		bool allowDeepBuffering() const { return (mCreateFlags & ALLOW_DEEP_BUFFERING) != 0; }

media/libstagefright/AudioPlayer.cpp

+0 −122

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ AudioPlayer::AudioPlayer(
		mFirstBufferResult(OK),
		mFirstBuffer(NULL),
		mAudioSink(audioSink),
		mPinnedTimeUs(-1ll),
		mPlaying(false),
		mStartPosUs(0),
		mCreateFlags(flags) {
		@@ -252,7 +251,6 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) {

		mStarted = true;
		mPlaying = true;
		mPinnedTimeUs = -1ll;

		return OK;
		}
		@@ -275,8 +273,6 @@ void AudioPlayer::pause(bool playPendingSamples) {
		} else {
		mAudioTrack->pause();
		}

		mPinnedTimeUs = ALooper::GetNowUs();
		}

		mPlaying = false;
		@@ -382,11 +378,6 @@ void AudioPlayer::AudioCallback(int event, void user, void info) {
		static_cast<AudioPlayer *>(user)->AudioCallback(event, info);
		}

		bool AudioPlayer::isSeeking() {
		Mutex::Autolock autoLock(mLock);
		return mSeeking;
		}

		bool AudioPlayer::reachedEOS(status_t *finalStatus) {
		*finalStatus = OK;

		@@ -395,10 +386,6 @@ bool AudioPlayer::reachedEOS(status_t *finalStatus) {
		return mReachedEOS;
		}

		void AudioPlayer::notifyAudioEOS() {
		ALOGV("AudioPlayer@0x%p notifyAudioEOS", this);
		}

		status_t AudioPlayer::setPlaybackRate(const AudioPlaybackRate &rate) {
		if (mAudioSink.get() != NULL) {
		return mAudioSink->setPlaybackRate(rate);
		@@ -434,7 +421,6 @@ size_t AudioPlayer::AudioSinkCallback(
		case MediaPlayerBase::AudioSink::CB_EVENT_STREAM_END:
		ALOGV("AudioSinkCallback: stream end");
		me->mReachedEOS = true;
		me->notifyAudioEOS();
		break;

		case MediaPlayerBase::AudioSink::CB_EVENT_TEAR_DOWN:
		@@ -457,31 +443,10 @@ void AudioPlayer::AudioCallback(int event, void *info) {

		case AudioTrack::EVENT_STREAM_END:
		mReachedEOS = true;
		notifyAudioEOS();
		break;
		}
		}

		uint32_t AudioPlayer::getNumFramesPendingPlayout() const {
		uint32_t numFramesPlayedOut;
		status_t err;

		if (mAudioSink != NULL) {
		err = mAudioSink->getPosition(&numFramesPlayedOut);
		} else {
		err = mAudioTrack->getPosition(&numFramesPlayedOut);
		}

		if (err != OK \|\| mNumFramesPlayed < numFramesPlayedOut) {
		return 0;
		}

		// mNumFramesPlayed is the number of frames submitted
		// to the audio sink for playback, but not all of them
		// may have played out by now.
		return mNumFramesPlayed - numFramesPlayedOut;
		}

		size_t AudioPlayer::fillBuffer(void *data, size_t size) {
		if (mNumFramesPlayed == 0) {
		ALOGV("AudioCallback");
		@@ -631,50 +596,11 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) {
		Mutex::Autolock autoLock(mLock);
		mNumFramesPlayed += size_done / mFrameSize;
		mNumFramesPlayedSysTimeUs = ALooper::GetNowUs();

		if (mReachedEOS) {
		mPinnedTimeUs = mNumFramesPlayedSysTimeUs;
		} else {
		mPinnedTimeUs = -1ll;
		}
		}

		return size_done;
		}

		int64_t AudioPlayer::getRealTimeUs() {
		Mutex::Autolock autoLock(mLock);
		if (useOffload()) {
		if (mSeeking) {
		return mSeekTimeUs;
		}
		mPositionTimeRealUs = getOutputPlayPositionUs_l();
		return mPositionTimeRealUs;
		}

		return getRealTimeUsLocked();
		}

		int64_t AudioPlayer::getRealTimeUsLocked() const {
		CHECK(mStarted);
		CHECK_NE(mSampleRate, 0);
		int64_t result = -mLatencyUs + (mNumFramesPlayed * 1000000) / mSampleRate;

		// Compensate for large audio buffers, updates of mNumFramesPlayed
		// are less frequent, therefore to get a "smoother" notion of time we
		// compensate using system time.
		int64_t diffUs;
		if (mPinnedTimeUs >= 0ll) {
		diffUs = mPinnedTimeUs;
		} else {
		diffUs = ALooper::GetNowUs();
		}

		diffUs -= mNumFramesPlayedSysTimeUs;

		return result + diffUs;
		}

		int64_t AudioPlayer::getOutputPlayPositionUs_l()
		{
		uint32_t playedSamples = 0;
		@@ -703,54 +629,6 @@ int64_t AudioPlayer::getOutputPlayPositionUs_l()
		return renderedDuration;
		}

		int64_t AudioPlayer::getMediaTimeUs() {
		Mutex::Autolock autoLock(mLock);

		if (useOffload()) {
		if (mSeeking) {
		return mSeekTimeUs;
		}
		if (mReachedEOS) {
		int64_t durationUs;
		mSource->getFormat()->findInt64(kKeyDuration, &durationUs);
		return durationUs;
		}
		mPositionTimeRealUs = getOutputPlayPositionUs_l();
		ALOGV("getMediaTimeUs getOutputPlayPositionUs_l() mPositionTimeRealUs %" PRId64,
		mPositionTimeRealUs);
		return mPositionTimeRealUs;
		}


		if (mPositionTimeMediaUs < 0 \|\| mPositionTimeRealUs < 0) {
		// mSeekTimeUs is either seek time while seeking or 0 if playback did not start.
		return mSeekTimeUs;
		}

		int64_t realTimeOffset = getRealTimeUsLocked() - mPositionTimeRealUs;
		if (realTimeOffset < 0) {
		realTimeOffset = 0;
		}

		return mPositionTimeMediaUs + realTimeOffset;
		}

		bool AudioPlayer::getMediaTimeMapping(
		int64_t realtime_us, int64_t mediatime_us) {
		Mutex::Autolock autoLock(mLock);

		if (useOffload()) {
		mPositionTimeRealUs = getOutputPlayPositionUs_l();
		*realtime_us = mPositionTimeRealUs;
		*mediatime_us = mPositionTimeRealUs;
		} else {
		*realtime_us = mPositionTimeRealUs;
		*mediatime_us = mPositionTimeMediaUs;
		}

		return mPositionTimeRealUs != -1 && mPositionTimeMediaUs != -1;
		}

		status_t AudioPlayer::seekTo(int64_t time_us) {
		Mutex::Autolock autoLock(mLock);