diff options
author | Yuanjun Huang <yuanjun.huang@intel.com> | 2015-01-21 22:16:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-21 22:16:20 +0000 |
commit | 95d1da0974f250c7fb7a86c7aa00f6693529bbbb (patch) | |
tree | ea0fa4a37d754a4433ed659fd5be7c465adb29ab | |
parent | 6d9e8b016642da221906cb3cbe106a4d321ebd89 (diff) | |
parent | 237fe154e8c1a073f74685e7cba7d4feba4317b0 (diff) | |
download | android_hardware_intel_common_omx-components-95d1da0974f250c7fb7a86c7aa00f6693529bbbb.tar.gz android_hardware_intel_common_omx-components-95d1da0974f250c7fb7a86c7aa00f6693529bbbb.tar.bz2 android_hardware_intel_common_omx-components-95d1da0974f250c7fb7a86c7aa00f6693529bbbb.zip |
am 237fe154: AVC secure OMX component - Change the level to 4.2 to pass new CTS cases.
* commit '237fe154e8c1a073f74685e7cba7d4feba4317b0':
AVC secure OMX component - Change the level to 4.2 to pass new CTS cases.
-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 101a34d..1e81645 100755 --- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp +++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp @@ -495,10 +495,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; } |