Merge "Software AVC encoder is now OMX-based" (e4f70a7e) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/avc/enc/Android.mk

+38 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ include $(CLEAR_VARS)

		LOCAL_SRC_FILES := \
		AVCEncoder.cpp \
		SoftAVCEncoder.cpp \
		src/avcenc_api.cpp \
		src/bitstream_io.cpp \
		src/block.cpp \
		@@ -33,3 +34,40 @@ LOCAL_CFLAGS := \
		-DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=

		include $(BUILD_STATIC_LIBRARY)

		################################################################################

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES := \
		SoftAVCEncoder.cpp

		LOCAL_C_INCLUDES := \
		frameworks/av/media/libstagefright/include \
		frameworks/native/include/media/openmax \
		$(LOCAL_PATH)/src \
		$(LOCAL_PATH)/include \
		$(LOCAL_PATH)/../common/include \
		$(LOCAL_PATH)/../common

		LOCAL_CFLAGS := \
		-D__arm__ \
		-DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=


		LOCAL_STATIC_LIBRARIES := \
		libstagefright_avcenc

		LOCAL_SHARED_LIBRARIES := \
		libstagefright \
		libstagefright_avc_common \
		libstagefright_enc_common \
		libstagefright_foundation \
		libstagefright_omx \
		libutils \


		LOCAL_MODULE := libstagefright_soft_h264enc
		LOCAL_MODULE_TAGS := optional

		include $(BUILD_SHARED_LIBRARY)

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

0 → 100644

+890 −0

File added.

Preview size limit exceeded, changes collapsed.

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.h

0 → 100644

+108 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 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 SOFT_AVC_ENCODER_H_
		#define SOFT_AVC_ENCODER_H_

		#include <media/stagefright/MediaBuffer.h>
		#include <media/stagefright/foundation/ABase.h>
		#include <utils/Vector.h>

		#include "avcenc_api.h"
		#include "SimpleSoftOMXComponent.h"

		namespace android {

		struct MediaBuffer;

		struct SoftAVCEncoder : public MediaBufferObserver,
		public SimpleSoftOMXComponent {
		SoftAVCEncoder(
		const char *name,
		const OMX_CALLBACKTYPE *callbacks,
		OMX_PTR appData,
		OMX_COMPONENTTYPE **component);

		// Override SimpleSoftOMXComponent methods
		virtual OMX_ERRORTYPE internalGetParameter(
		OMX_INDEXTYPE index, OMX_PTR params);

		virtual OMX_ERRORTYPE internalSetParameter(
		OMX_INDEXTYPE index, const OMX_PTR params);

		virtual void onQueueFilled(OMX_U32 portIndex);


		// Implement MediaBufferObserver
		virtual void signalBufferReturned(MediaBuffer *buffer);


		// Callbacks required by PV's encoder
		int32_t allocOutputBuffers(unsigned int sizeInMbs, unsigned int numBuffers);
		void unbindOutputBuffer(int32_t index);
		int32_t bindOutputBuffer(int32_t index, uint8_t **yuv);

		protected:
		virtual ~SoftAVCEncoder();

		private:
		enum {
		kNumBuffers = 2,
		};

		// OMX input buffer's timestamp and flags
		typedef struct {
		int64_t mTimeUs;
		int32_t mFlags;
		} InputBufferInfo;

		int32_t mVideoWidth;
		int32_t mVideoHeight;
		int32_t mVideoFrameRate;
		int32_t mVideoBitRate;
		int32_t mVideoColorFormat;
		int32_t mIDRFrameRefreshIntervalInSec;
		AVCProfile mAVCEncProfile;
		AVCLevel mAVCEncLevel;

		int64_t mNumInputFrames;
		int64_t mPrevTimestampUs;
		bool mStarted;
		bool mSpsPpsHeaderReceived;
		bool mReadyForNextFrame;
		bool mSawInputEOS;
		bool mSignalledError;
		bool mIsIDRFrame;

		tagAVCHandle *mHandle;
		tagAVCEncParam *mEncParams;
		uint8_t *mInputFrameData;
		uint32_t *mSliceGroup;
		Vector<MediaBuffer *> mOutputBuffers;
		Vector<InputBufferInfo> mInputBufferInfoVec;

		void initPorts();
		OMX_ERRORTYPE initEncParams();
		OMX_ERRORTYPE initEncoder();
		OMX_ERRORTYPE releaseEncoder();
		void releaseOutputBuffers();

		DISALLOW_EVIL_CONSTRUCTORS(SoftAVCEncoder);
		};

		} // namespace android

		#endif // SOFT_AVC_ENCODER_H_

media/libstagefright/omx/SoftOMXPlugin.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ static const struct {
		{ "OMX.google.amrwb.decoder", "amrdec", "audio_decoder.amrwb" },
		{ "OMX.google.amrwb.encoder", "amrwbenc", "audio_encoder.amrwb" },
		{ "OMX.google.h264.decoder", "h264dec", "video_decoder.avc" },
		{ "OMX.google.h264.encoder", "h264enc", "video_encoder.avc" },
		{ "OMX.google.g711.alaw.decoder", "g711dec", "audio_decoder.g711alaw" },
		{ "OMX.google.g711.mlaw.decoder", "g711dec", "audio_decoder.g711mlaw" },
		{ "OMX.google.h263.decoder", "mpeg4dec", "video_decoder.h263" },