Merge "Software MPEG4/H263 video encoder is now OMX-based" into jb-dev (2b095b74) · Commits · e / os / android_frameworks_av

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

+37 −0

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

		LOCAL_SRC_FILES := \
		M4vH263Encoder.cpp \
		SoftMPEG4Encoder.cpp \
		src/bitstream_io.cpp \
		src/combined_encode.cpp \
		src/datapart_encode.cpp \
		@@ -35,3 +36,39 @@ LOCAL_C_INCLUDES := \
		$(TOP)/frameworks/native/include/media/openmax

		include $(BUILD_STATIC_LIBRARY)

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

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES := \
		SoftMPEG4Encoder.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 := \
		-DBX_RC \
		-DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=


		LOCAL_STATIC_LIBRARIES := \
		libstagefright_m4vh263enc

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


		LOCAL_MODULE := libstagefright_soft_mpeg4enc
		LOCAL_MODULE_TAGS := optional

		include $(BUILD_SHARED_LIBRARY)

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

0 → 100644

+706 −0

File added.

Preview size limit exceeded, changes collapsed.

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h

0 → 100644

+88 −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_MPEG4_ENCODER_H_
		#define SOFT_MPEG4_ENCODER_H_

		#include <media/stagefright/MediaBuffer.h>
		#include <media/stagefright/foundation/ABase.h>
		#include "SimpleSoftOMXComponent.h"
		#include "mp4enc_api.h"


		namespace android {

		struct MediaBuffer;

		struct SoftMPEG4Encoder : public SimpleSoftOMXComponent {
		SoftMPEG4Encoder(
		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);

		protected:
		virtual ~SoftMPEG4Encoder();

		private:
		enum {
		kNumBuffers = 2,
		};

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

		MP4EncodingMode mEncodeMode;
		int32_t mVideoWidth;
		int32_t mVideoHeight;
		int32_t mVideoFrameRate;
		int32_t mVideoBitRate;
		int32_t mVideoColorFormat;
		int32_t mIDRFrameRefreshIntervalInSec;

		int64_t mNumInputFrames;
		bool mStarted;
		bool mSawInputEOS;
		bool mSignalledError;

		tagvideoEncControls *mHandle;
		tagvideoEncOptions *mEncParams;
		uint8_t *mInputFrameData;
		Vector<InputBufferInfo> mInputBufferInfoVec;

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

		DISALLOW_EVIL_CONSTRUCTORS(SoftMPEG4Encoder);
		};

		} // namespace android

		#endif // SOFT_MPEG4_ENCODER_H_

media/libstagefright/omx/SoftOMXPlugin.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,7 +45,9 @@ static const struct {
		{ "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" },
		{ "OMX.google.h263.encoder", "mpeg4enc", "video_encoder.h263" },
		{ "OMX.google.mpeg4.decoder", "mpeg4dec", "video_decoder.mpeg4" },
		{ "OMX.google.mpeg4.encoder", "mpeg4enc", "video_encoder.mpeg4" },
		{ "OMX.google.mp3.decoder", "mp3dec", "audio_decoder.mp3" },
		{ "OMX.google.vorbis.decoder", "vorbisdec", "audio_decoder.vorbis" },
		{ "OMX.google.vpx.decoder", "vpxdec", "video_decoder.vpx" },