Merge "Add gapless playback support for NuPlayer" (0513cb39) · Commits · e / os / android_frameworks_av

include/media/MediaPlayerInterface.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -87,8 +87,9 @@ public:
		virtual ssize_t frameSize() const = 0;
		virtual uint32_t latency() const = 0;
		virtual float msecsPerFrame() const = 0;
		virtual status_t getPosition(uint32_t *position) = 0;
		virtual int getSessionId() = 0;
		virtual status_t getPosition(uint32_t *position) const = 0;
		virtual status_t getFramesWritten(uint32_t *frameswritten) const = 0;
		virtual int getSessionId() const = 0;

		// If no callback is specified, use the "write" API below to submit
		// audio data.

libvideoeditor/lvpp/VideoEditorPlayer.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -376,12 +376,19 @@ float VideoEditorPlayer::VeAudioOutput::msecsPerFrame() const
		return mMsecsPerFrame;
		}

		status_t VideoEditorPlayer::VeAudioOutput::getPosition(uint32_t *position) {
		status_t VideoEditorPlayer::VeAudioOutput::getPosition(uint32_t *position) const {

		if (mTrack == 0) return NO_INIT;
		return mTrack->getPosition(position);
		}

		status_t VideoEditorPlayer::VeAudioOutput::getFramesWritten(uint32_t *written) const {

		if (mTrack == 0) return NO_INIT;
		*written = mNumFramesWritten;
		return OK;
		}

		status_t VideoEditorPlayer::VeAudioOutput::open(
		uint32_t sampleRate, int channelCount, audio_channel_mask_t channelMask,
		audio_format_t format, int bufferCount,
		@@ -569,7 +576,7 @@ status_t VideoEditorPlayer::VeAudioOutput::dump(int fd, const Vector<String16>&
		return NO_ERROR;
		}

		int VideoEditorPlayer::VeAudioOutput::getSessionId() {
		int VideoEditorPlayer::VeAudioOutput::getSessionId() const {

		return mSessionId;
		}

libvideoeditor/lvpp/VideoEditorPlayer.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,9 @@ class VideoEditorPlayer : public MediaPlayerInterface {
		virtual ssize_t frameSize() const;
		virtual uint32_t latency() const;
		virtual float msecsPerFrame() const;
		virtual status_t getPosition(uint32_t *position);
		virtual int getSessionId();
		virtual status_t getPosition(uint32_t *position) const;
		virtual status_t getFramesWritten(uint32_t*) const;
		virtual int getSessionId() const;

		virtual status_t open(
		uint32_t sampleRate, int channelCount, audio_channel_mask_t channelMask,

media/libmediaplayerservice/MediaPlayerService.cpp

+21 −4

Original line number	Diff line number	Diff line
		@@ -1417,6 +1417,7 @@ MediaPlayerService::AudioOutput::AudioOutput(int sessionId)
		: mCallback(NULL),
		mCallbackCookie(NULL),
		mCallbackData(NULL),
		mBytesWritten(0),
		mSessionId(sessionId) {
		ALOGV("AudioOutput(%d)", sessionId);
		mTrack = 0;
		@@ -1495,12 +1496,19 @@ float MediaPlayerService::AudioOutput::msecsPerFrame() const
		return mMsecsPerFrame;
		}

		status_t MediaPlayerService::AudioOutput::getPosition(uint32_t *position)
		status_t MediaPlayerService::AudioOutput::getPosition(uint32_t *position) const
		{
		if (mTrack == 0) return NO_INIT;
		return mTrack->getPosition(position);
		}

		status_t MediaPlayerService::AudioOutput::getFramesWritten(uint32_t *frameswritten) const
		{
		if (mTrack == 0) return NO_INIT;
		*frameswritten = mBytesWritten / frameSize();
		return OK;
		}

		status_t MediaPlayerService::AudioOutput::open(
		uint32_t sampleRate, int channelCount, audio_channel_mask_t channelMask,
		audio_format_t format, int bufferCount,
		@@ -1656,6 +1664,7 @@ void MediaPlayerService::AudioOutput::switchToNextOutput() {
		mTrack = NULL;
		mNextOutput->mSampleRateHz = mSampleRateHz;
		mNextOutput->mMsecsPerFrame = mMsecsPerFrame;
		mNextOutput->mBytesWritten = mBytesWritten;
		}
		}

		@@ -1666,6 +1675,7 @@ ssize_t MediaPlayerService::AudioOutput::write(const void* buffer, size_t size)
		//ALOGV("write(%p, %u)", buffer, size);
		if (mTrack) {
		ssize_t ret = mTrack->write(buffer, size);
		mBytesWritten += ret;
		return ret;
		}
		return NO_INIT;
		@@ -1777,7 +1787,7 @@ void MediaPlayerService::AudioOutput::CallbackWrapper(
		data->unlock();
		}

		int MediaPlayerService::AudioOutput::getSessionId()
		int MediaPlayerService::AudioOutput::getSessionId() const
		{
		return mSessionId;
		}
		@@ -1802,13 +1812,20 @@ float MediaPlayerService::AudioCache::msecsPerFrame() const
		return mMsecsPerFrame;
		}

		status_t MediaPlayerService::AudioCache::getPosition(uint32_t *position)
		status_t MediaPlayerService::AudioCache::getPosition(uint32_t *position) const
		{
		if (position == 0) return BAD_VALUE;
		*position = mSize;
		return NO_ERROR;
		}

		status_t MediaPlayerService::AudioCache::getFramesWritten(uint32_t *written) const
		{
		if (written == 0) return BAD_VALUE;
		*written = mSize;
		return NO_ERROR;
		}

		////////////////////////////////////////////////////////////////////////////////

		struct CallbackThread : public Thread {
		@@ -1971,7 +1988,7 @@ void MediaPlayerService::AudioCache::notify(
		p->mSignal.signal();
		}

		int MediaPlayerService::AudioCache::getSessionId()
		int MediaPlayerService::AudioCache::getSessionId() const
		{
		return 0;
		}

media/libmediaplayerservice/MediaPlayerService.h

+7 −4

Original line number	Diff line number	Diff line
		@@ -84,8 +84,9 @@ class MediaPlayerService : public BnMediaPlayerService
		virtual ssize_t frameSize() const;
		virtual uint32_t latency() const;
		virtual float msecsPerFrame() const;
		virtual status_t getPosition(uint32_t *position);
		virtual int getSessionId();
		virtual status_t getPosition(uint32_t *position) const;
		virtual status_t getFramesWritten(uint32_t *frameswritten) const;
		virtual int getSessionId() const;

		virtual status_t open(
		uint32_t sampleRate, int channelCount, audio_channel_mask_t channelMask,
		@@ -122,6 +123,7 @@ class MediaPlayerService : public BnMediaPlayerService
		AudioCallback mCallback;
		void * mCallbackCookie;
		CallbackData * mCallbackData;
		uint64_t mBytesWritten;
		audio_stream_type_t mStreamType;
		float mLeftVolume;
		float mRightVolume;
		@@ -181,8 +183,9 @@ class MediaPlayerService : public BnMediaPlayerService
		virtual ssize_t frameSize() const { return ssize_t(mChannelCount * ((mFormat == AUDIO_FORMAT_PCM_16_BIT)?sizeof(int16_t):sizeof(u_int8_t))); }
		virtual uint32_t latency() const;
		virtual float msecsPerFrame() const;
		virtual status_t getPosition(uint32_t *position);
		virtual int getSessionId();
		virtual status_t getPosition(uint32_t *position) const;
		virtual status_t getFramesWritten(uint32_t *frameswritten) const;
		virtual int getSessionId() const;

		virtual status_t open(
		uint32_t sampleRate, int channelCount, audio_channel_mask_t channelMask,