Refine setting config max frame size for VP8 in OMX IL.

BZ: 166007

Modify the implementation of this interface in OMX IL.
It only pass down the ratio not the real size to libmix.
Fix buildbot -1 issue

Change-Id: Ifeaf169e4d26e13f99910e8e4e6053b945f71c3f
Signed-off-by: liubolun <bolun.liu@intel.com>

2 files changed, 9 insertions, 11 deletions

diff --git a/videocodec/OMXVideoEncoderVP8.cpp b/videocodec/OMXVideoEncoderVP8.cpp
index 8786f6e..2ae6905 100644
--- a/videocodec/OMXVideoEncoderVP8.cpp
+++ b/videocodec/OMXVideoEncoderVP8.cpp
@@ -193,7 +193,7 @@ OMX_ERRORTYPE OMXVideoEncoderVP8::BuildHandlerList(void) {
     AddHandler((OMX_INDEXTYPE)OMX_IndexParamVideoVp8, GetParamVideoVp8, SetParamVideoVp8);
     AddHandler((OMX_INDEXTYPE)OMX_IndexConfigVideoVp8ReferenceFrame, GetConfigVideoVp8ReferenceFrame, SetConfigVideoVp8ReferenceFrame);
     AddHandler((OMX_INDEXTYPE)OMX_IndexExtVP8ForceKFrame, GetConfigVp8ForceKFrame, SetConfigVp8ForceKFrame);
-    AddHandler((OMX_INDEXTYPE)OMX_IndexExtVP8MaxFrameSize, GetConfigVp8MaxFrameSize, SetConfigVp8MaxFrameSize);
+    AddHandler((OMX_INDEXTYPE)OMX_IndexExtVP8MaxFrameSizeRatio, GetConfigVp8MaxFrameSizeRatio, SetConfigVp8MaxFrameSizeRatio);
     return OMX_ErrorNone;
 }
 
@@ -280,26 +280,26 @@ OMX_ERRORTYPE OMXVideoEncoderVP8::SetConfigVp8ForceKFrame(OMX_PTR pStructure) {
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderVP8::GetConfigVp8MaxFrameSize(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderVP8::GetConfigVp8MaxFrameSizeRatio(OMX_PTR pStructure) {
 
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderVP8::SetConfigVp8MaxFrameSize(OMX_PTR pStructure) {
+OMX_ERRORTYPE OMXVideoEncoderVP8::SetConfigVp8MaxFrameSizeRatio(OMX_PTR pStructure) {
     OMX_ERRORTYPE ret;
     Encode_Status retStatus = ENCODE_SUCCESS;
-    OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE *p = (OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE*)pStructure;
+    OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE_RATIO *p = (OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE_RATIO*)pStructure;
     CHECK_TYPE_HEADER(p);
     CHECK_PORT_INDEX(p, OUTPORT_INDEX);
 
     CHECK_SET_CONFIG_STATE();
 
-    VideoConfigVP8MaxFrameSize configVP8MaxFrameSize;
-    configVP8MaxFrameSize.max_frame_size = p->nMaxFrameSize;
+    VideoConfigVP8MaxFrameSizeRatio configVP8MaxFrameSizeRatio;
+    configVP8MaxFrameSizeRatio.max_frame_size_ratio = p->nMaxFrameSizeRatio;
 
-    retStatus = mVideoEncoder->setConfig(&configVP8MaxFrameSize);
+    retStatus = mVideoEncoder->setConfig(&configVP8MaxFrameSizeRatio);
     if(retStatus != ENCODE_SUCCESS) {
-        LOGW("Failed to set vp8 max frame size");
+        LOGW("Failed to set vp8 max frame size ratio");
     }
 
     return OMX_ErrorNone;
diff --git a/videocodec/OMXVideoEncoderVP8.h b/videocodec/OMXVideoEncoderVP8.h
index c7c26b5..fbb97df 100644
--- a/videocodec/OMXVideoEncoderVP8.h
+++ b/videocodec/OMXVideoEncoderVP8.h
@@ -18,7 +18,7 @@ class OMXVideoEncoderVP8 : public OMXVideoEncoderBase {
         DECLARE_HANDLER(OMXVideoEncoderVP8, ParamVideoVp8);
         DECLARE_HANDLER(OMXVideoEncoderVP8, ConfigVideoVp8ReferenceFrame);
         DECLARE_HANDLER(OMXVideoEncoderVP8, ConfigVp8ForceKFrame);
-        DECLARE_HANDLER(OMXVideoEncoderVP8, ConfigVp8MaxFrameSize);
+        DECLARE_HANDLER(OMXVideoEncoderVP8, ConfigVp8MaxFrameSizeRatio);
     private:
         enum {
             OUTPORT_MIN_BUFFER_COUNT = 1,
@@ -28,8 +28,6 @@ class OMXVideoEncoderVP8 : public OMXVideoEncoderBase {
 
         OMX_VIDEO_PARAM_VP8TYPE mParamVp8;
         OMX_VIDEO_VP8REFERENCEFRAMETYPE mConfigVideoVp8ReferenceFrame;
-        OMX_VIDEO_CONFIG_INTEL_VP8_FORCE_KFRAME mVideoConfigVP8ForceKFrame;
-        OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE mVideoConfigVP8MaxFrameSize;
 };
 
 #endif /* OMX_VIDEO_ENCODER_VP8_H */