stagefright: add SoftAVCDec using libavc (e5b9b3db) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/avcdec/Android.mk

0 → 100644

+27 −0

Original line number	Original line	Diff line number	Diff line
			#ifeq ($(if $(wildcard external/libh264),1,0),1)

			LOCAL_PATH := $(call my-dir)
			include $(CLEAR_VARS)

			LOCAL_MODULE := libstagefright_soft_avcdec
			LOCAL_MODULE_TAGS := optional

			LOCAL_STATIC_LIBRARIES := libavcdec
			LOCAL_SRC_FILES := SoftAVCDec.cpp

			LOCAL_C_INCLUDES := $(TOP)/external/libavc/decoder
			LOCAL_C_INCLUDES += $(TOP)/external/libavc/common
			LOCAL_C_INCLUDES += $(TOP)/frameworks/av/media/libstagefright/include
			LOCAL_C_INCLUDES += $(TOP)/frameworks/native/include/media/openmax

			LOCAL_SHARED_LIBRARIES := libstagefright
			LOCAL_SHARED_LIBRARIES += libstagefright_omx
			LOCAL_SHARED_LIBRARIES += libstagefright_foundation
			LOCAL_SHARED_LIBRARIES += libutils
			LOCAL_SHARED_LIBRARIES += liblog

			LOCAL_LDFLAGS := -Wl,-Bsymbolic

			include $(BUILD_SHARED_LIBRARY)

			#endif

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

0 → 100644

+808 −0

File added.

Preview size limit exceeded, changes collapsed.

media/libstagefright/codecs/avcdec/SoftAVCDec.h

0 → 100644

+177 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright 2015 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_H264_DEC_H_

			#define SOFT_H264_DEC_H_

			#include "SoftVideoDecoderOMXComponent.h"
			#include <sys/time.h>

			namespace android {

			#define ivd_aligned_malloc(alignment, size) memalign(alignment, size)
			#define ivd_aligned_free(buf) free(buf)

			/** Number of entries in the time-stamp array */
			#define MAX_TIME_STAMPS 64

			/** Maximum number of cores supported by the codec */
			#define CODEC_MAX_NUM_CORES 4

			#define CODEC_MAX_WIDTH 1920

			#define CODEC_MAX_HEIGHT 1088

			/** Input buffer size */
			#define INPUT_BUF_SIZE (1024 * 1024)

			#define MIN(a, b) ((a) < (b)) ? (a) : (b)

			/** Used to remove warnings about unused parameters */
			#define UNUSED(x) ((void)(x))

			/** Get time */
			#define GETTIME(a, b) gettimeofday(a, b);

			/** Compute difference between start and end */
			#define TIME_DIFF(start, end, diff) \
			diff = ((end.tv_sec - start.tv_sec) * 1000000) + \
			(end.tv_usec - start.tv_usec);

			struct SoftAVC : public SoftVideoDecoderOMXComponent {
			SoftAVC(const char name, const OMX_CALLBACKTYPE callbacks,
			OMX_PTR appData, OMX_COMPONENTTYPE **component);

			protected:
			virtual ~SoftAVC();

			virtual void onQueueFilled(OMX_U32 portIndex);
			virtual void onPortFlushCompleted(OMX_U32 portIndex);
			virtual void onReset();
			virtual OMX_ERRORTYPE internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR params);
			private:
			// Number of input and output buffers
			enum {
			kNumBuffers = 8
			};

			iv_obj_t *mCodecCtx; // Codec context
			iv_mem_rec_t *mMemRecords; // Memory records requested by the codec
			size_t mNumMemRecords; // Number of memory records requested by the codec

			size_t mNumCores; // Number of cores to be uesd by the codec

			struct timeval mTimeStart; // Time at the start of decode()
			struct timeval mTimeEnd; // Time at the end of decode()

			// Internal buffer to be used to flush out the buffers from decoder
			uint8_t *mFlushOutBuffer;

			// Status of entries in the timestamp array
			bool mTimeStampsValid[MAX_TIME_STAMPS];

			// Timestamp array - Since codec does not take 64 bit timestamps,
			// they are maintained in the plugin
			OMX_S64 mTimeStamps[MAX_TIME_STAMPS];

			#ifdef FILE_DUMP_ENABLE
			char mInFile[200];
			#endif /* FILE_DUMP_ENABLE */

			OMX_COLOR_FORMATTYPE mOmxColorFormat; // OMX Color format
			IV_COLOR_FORMAT_T mIvColorFormat; // Ittiam Color format

			bool mIsInFlush; // codec is flush mode
			bool mReceivedEOS; // EOS is receieved on input port
			bool mInitNeeded;
			uint32_t mNewWidth;
			uint32_t mNewHeight;
			// The input stream has changed to a different resolution, which is still supported by the
			// codec. So the codec is switching to decode the new resolution.
			bool mChangingResolution;
			bool mFlushNeeded;

			status_t initDecoder();
			status_t deInitDecoder();
			status_t setFlushMode();
			status_t setParams(size_t stride);
			void logVersion();
			status_t setNumCores();
			status_t resetDecoder();
			status_t resetPlugin();
			status_t reInitDecoder();

			void setDecodeArgs(
			ivd_video_decode_ip_t *ps_dec_ip,
			ivd_video_decode_op_t *ps_dec_op,
			OMX_BUFFERHEADERTYPE *inHeader,
			OMX_BUFFERHEADERTYPE *outHeader,
			size_t timeStampIx);

			DISALLOW_EVIL_CONSTRUCTORS(SoftAVC);
			};

			#ifdef FILE_DUMP_ENABLE

			#define INPUT_DUMP_PATH "/sdcard/media/avcd_input"
			#define INPUT_DUMP_EXT "h264"

			#define GENERATE_FILE_NAMES() { \
			GETTIME(&mTimeStart, NULL); \
			strcpy(mInFile, ""); \
			sprintf(mInFile, "%s_%ld.%ld.%s", INPUT_DUMP_PATH, \
			mTimeStart.tv_sec, mTimeStart.tv_usec, \
			INPUT_DUMP_EXT); \
			}

			#define CREATE_DUMP_FILE(m_filename) { \
			FILE *fp = fopen(m_filename, "wb"); \
			if (fp != NULL) { \
			fclose(fp); \
			} else { \
			ALOGD("Could not open file %s", m_filename); \
			} \
			}
			#define DUMP_TO_FILE(m_filename, m_buf, m_size) \
			{ \
			FILE *fp = fopen(m_filename, "ab"); \
			if (fp != NULL && m_buf != NULL) { \
			int i; \
			i = fwrite(m_buf, 1, m_size, fp); \
			ALOGD("fwrite ret %d to write %d", i, m_size); \
			if (i != (int) m_size) { \
			ALOGD("Error in fwrite, returned %d", i); \
			perror("Error in write to file"); \
			} \
			fclose(fp); \
			} else { \
			ALOGD("Could not write to file %s", m_filename);\
			} \
			}
			#else /* FILE_DUMP_ENABLE */
			#define INPUT_DUMP_PATH
			#define INPUT_DUMP_EXT
			#define OUTPUT_DUMP_PATH
			#define OUTPUT_DUMP_EXT
			#define GENERATE_FILE_NAMES()
			#define CREATE_DUMP_FILE(m_filename)
			#define DUMP_TO_FILE(m_filename, m_buf, m_size)
			#endif /* FILE_DUMP_ENABLE */

			} // namespace android

			#endif // SOFT_H264_DEC_H_

