diff options
author | Yuanjun Huang <yuanjun.huang@intel.com> | 2015-01-27 06:00:58 +0800 |
---|---|---|
committer | Patrick Tjin <pattjin@google.com> | 2015-02-09 09:43:30 -0800 |
commit | dd7827dfb430e3387352c9085bae3e20bac0a0a1 (patch) | |
tree | c72b4acb24c4d67516585e92e87056075add8746 | |
parent | a19c9a9ad413ce879944bf655a61e7a981f0dcb1 (diff) | |
download | android_hardware_intel_common_omx-components-dd7827dfb430e3387352c9085bae3e20bac0a0a1.tar.gz android_hardware_intel_common_omx-components-dd7827dfb430e3387352c9085bae3e20bac0a0a1.tar.bz2 android_hardware_intel_common_omx-components-dd7827dfb430e3387352c9085bae3e20bac0a0a1.zip |
omx-component: Enabling MPEG2 hardware decoding
OMX implementation.
Change-Id: I51013f784f36299c121ea266d8b0d492a9f56901
Signed-off-by: Yuanjun Huang <yuanjun.huang@intel.com>
-rw-r--r-- | videocodec/Android.mk | 48 | ||||
-rw-r--r-- | videocodec/OMXVideoDecoderMPEG2.cpp | 160 | ||||
-rw-r--r-- | videocodec/OMXVideoDecoderMPEG2.h | 61 |
3 files changed, 269 insertions, 0 deletions
diff --git a/videocodec/Android.mk b/videocodec/Android.mk index 6a79dd0..eeec169 100644 --- a/videocodec/Android.mk +++ b/videocodec/Android.mk @@ -466,6 +466,54 @@ include $(BUILD_SHARED_LIBRARY) endif #USE_INTEL_SECURE_AVC ################################################################################ +PLATFORM_SUPPORT_MPEG2 := \ + moorefield + +ifneq ($(filter $(TARGET_BOARD_PLATFORM),$(PLATFORM_SUPPORT_MPEG2)),) +include $(CLEAR_VARS) + +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV +endif + +LOCAL_CPPFLAGS := +LOCAL_LDFLAGS := + +LOCAL_SHARED_LIBRARIES := \ + libwrs_omxil_common \ + libva_videodecoder \ + liblog \ + libva \ + libva-android + +LOCAL_C_INCLUDES := \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ + $(TARGET_OUT_HEADERS)/libmix_videodecoder \ + $(TARGET_OUT_HEADERS)/libva \ + $(call include-path-for, frameworks-native)/media/hardware \ + $(call include-path-for, frameworks-native)/media/openmax + +LOCAL_SRC_FILES := \ + OMXComponentCodecBase.cpp\ + OMXVideoDecoderBase.cpp\ + OMXVideoDecoderMPEG2.cpp + +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := libOMXVideoDecoderMPEG2 + +ifeq ($(TARGET_BOARD_PLATFORM),merrifield) +LOCAL_CFLAGS += -DVED_TILING +endif + +ifeq ($(TARGET_BOARD_PLATFORM),moorefield) +LOCAL_CFLAGS += -DVED_TILING +endif + +include $(BUILD_SHARED_LIBRARY) +endif + +################################################################################ include $(CLEAR_VARS) ifeq ($(TARGET_HAS_ISV),true) diff --git a/videocodec/OMXVideoDecoderMPEG2.cpp b/videocodec/OMXVideoDecoderMPEG2.cpp new file mode 100644 index 0000000..e3c53b5 --- /dev/null +++ b/videocodec/OMXVideoDecoderMPEG2.cpp @@ -0,0 +1,160 @@ +/* +* Copyright (c) 2009-2011 Intel Corporation. All rights reserved. +* +* 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. +*/ + + +// #define LOG_NDEBUG 0 +#define LOG_TAG "OMXVideoDecoder" +#include <wrs_omxil_core/log.h> +#include "OMXVideoDecoderMPEG2.h" + +// Be sure to have an equal string in VideoDecoderHost.cpp (libmix) +static const char* MPEG2_MIME_TYPE = "video/mpeg2"; + +OMXVideoDecoderMPEG2::OMXVideoDecoderMPEG2() { + LOGV("OMXVideoDecoderMPEG2 is constructed."); + mVideoDecoder = createVideoDecoder(MPEG2_MIME_TYPE); + if (!mVideoDecoder) { + LOGE("createVideoDecoder failed for \"%s\"", MPEG2_MIME_TYPE); + } + mNativeBufferCount = OUTPORT_NATIVE_BUFFER_COUNT; + BuildHandlerList(); +} + +OMXVideoDecoderMPEG2::~OMXVideoDecoderMPEG2() { + LOGV("OMXVideoDecoderMPEG2 is destructed."); +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::InitInputPortFormatSpecific(OMX_PARAM_PORTDEFINITIONTYPE *paramPortDefinitionInput) { + // OMX_PARAM_PORTDEFINITIONTYPE + paramPortDefinitionInput->nBufferCountActual = INPORT_ACTUAL_BUFFER_COUNT; + paramPortDefinitionInput->nBufferCountMin = INPORT_MIN_BUFFER_COUNT; + paramPortDefinitionInput->nBufferSize = INPORT_BUFFER_SIZE; + paramPortDefinitionInput->format.video.cMIMEType = (OMX_STRING)MPEG2_MIME_TYPE; + paramPortDefinitionInput->format.video.eCompressionFormat = OMX_VIDEO_CodingMPEG2; + + // OMX_VIDEO_PARAM_MPEG2TYPE + memset(&mParamMpeg2, 0, sizeof(mParamMpeg2)); + SetTypeHeader(&mParamMpeg2, sizeof(mParamMpeg2)); + mParamMpeg2.nPortIndex = INPORT_INDEX; + // TODO: check eProfile/eLevel + mParamMpeg2.eProfile = OMX_VIDEO_MPEG2ProfileSimple; //OMX_VIDEO_MPEG2ProfileSimple; + mParamMpeg2.eLevel = OMX_VIDEO_MPEG2LevelLL; + + return OMX_ErrorNone; +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::ProcessorInit(void) { + return OMXVideoDecoderBase::ProcessorInit(); +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::ProcessorDeinit(void) { + return OMXVideoDecoderBase::ProcessorDeinit(); +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::ProcessorProcess( + OMX_BUFFERHEADERTYPE ***pBuffers, + buffer_retain_t *retains, + OMX_U32 numberBuffers) { + + return OMXVideoDecoderBase::ProcessorProcess(pBuffers, retains, numberBuffers); +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::PrepareConfigBuffer(VideoConfigBuffer *p) { + return OMXVideoDecoderBase::PrepareConfigBuffer(p); +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE *buffer, buffer_retain_t *retain, VideoDecodeBuffer *p) { + return OMXVideoDecoderBase::PrepareDecodeBuffer(buffer, retain, p); +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::BuildHandlerList(void) { + OMXVideoDecoderBase::BuildHandlerList(); + AddHandler(OMX_IndexParamVideoMpeg2, GetParamVideoMpeg2, SetParamVideoMpeg2); + AddHandler(OMX_IndexParamVideoProfileLevelQuerySupported, GetParamVideoMpeg2ProfileLevel, SetParamVideoMpeg2ProfileLevel); + return OMX_ErrorNone; +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::GetParamVideoMpeg2(OMX_PTR pStructure) { + OMX_ERRORTYPE ret; + OMX_VIDEO_PARAM_MPEG2TYPE *p = (OMX_VIDEO_PARAM_MPEG2TYPE *)pStructure; + CHECK_TYPE_HEADER(p); + CHECK_PORT_INDEX(p, INPORT_INDEX); + + memcpy(p, &mParamMpeg2, sizeof(*p)); + return OMX_ErrorNone; +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::SetParamVideoMpeg2(OMX_PTR pStructure) { + OMX_ERRORTYPE ret; + OMX_VIDEO_PARAM_MPEG2TYPE *p = (OMX_VIDEO_PARAM_MPEG2TYPE *)pStructure; + CHECK_TYPE_HEADER(p); + CHECK_PORT_INDEX(p, INPORT_INDEX); + CHECK_SET_PARAM_STATE(); + + // TODO: do we need to check if port is enabled? + // TODO: see SetPortMpeg2Param implementation - Can we make simple copy???? + memcpy(&mParamMpeg2, p, sizeof(mParamMpeg2)); + return OMX_ErrorNone; +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::GetParamVideoMpeg2ProfileLevel(OMX_PTR pStructure) { + OMX_ERRORTYPE ret; + OMX_VIDEO_PARAM_PROFILELEVELTYPE *p = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *)pStructure; + CHECK_TYPE_HEADER(p); + + struct ProfileLevelTable { + OMX_U32 profile; + OMX_U32 level; + } plTable[] = { + {OMX_VIDEO_MPEG2ProfileSimple, OMX_VIDEO_MPEG2LevelML}, + {OMX_VIDEO_MPEG2ProfileMain, OMX_VIDEO_MPEG2LevelHL} + }; + + OMX_U32 count = sizeof(plTable)/sizeof(ProfileLevelTable); + CHECK_ENUMERATION_RANGE(p->nProfileIndex,count); + + p->eProfile = plTable[p->nProfileIndex].profile; + p->eLevel = plTable[p->nProfileIndex].level; + + return OMX_ErrorNone; +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::SetParamVideoMpeg2ProfileLevel(OMX_PTR) { + LOGW("SetParamVideoMpeg2ProfileLevel is not supported."); + return OMX_ErrorUnsupportedSetting; +} + +OMX_COLOR_FORMATTYPE OMXVideoDecoderMPEG2::GetOutputColorFormat(int width) +{ +#ifdef USE_GEN_HW + return (OMX_COLOR_FORMATTYPE)HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL; +#else + return OMXVideoDecoderBase::GetOutputColorFormat(width); +#endif +} + +OMX_ERRORTYPE OMXVideoDecoderMPEG2::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p) { + OMX_ERRORTYPE ret; + CHECK_TYPE_HEADER(p); + CHECK_PORT_INDEX(p, OUTPORT_INDEX); + + p->nBufferCountActual = OUTPORT_NATIVE_BUFFER_COUNT; + return OMXVideoDecoderBase::SetMaxOutputBufferCount(p); +} + +DECLARE_OMX_COMPONENT("OMX.Intel.VideoDecoder.MPEG2", "video_decoder.mpeg2", OMXVideoDecoderMPEG2); + + diff --git a/videocodec/OMXVideoDecoderMPEG2.h b/videocodec/OMXVideoDecoderMPEG2.h new file mode 100644 index 0000000..daf2e50 --- /dev/null +++ b/videocodec/OMXVideoDecoderMPEG2.h @@ -0,0 +1,61 @@ +/* +* Copyright (c) 2009-2011 Intel Corporation. All rights reserved. +* +* 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 OMX_VIDEO_DECODER_MPEG2_H_ +#define OMX_VIDEO_DECODER_MPEG2_H_ + + +#include "OMXVideoDecoderBase.h" + +class OMXVideoDecoderMPEG2 : public OMXVideoDecoderBase { +public: + OMXVideoDecoderMPEG2(); + virtual ~OMXVideoDecoderMPEG2(); + +protected: + virtual OMX_ERRORTYPE InitInputPortFormatSpecific(OMX_PARAM_PORTDEFINITIONTYPE *paramPortDefinitionInput); + virtual OMX_ERRORTYPE ProcessorInit(void); + virtual OMX_ERRORTYPE ProcessorDeinit(void); + virtual OMX_ERRORTYPE ProcessorProcess( + OMX_BUFFERHEADERTYPE ***pBuffers, + buffer_retain_t *retains, + OMX_U32 numberBuffers); + + virtual OMX_ERRORTYPE PrepareConfigBuffer(VideoConfigBuffer *p); + virtual OMX_ERRORTYPE PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE *buffer, buffer_retain_t *retain, VideoDecodeBuffer *p); + + virtual OMX_ERRORTYPE BuildHandlerList(void); + virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p); + virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width); + DECLARE_HANDLER(OMXVideoDecoderMPEG2, ParamVideoMpeg2); + DECLARE_HANDLER(OMXVideoDecoderMPEG2, ParamVideoMpeg2ProfileLevel); + +private: + enum { + // OMX_PARAM_PORTDEFINITIONTYPE + INPORT_MIN_BUFFER_COUNT = 1, + INPORT_ACTUAL_BUFFER_COUNT = 5, + INPORT_BUFFER_SIZE = 1382400, + + OUTPORT_NATIVE_BUFFER_COUNT = 10, + }; + + OMX_VIDEO_PARAM_MPEG2TYPE mParamMpeg2; +}; + +#endif /* OMX_VIDEO_DECODER_MPEG2_H_ */ |