Revert "omx-components: fix CTS MediaCodecListTest failure issue"

BZ: 54024

This reverts commit 78445c361f411cd154c40936ed6e01b82334fd3e.

Change-Id: I306634a24e1d67c5b3141fc620197d28c6a93d01
Signed-off-by: Remy Protat <remyx.protat@intel.com>
Reviewed-on: http://android.intel.com:8080/68899

8 files changed, 3 insertions, 92 deletions

diff --git a/videocodec/OMXVideoEncoderAVC.cpp b/videocodec/OMXVideoEncoderAVC.cpp
index 9a59485..9a39570 100644
--- a/videocodec/OMXVideoEncoderAVC.cpp
+++ b/videocodec/OMXVideoEncoderAVC.cpp
@@ -466,37 +466,9 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::BuildHandlerList(void) {
     AddHandler((OMX_INDEXTYPE)OMX_IndexConfigIntelSliceNumbers, GetConfigIntelSliceNumbers, SetConfigIntelSliceNumbers);
     AddHandler((OMX_INDEXTYPE)OMX_IndexParamIntelAVCVUI, GetParamIntelAVCVUI, SetParamIntelAVCVUI);
     AddHandler((OMX_INDEXTYPE)OMX_IndexParamVideoBytestream, GetParamVideoBytestream, SetParamVideoBytestream);
-    AddHandler((OMX_INDEXTYPE)OMX_IndexParamVideoProfileLevelQuerySupported, GetParamVideoProfileLevelQuerySupported, SetParamVideoProfileLevelQuerySupported);
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderAVC::GetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
-    OMX_ERRORTYPE ret;
-    OMX_VIDEO_PARAM_PROFILELEVELTYPE *p = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *)pStructure;
-    CHECK_TYPE_HEADER(p);
-    CHECK_PORT_INDEX(p, OUTPORT_INDEX);
-
-    struct ProfileLevelTable {
-        OMX_U32 profile;
-        OMX_U32 level;
-    } plTable[] = {
-        {OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel41},
-    };
-
-    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 OMXVideoEncoderAVC::SetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
-    LOGW("SetParamVideoAVCProfileLevel is not supported.");
-    return OMX_ErrorUnsupportedSetting;
-}
-
 OMX_ERRORTYPE OMXVideoEncoderAVC::GetParamVideoAvc(OMX_PTR pStructure) {
     OMX_ERRORTYPE ret;
     OMX_VIDEO_PARAM_AVCTYPE *p = (OMX_VIDEO_PARAM_AVCTYPE *)pStructure;
diff --git a/videocodec/OMXVideoEncoderAVC.h b/videocodec/OMXVideoEncoderAVC.h
index 1f32118..e0de2f2 100644
--- a/videocodec/OMXVideoEncoderAVC.h
+++ b/videocodec/OMXVideoEncoderAVC.h
@@ -46,7 +46,7 @@ protected:
     DECLARE_HANDLER(OMXVideoEncoderAVC, ParamIntelAVCVUI);
     DECLARE_HANDLER(OMXVideoEncoderAVC, ParamVideoBytestream);
     DECLARE_HANDLER(OMXVideoEncoderAVC, ConfigIntelSliceNumbers);
-    DECLARE_HANDLER(OMXVideoEncoderAVC, ParamVideoProfileLevelQuerySupported);
+
 
 private:
     enum {
diff --git a/videocodec/OMXVideoEncoderBase.cpp b/videocodec/OMXVideoEncoderBase.cpp
index 63ab076..0c812e1 100644
--- a/videocodec/OMXVideoEncoderBase.cpp
+++ b/videocodec/OMXVideoEncoderBase.cpp
@@ -443,7 +443,7 @@ OMX_ERRORTYPE OMXVideoEncoderBase::BuildHandlerList(void) {
     AddHandler(OMX_IndexConfigVideoFramerate, GetConfigVideoFramerate, SetConfigVideoFramerate);
     AddHandler(OMX_IndexConfigVideoIntraVOPRefresh, GetConfigVideoIntraVOPRefresh, SetConfigVideoIntraVOPRefresh);
     //AddHandler(OMX_IndexParamIntelAdaptiveSliceControl, GetParamIntelAdaptiveSliceControl, SetParamIntelAdaptiveSliceControl);
-    //AddHandler(OMX_IndexParamVideoProfileLevelQuerySupported, GetParamVideoProfileLevelQuerySupported, SetParamVideoProfileLevelQuerySupported);
+    AddHandler(OMX_IndexParamVideoProfileLevelQuerySupported, GetParamVideoProfileLevelQuerySupported, SetParamVideoProfileLevelQuerySupported);
     AddHandler((OMX_INDEXTYPE)OMX_IndexStoreMetaDataInBuffers, GetStoreMetaDataInBuffers, SetStoreMetaDataInBuffers);
 
     return OMX_ErrorNone;
@@ -786,7 +786,6 @@ OMX_ERRORTYPE OMXVideoEncoderBase::SetParamIntelAdaptiveSliceControl(OMX_PTR pSt
     return OMX_ErrorNone;
 }
 
-/*
 OMX_ERRORTYPE OMXVideoEncoderBase::GetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
     OMX_ERRORTYPE ret;
     OMX_VIDEO_PARAM_PROFILELEVELTYPE *p = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *)pStructure;
@@ -805,7 +804,6 @@ OMX_ERRORTYPE OMXVideoEncoderBase::SetParamVideoProfileLevelQuerySupported(OMX_P
     LOGW("SetParamVideoProfileLevelQuerySupported is not supported.");
     return OMX_ErrorUnsupportedSetting;
 }
-*/
 
 OMX_ERRORTYPE OMXVideoEncoderBase::GetStoreMetaDataInBuffers(OMX_PTR pStructure) {
     OMX_ERRORTYPE ret;
diff --git a/videocodec/OMXVideoEncoderBase.h b/videocodec/OMXVideoEncoderBase.h
index ee36f47..95c8216 100644
--- a/videocodec/OMXVideoEncoderBase.h
+++ b/videocodec/OMXVideoEncoderBase.h
@@ -65,7 +65,7 @@ protected:
     DECLARE_HANDLER(OMXVideoEncoderBase, ConfigVideoFramerate);
     DECLARE_HANDLER(OMXVideoEncoderBase, ConfigVideoIntraVOPRefresh);
     DECLARE_HANDLER(OMXVideoEncoderBase, ParamIntelAdaptiveSliceControl);
-    //DECLARE_HANDLER(OMXVideoEncoderBase, ParamVideoProfileLevelQuerySupported);
+    DECLARE_HANDLER(OMXVideoEncoderBase, ParamVideoProfileLevelQuerySupported);
     DECLARE_HANDLER(OMXVideoEncoderBase, StoreMetaDataInBuffers);
 
 protected:
diff --git a/videocodec/OMXVideoEncoderH263.cpp b/videocodec/OMXVideoEncoderH263.cpp
index 84cc9a8..15572a4 100644
--- a/videocodec/OMXVideoEncoderH263.cpp
+++ b/videocodec/OMXVideoEncoderH263.cpp
@@ -236,37 +236,9 @@ out:
 OMX_ERRORTYPE OMXVideoEncoderH263::BuildHandlerList(void) {
     OMXVideoEncoderBase::BuildHandlerList();
     AddHandler(OMX_IndexParamVideoH263, GetParamVideoH263, SetParamVideoH263);
-    AddHandler(OMX_IndexParamVideoProfileLevelQuerySupported, GetParamVideoProfileLevelQuerySupported, SetParamVideoProfileLevelQuerySupported);    
     return OMX_ErrorNone;
 }
 
-OMX_ERRORTYPE OMXVideoEncoderH263::GetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
-    OMX_ERRORTYPE ret;
-    OMX_VIDEO_PARAM_PROFILELEVELTYPE *p = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *)pStructure;
-    CHECK_TYPE_HEADER(p);
-    CHECK_PORT_INDEX(p, OUTPORT_INDEX);
-
-    struct ProfileLevelTable {
-        OMX_U32 profile;
-        OMX_U32 level;
-    } plTable[] = {
-        {OMX_VIDEO_H263ProfileBaseline, OMX_VIDEO_H263Level45}
-    };
-
-    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 OMXVideoEncoderH263::SetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
-    LOGW("SetParamVideoH263ProfileLevel is not supported.");
-    return OMX_ErrorUnsupportedSetting;
-}
-
 OMX_ERRORTYPE OMXVideoEncoderH263::GetParamVideoH263(OMX_PTR pStructure) {
     OMX_ERRORTYPE ret;
     OMX_VIDEO_PARAM_H263TYPE *p = (OMX_VIDEO_PARAM_H263TYPE *)pStructure;
diff --git a/videocodec/OMXVideoEncoderH263.h b/videocodec/OMXVideoEncoderH263.h
index 172763e..44f5fbc 100644
--- a/videocodec/OMXVideoEncoderH263.h
+++ b/videocodec/OMXVideoEncoderH263.h
@@ -38,7 +38,6 @@ protected:
     virtual OMX_ERRORTYPE BuildHandlerList(void);
     virtual OMX_ERRORTYPE SetVideoEncoderParam();
     DECLARE_HANDLER(OMXVideoEncoderH263, ParamVideoH263);
-    DECLARE_HANDLER(OMXVideoEncoderH263, ParamVideoProfileLevelQuerySupported);
 
 private:
     enum {
diff --git a/videocodec/OMXVideoEncoderMPEG4.cpp b/videocodec/OMXVideoEncoderMPEG4.cpp
index 918b391..d9273f4 100644
--- a/videocodec/OMXVideoEncoderMPEG4.cpp
+++ b/videocodec/OMXVideoEncoderMPEG4.cpp
@@ -240,38 +240,9 @@ out:
 OMX_ERRORTYPE OMXVideoEncoderMPEG4::BuildHandlerList(void) {
     OMXVideoEncoderBase::BuildHandlerList();
     AddHandler(OMX_IndexParamVideoMpeg4, GetParamVideoMpeg4, SetParamVideoMpeg4);
-    AddHandler(OMX_IndexParamVideoProfileLevelQuerySupported, GetParamVideoProfileLevelQuerySupported, SetParamVideoProfileLevelQuerySupported);    
     return OMX_ErrorNone;
 }
 
-
-OMX_ERRORTYPE OMXVideoEncoderMPEG4::GetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
-    OMX_ERRORTYPE ret;
-    OMX_VIDEO_PARAM_PROFILELEVELTYPE *p = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *)pStructure;
-    CHECK_TYPE_HEADER(p);
-    CHECK_PORT_INDEX(p, OUTPORT_INDEX);
-
-    struct ProfileLevelTable {
-        OMX_U32 profile;
-        OMX_U32 level;
-    } plTable[] = {
-        {OMX_VIDEO_MPEG4ProfileSimple, OMX_VIDEO_MPEG4Level5},
-    };
-
-    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 OMXVideoEncoderMPEG4::SetParamVideoProfileLevelQuerySupported(OMX_PTR pStructure) {
-    LOGW("SetParamVideoMpeg4ProfileLevel is not supported.");
-    return OMX_ErrorUnsupportedSetting;
-}
-
 OMX_ERRORTYPE OMXVideoEncoderMPEG4::GetParamVideoMpeg4(OMX_PTR pStructure) {
     OMX_ERRORTYPE ret;
     OMX_VIDEO_PARAM_MPEG4TYPE *p = (OMX_VIDEO_PARAM_MPEG4TYPE *)pStructure;
diff --git a/videocodec/OMXVideoEncoderMPEG4.h b/videocodec/OMXVideoEncoderMPEG4.h
index 31f75d9..33b93a2 100644
--- a/videocodec/OMXVideoEncoderMPEG4.h
+++ b/videocodec/OMXVideoEncoderMPEG4.h
@@ -39,7 +39,6 @@ protected:
     virtual OMX_ERRORTYPE BuildHandlerList(void);
     virtual OMX_ERRORTYPE SetVideoEncoderParam();
     DECLARE_HANDLER(OMXVideoEncoderMPEG4, ParamVideoMpeg4);
-    DECLARE_HANDLER(OMXVideoEncoderMPEG4, ParamVideoProfileLevelQuerySupported);
 
 private:
     enum {