Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-dev (3a8d7d10) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,7 +5,9 @@ LOCAL_SRC_FILES:= \
		GenericSource.cpp \
		HTTPLiveSource.cpp \
		NuPlayer.cpp \
		NuPlayerCCDecoder.cpp \
		NuPlayerDecoder.cpp \
		NuPlayerDecoderBase.cpp \
		NuPlayerDecoderPassThrough.cpp \
		NuPlayerDriver.cpp \
		NuPlayerRenderer.cpp \

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+63 −298

File changed.

Preview size limit exceeded, changes collapsed.

media/libmediaplayerservice/nuplayer/NuPlayer.h

+7 −25

Original line number	Diff line number	Diff line
		@@ -71,8 +71,6 @@ struct NuPlayer : public AHandler {

		sp<MetaData> getFileMeta();

		static const size_t kAggregateBufferSizeBytes;

		protected:
		virtual ~NuPlayer();

		@@ -84,6 +82,7 @@ public:

		private:
		struct Decoder;
		struct DecoderBase;
		struct DecoderPassThrough;
		struct CCDecoder;
		struct GenericSource;
		@@ -128,10 +127,9 @@ private:
		uint32_t mSourceFlags;
		sp<NativeWindowWrapper> mNativeWindow;
		sp<MediaPlayerBase::AudioSink> mAudioSink;
		sp<Decoder> mVideoDecoder;
		bool mVideoIsAVC;
		sp<DecoderBase> mVideoDecoder;
		bool mOffloadAudio;
		sp<Decoder> mAudioDecoder;
		sp<DecoderBase> mAudioDecoder;
		sp<CCDecoder> mCCDecoder;
		sp<Renderer> mRenderer;
		sp<ALooper> mRendererLooper;
		@@ -165,29 +163,17 @@ private:
		FLUSH_CMD_SHUTDOWN,
		};

		// Once the current flush is complete this indicates whether the
		// notion of time has changed.
		bool mTimeDiscontinuityPending;

		// Status of flush responses from the decoder and renderer.
		bool mFlushComplete[2][2];

		// Used by feedDecoderInputData to aggregate small buffers into
		// one large buffer.
		sp<ABuffer> mPendingAudioAccessUnit;
		status_t mPendingAudioErr;
		sp<ABuffer> mAggregateBuffer;

		FlushStatus mFlushingAudio;
		FlushStatus mFlushingVideo;

		int64_t mNumFramesTotal, mNumFramesDropped;

		int32_t mVideoScalingMode;

		bool mStarted;

		inline const sp<Decoder> &getDecoder(bool audio) {
		inline const sp<DecoderBase> &getDecoder(bool audio) {
		return audio ? mAudioDecoder : mVideoDecoder;
		}

		@@ -201,15 +187,12 @@ private:
		void openAudioSink(const sp<AMessage> &format, bool offloadOnly);
		void closeAudioSink();

		status_t instantiateDecoder(bool audio, sp<Decoder> *decoder);
		status_t instantiateDecoder(bool audio, sp<DecoderBase> *decoder);

		void updateVideoSize(
		const sp<AMessage> &inputFormat,
		const sp<AMessage> &outputFormat = NULL);

		status_t feedDecoderInputData(bool audio, const sp<AMessage> &msg);
		void renderBuffer(bool audio, const sp<AMessage> &msg);

		void notifyListener(int msg, int ext1, int ext2, const Parcel *in = NULL);

		void handleFlushComplete(bool audio, bool isDecoder);
		@@ -220,9 +203,7 @@ private:

		bool audioDecoderStillNeeded();

		void flushDecoder(
		bool audio, bool needShutdown, const sp<AMessage> &newFormat = NULL);
		void updateDecoderFormatWithoutFlush(bool audio, const sp<AMessage> &format);
		void flushDecoder(bool audio, bool needShutdown);

		void postScanSources();

		@@ -236,6 +217,7 @@ private:
		void performReset();
		void performScanSources();
		void performSetSurface(const sp<NativeWindowWrapper> &wrapper);
		void performResumeDecoders();

		void onSourceNotify(const sp<AMessage> &msg);
		void onClosedCaptionNotify(const sp<AMessage> &msg);

media/libmediaplayerservice/nuplayer/NuPlayerCCDecoder.cpp

0 → 100644

+361 −0

File added.

Preview size limit exceeded, changes collapsed.

media/libmediaplayerservice/nuplayer/NuPlayerCCDecoder.h

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef NUPLAYER_CCDECODER_H_

		#define NUPLAYER_CCDECODER_H_

		#include "NuPlayer.h"

		namespace android {

		struct NuPlayer::CCDecoder : public RefBase {
		enum {
		kWhatClosedCaptionData,
		kWhatTrackAdded,
		};

		CCDecoder(const sp<AMessage> &notify);

		size_t getTrackCount() const;
		sp<AMessage> getTrackInfo(size_t index) const;
		status_t selectTrack(size_t index, bool select);
		bool isSelected() const;
		void decode(const sp<ABuffer> &accessUnit);
		void display(int64_t timeUs);
		void flush();

		private:
		sp<AMessage> mNotify;
		KeyedVector<int64_t, sp<ABuffer> > mCCMap;
		size_t mCurrentChannel;
		int32_t mSelectedTrack;
		int32_t mTrackIndices[4];
		Vector<size_t> mFoundChannels;

		bool isTrackValid(size_t index) const;
		int32_t getTrackIndex(size_t channel) const;
		bool extractFromSEI(const sp<ABuffer> &accessUnit);
		sp<ABuffer> filterCCBuf(const sp<ABuffer> &ccBuf, size_t index);

		DISALLOW_EVIL_CONSTRUCTORS(CCDecoder);
		};

		} // namespace android

		#endif // NUPLAYER_CCDECODER_H_