media/libstagefright/data/media_codecs_google_video.xml

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -43,12 +43,12 @@
	<Feature name="adaptive-playback" />		<Feature name="adaptive-playback" />
	</MediaCodec>		</MediaCodec>
	<MediaCodec name="OMX.google.h264.decoder" type="video/avc">		<MediaCodec name="OMX.google.h264.decoder" type="video/avc">
	<!-- profiles and levels: ProfileBaseline : Level51 -->		<!-- profiles and levels: ProfileHigh : Level41 -->
	<Limit name="size" min="2x2" max="2048x2048" />		<Limit name="size" min="16x16" max="1920x1088" />
	<Limit name="alignment" value="2x2" />		<Limit name="alignment" value="2x2" />
	<Limit name="block-size" value="16x16" />		<Limit name="block-size" value="16x16" />
	<Limit name="blocks-per-second" range="1-983040" />		<Limit name="blocks-per-second" range="1-244800" />
	<Limit name="bitrate" range="1-40000000" />		<Limit name="bitrate" range="1-12000000" />
	<Feature name="adaptive-playback" />		<Feature name="adaptive-playback" />
	</MediaCodec>		</MediaCodec>
	<MediaCodec name="OMX.google.hevc.decoder" type="video/hevc">		<MediaCodec name="OMX.google.hevc.decoder" type="video/hevc">

media/libstagefright/omx/SoftOMXPlugin.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ static const struct {
	{ "OMX.google.amrnb.encoder", "amrnbenc", "audio_encoder.amrnb" },		{ "OMX.google.amrnb.encoder", "amrnbenc", "audio_encoder.amrnb" },
	{ "OMX.google.amrwb.decoder", "amrdec", "audio_decoder.amrwb" },		{ "OMX.google.amrwb.decoder", "amrdec", "audio_decoder.amrwb" },
	{ "OMX.google.amrwb.encoder", "amrwbenc", "audio_encoder.amrwb" },		{ "OMX.google.amrwb.encoder", "amrwbenc", "audio_encoder.amrwb" },
	{ "OMX.google.h264.decoder", "h264dec", "video_decoder.avc" },		{ "OMX.google.h264.decoder", "avcdec", "video_decoder.avc" },
	{ "OMX.google.h264.encoder", "h264enc", "video_encoder.avc" },		{ "OMX.google.h264.encoder", "h264enc", "video_encoder.avc" },
	{ "OMX.google.hevc.decoder", "hevcdec", "video_decoder.hevc" },		{ "OMX.google.hevc.decoder", "hevcdec", "video_decoder.hevc" },
	{ "OMX.google.g711.alaw.decoder", "g711dec", "audio_decoder.g711alaw" },		{ "OMX.google.g711.alaw.decoder", "g711dec", "audio_decoder.g711alaw" },