diff options
| author | Yuanjun Huang <yuanjun.huang@intel.com> | 2015-01-17 03:57:07 +0800 |
|---|---|---|
| committer | Pat Tjin <pattjin@google.com> | 2015-01-21 20:24:48 +0000 |
| commit | 237fe154e8c1a073f74685e7cba7d4feba4317b0 (patch) | |
| tree | edd3b1f005d7e40e74f1bf53e705ca6253c0d6a5 | |
| parent | d7a24953f38460360b0cbfc14145b4067f9ed02b (diff) | |
| download | android_hardware_intel_common_omx-components-237fe154e8c1a073f74685e7cba7d4feba4317b0.tar.gz android_hardware_intel_common_omx-components-237fe154e8c1a073f74685e7cba7d4feba4317b0.tar.bz2 android_hardware_intel_common_omx-components-237fe154e8c1a073f74685e7cba7d4feba4317b0.zip | |
AVC secure OMX component - Change the level to 4.2 to pass new CTS cases.
Bug: 19080217
Change-Id: I38452077288ccf9d370b730de839af11d5277725
Signed-off-by: Yuanjun Huang <yuanjun.huang@intel.com>
| -rwxr-xr-x | videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp index 1cee46c..f976e0b 100755 --- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp +++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp @@ -497,10 +497,21 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::GetParamVideoAVCProfileLevel(OMX_PTR pSt OMX_VIDEO_PARAM_PROFILELEVELTYPE *p = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *)pStructure; CHECK_TYPE_HEADER(p); CHECK_PORT_INDEX(p, INPORT_INDEX); - CHECK_ENUMERATION_RANGE(p->nProfileIndex,1); - p->eProfile = mParamAvc.eProfile; - p->eLevel = mParamAvc.eLevel; + struct ProfileLevelTable { + OMX_U32 profile; + OMX_U32 level; + } plTable[] = { + {OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel42}, + {OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel42}, + {OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel42} + }; + + 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; } |