[PORT FROM MAIN]omx-components: Add VP8 middleware support for Merrifield

BZ: 73094

Add VP8 middleware support for Merrifield

Change-Id: I6c49dced2f7603a4ad30f959deb69fc31158bd7b
Signed-off-by: Tianmi Chen <tianmi.chen@intel.com>
Reviewed-on: http://android.intel.com:8080/82329
Reviewed-by: Ding, Haitao <haitao.ding@intel.com>
Tested-by: Ding, Haitao <haitao.ding@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>

3 files changed, 201 insertions, 0 deletions

diff --git a/videocodec/Android.mk b/videocodec/Android.mk
index 910a20f..3542fc6 100644
--- a/videocodec/Android.mk
+++ b/videocodec/Android.mk
@@ -301,7 +301,40 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libOMXVideoDecoderAVCSecure
 include $(BUILD_SHARED_LIBRARY)
 
+# Add source codes for Merrifield
+MERRIFIELD_PRODUCT := \
+        mrfl_vp \
+        mrfl_hvp \
+        mrfl_sle
+ifneq ($(filter $(TARGET_PRODUCT),$(MERRIFIELD_PRODUCT)),)
+include $(CLEAR_VARS)
+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 \
+    $(PV_INCLUDES) \
+    $(TARGET_OUT_HEADERS)/libmix_videodecoder \
+    $(TARGET_OUT_HEADERS)/libva \
+    $(TOP)/frameworks/native/include/media/hardware \
+    $(TOP)/frameworks/native/include/media/openmax
+
+LOCAL_SRC_FILES := \
+    OMXComponentCodecBase.cpp\
+    OMXVideoDecoderBase.cpp\
+    OMXVideoDecoderVP8.cpp
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libOMXVideoDecoderVP8
+include $(BUILD_SHARED_LIBRARY)
+endif
 
 endif
diff --git a/videocodec/OMXVideoDecoderVP8.cpp b/videocodec/OMXVideoDecoderVP8.cpp
new file mode 100644
index 0000000..2b24b3e
--- /dev/null
+++ b/videocodec/OMXVideoDecoderVP8.cpp
@@ -0,0 +1,112 @@
+/*
+* Copyright (c) 2012 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 <utils/Log.h>
+#include "OMXVideoDecoderVP8.h"
+
+// Be sure to have an equal string in VideoDecoderHost.cpp (libmix)
+static const char* VP8_MIME_TYPE = "video/x-vnd.on2.vp8";
+
+OMXVideoDecoderVP8::OMXVideoDecoderVP8() {
+    LOGV("OMXVideoDecoderVP8 is constructed.");
+    mVideoDecoder = createVideoDecoder(VP8_MIME_TYPE);
+    if (!mVideoDecoder) {
+        LOGE("createVideoDecoder failed for \"%s\"", VP8_MIME_TYPE);
+    }
+    BuildHandlerList();
+}
+
+OMXVideoDecoderVP8::~OMXVideoDecoderVP8() {
+    LOGV("OMXVideoDecoderVP8 is destructed.");
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::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)VP8_MIME_TYPE;
+    paramPortDefinitionInput->format.video.eCompressionFormat = OMX_VIDEO_CodingVPX;
+
+    // OMX_VIDEO_PARAM_VP8TYPE
+    memset(&mParamVp8, 0, sizeof(mParamVp8));
+    SetTypeHeader(&mParamVp8, sizeof(mParamVp8));
+    mParamVp8.nPortIndex = INPORT_INDEX;
+    mParamVp8.eProfile = OMX_VIDEO_VP8ProfileMain;
+    mParamVp8.eLevel = OMX_VIDEO_VP8Level_Version0;
+
+    return OMX_ErrorNone;
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::ProcessorInit(void) {
+    return OMXVideoDecoderBase::ProcessorInit();
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::ProcessorDeinit(void) {
+    return OMXVideoDecoderBase::ProcessorDeinit();
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::ProcessorProcess(
+        OMX_BUFFERHEADERTYPE ***pBuffers,
+        buffer_retain_t *retains,
+        OMX_U32 numberBuffers) {
+
+    return OMXVideoDecoderBase::ProcessorProcess(pBuffers, retains, numberBuffers);
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::PrepareConfigBuffer(VideoConfigBuffer *p) {
+    return OMXVideoDecoderBase::PrepareConfigBuffer(p);
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE *buffer, buffer_retain_t *retain, VideoDecodeBuffer *p) {
+    return OMXVideoDecoderBase::PrepareDecodeBuffer(buffer, retain, p);
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::BuildHandlerList(void) {
+    OMXVideoDecoderBase::BuildHandlerList();
+    AddHandler(OMX_IndexParamVideoVp8, GetParamVideoVp8, SetParamVideoVp8);
+    return OMX_ErrorNone;
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::GetParamVideoVp8(OMX_PTR pStructure) {
+    OMX_ERRORTYPE ret;
+    OMX_VIDEO_PARAM_VP8TYPE *p = (OMX_VIDEO_PARAM_VP8TYPE *)pStructure;
+    CHECK_TYPE_HEADER(p);
+    CHECK_PORT_INDEX(p, INPORT_INDEX);
+
+    memcpy(p, &mParamVp8, sizeof(*p));
+    return OMX_ErrorNone;
+}
+
+OMX_ERRORTYPE OMXVideoDecoderVP8::SetParamVideoVp8(OMX_PTR pStructure) {
+    OMX_ERRORTYPE ret;
+    OMX_VIDEO_PARAM_VP8TYPE *p = (OMX_VIDEO_PARAM_VP8TYPE *)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?
+    memcpy(&mParamVp8, p, sizeof(mParamVp8));
+    return OMX_ErrorNone;
+}
+
+
+DECLARE_OMX_COMPONENT("OMX.Intel.VideoDecoder.VPX", "video_decoder.vpx", OMXVideoDecoderVP8);
+
+
diff --git a/videocodec/OMXVideoDecoderVP8.h b/videocodec/OMXVideoDecoderVP8.h
new file mode 100644
index 0000000..5c59124
--- /dev/null
+++ b/videocodec/OMXVideoDecoderVP8.h
@@ -0,0 +1,56 @@
+/*
+* Copyright (c) 2012 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_VP8_H_
+#define OMX_VIDEO_DECODER_VP8_H_
+
+
+#include "OMXVideoDecoderBase.h"
+
+class OMXVideoDecoderVP8 : public OMXVideoDecoderBase {
+public:
+    OMXVideoDecoderVP8();
+    virtual ~OMXVideoDecoderVP8();
+
+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);
+   DECLARE_HANDLER(OMXVideoDecoderVP8, ParamVideoVp8);
+
+private:
+    enum {
+        // OMX_PARAM_PORTDEFINITIONTYPE
+        INPORT_MIN_BUFFER_COUNT = 1,
+        INPORT_ACTUAL_BUFFER_COUNT = 5,
+        INPORT_BUFFER_SIZE = 1382400,
+    };
+
+    OMX_VIDEO_PARAM_VP8TYPE mParamVp8;
+};
+
+#endif /* OMX_VIDEO_DECODER_VP8_H_ */