Enable video playback in wrs-omxil-core

Change-Id: Ifb4bf6160fbc3469ede7b258dd72ef8c77c84d62
Signed-off-by: Liu, Shuo <shuo.liu@intel.com>

5 files changed, 41 insertions, 12 deletions

diff --git a/Android.mk b/Android.mk
index a0e7060..cfec7f8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,11 @@ include $(CLEAR_VARS)
 
 WRS_OMXIL_CORE_ROOT := $(LOCAL_PATH)
 
-$(call add-prebuilt-files, ETC, 10_wrs_omxil_core.cfg)
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/10_wrs_omxil_core.cfg:system/etc/10_wrs_omxil_core.cfg
+#$(call add-prebuilt-files, ETC, 10_wrs_omxil_core.cfg)
+
+COMPONENT_USE_BUFFERSHARING := false
 
 # core
 -include $(WRS_OMXIL_CORE_ROOT)/core/src/Android.mk
diff --git a/base/src/Android.mk b/base/src/Android.mk
index 0d14347..7eca645 100644
--- a/base/src/Android.mk
+++ b/base/src/Android.mk
@@ -10,13 +10,17 @@ LOCAL_SRC_FILES := \
 	portimage.cpp \
 	portother.cpp
 
-LOCAL_MODULE := libwrs_omxil_base
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libwrs_omxil_base
 
 LOCAL_CPPFLAGS :=
 
 LOCAL_LDFLAGS :=
 
+ifeq ($(strip $(COMPONENT_USE_BUFFERSHARING)), true)
+LOCAL_CFLAGS += -DCOMPONENT_USE_BUFFERSHARING
+endif
+
 LOCAL_C_INCLUDES := \
 	$(WRS_OMXIL_CORE_ROOT)/utils/inc \
 	$(WRS_OMXIL_CORE_ROOT)/base/inc \
@@ -26,8 +30,8 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libwrs_omxil_common
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libwrs_omxil_common
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libwrs_omxil_utils \
diff --git a/base/src/portvideo.cpp b/base/src/portvideo.cpp
index 1e92e12..bad4daf 100644
--- a/base/src/portvideo.cpp
+++ b/base/src/portvideo.cpp
@@ -183,9 +183,15 @@ PortAvc::PortAvc()
     memset(&avcparam, 0, sizeof(avcparam));
 
     //set buffer sharing mode
+#ifdef COMPONENT_USE_BUFFERSHARING
     SetPortBufferSharingInfo(OMX_TRUE);
     avcparam.eProfile = OMX_VIDEO_AVCProfileVendorStartUnused;
     avcparam.eLevel = OMX_VIDEO_AVCLevelVendorStartUnused;
+#else
+    SetPortBufferSharingInfo(OMX_FALSE);
+//    avcparam.eProfile = OMX_VIDEO_AVCProfileVendorStartUnused;
+//    avcparam.eLevel = OMX_VIDEO_AVCLevelVendorStartUnused;
+#endif
 
     ComponentBase::SetTypeHeader(&avcparam, sizeof(avcparam));
 }
@@ -257,6 +263,16 @@ PortMpeg4::PortMpeg4()
 
     memset(&mpeg4param, 0, sizeof(mpeg4param));
     ComponentBase::SetTypeHeader(&mpeg4param, sizeof(mpeg4param));
+
+#ifdef COMPONENT_USE_BUFFERSHARING
+    SetPortBufferSharingInfo(OMX_TRUE);
+    mpeg4param.eProfile = OMX_VIDEO_MPEG4ProfileVendorStartUnused;
+    mpeg4param.eLevel = OMX_VIDEO_MPEG4LevelVendorStartUnused;
+#else
+    SetPortBufferSharingInfo(OMX_FALSE);
+//  mpeg4param.eProfile = OMX_VIDEO_MPEG4ProfileVendorStartUnused;
+//  mpeg4param.eLevel = OMX_VIDEO_MPEG4LevelVendorStartUnused;
+#endif
 }
 
 OMX_ERRORTYPE PortMpeg4::SetPortMpeg4Param(
@@ -319,9 +335,15 @@ PortH263::PortH263()
     memset(&h263param, 0, sizeof(h263param));
 
     //set buffer sharing mode
+#ifdef COMPONENT_USE_BUFFERSHARING
     SetPortBufferSharingInfo(OMX_TRUE);
     h263param.eProfile = OMX_VIDEO_H263ProfileVendorStartUnused;
     h263param.eLevel = OMX_VIDEO_H263LevelVendorStartUnused;
+#else
+    SetPortBufferSharingInfo(OMX_FALSE);
+//    h263param.eProfile = OMX_VIDEO_H263ProfileVendorStartUnused;
+//    h263param.eLevel = OMX_VIDEO_H263LevelVendorStartUnused;
+#endif
 
     ComponentBase::SetTypeHeader(&h263param, sizeof(h263param));
 }
diff --git a/core/src/Android.mk b/core/src/Android.mk
index 75a7383..de4bb47 100644
--- a/core/src/Android.mk
+++ b/core/src/Android.mk
@@ -2,14 +2,13 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-	wrs_omxcore.cpp \
-	pv_omx_interface.cpp \
-        intel_omx_config_parser.cpp \
-        intel_video_config_parser.cpp \
-        intel_m4v_config_parser.cpp
+	wrs_omxcore.cpp
+ #       intel_omx_config_parser.cpp \
+ #       intel_video_config_parser.cpp \
+ #       intel_m4v_config_parser.cpp
 
-LOCAL_MODULE := libwrs_omxil_core_pvwrapped
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libwrs_omxil_core_pvwrapped
 
 LOCAL_CPPFLAGS :=
 
@@ -17,8 +16,8 @@ LOCAL_LDFLAGS :=
 
 LOCAL_SHARED_LIBRARIES := \
 	libwrs_omxil_common \
-	liblog \
-        libopencore_common
+	liblog
+#        libopencore_common
 
 LOCAL_C_INCLUDES := \
 	$(WRS_OMXIL_CORE_ROOT)/utils/inc \
diff --git a/utils/src/Android.mk b/utils/src/Android.mk
index 526fe6c..8d6a86d 100644
--- a/utils/src/Android.mk
+++ b/utils/src/Android.mk
@@ -9,8 +9,8 @@ LOCAL_SRC_FILES := \
 	workqueue.cpp \
 	audio_parser.c
 
-LOCAL_MODULE := libwrs_omxil_utils
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libwrs_omxil_utils
 
 LOCAL_CFLAGS :=