diff options
| author | Deva Ramasubramanian <dramasub@codeaurora.org> | 2016-01-22 17:53:22 -0800 |
|---|---|---|
| committer | Tommaso Fonda <fondatommaso2@gmail.com> | 2021-11-12 17:07:48 +0100 |
| commit | 921538f4e1436038b01cf24e567c6fe949917652 (patch) | |
| tree | 2c9a662080969cf98e643490e0106b4d8522eb08 | |
| parent | e8a59559b5a4efe31e8fc6d0e3697ba1a0a1cd2f (diff) | |
mm-video: vidc: Advertise the correct max supported levels12.1-caf-8974
We've supported 5.1 for H264 for a while now. Since we happen to
advertise 5.1 in media_profiles.xml, the component should likewise be
advertising the same.
b/26454040
Change-Id: Ied82d7fbb06a67c406ab6752add7c6f95b9af385
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/inc/omx_vdec.h | 7 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h index 99de7953..9e2080b6 100644 --- a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h +++ b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h @@ -591,12 +591,7 @@ class omx_vdec: public qc_omx_component OMX_PTR appData, OMX_U32 bytes, OMX_U8 *buffer); -#ifdef MAX_RES_720P - OMX_ERRORTYPE get_supported_profile_level_for_720p(OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevelType); -#endif -#ifdef MAX_RES_1080P - OMX_ERRORTYPE get_supported_profile_level_for_1080p(OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevelType); -#endif + OMX_ERRORTYPE get_supported_profile_level(OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevelType); OMX_ERRORTYPE allocate_desc_buffer(OMX_U32 index); OMX_ERRORTYPE allocate_output_headers(); diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index 4ae21b10..eefb1fcc 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -2702,7 +2702,7 @@ bool omx_vdec::post_event(unsigned int p1, return bRet; } -OMX_ERRORTYPE omx_vdec::get_supported_profile_level_for_1080p(OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevelType) +OMX_ERRORTYPE omx_vdec::get_supported_profile_level(OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevelType) { OMX_ERRORTYPE eRet = OMX_ErrorNone; if (!profileLevelType) @@ -2712,14 +2712,14 @@ OMX_ERRORTYPE omx_vdec::get_supported_profile_level_for_1080p(OMX_VIDEO_PARAM_PR if (!strncmp(drv_ctx.kind, "OMX.qcom.video.decoder.avc",OMX_MAX_STRINGNAME_SIZE)) { if (profileLevelType->nProfileIndex == 0) { profileLevelType->eProfile = OMX_VIDEO_AVCProfileBaseline; - profileLevelType->eLevel = OMX_VIDEO_AVCLevel4; + profileLevelType->eLevel = OMX_VIDEO_AVCLevel51; } else if (profileLevelType->nProfileIndex == 1) { profileLevelType->eProfile = OMX_VIDEO_AVCProfileMain; - profileLevelType->eLevel = OMX_VIDEO_AVCLevel4; + profileLevelType->eLevel = OMX_VIDEO_AVCLevel51; } else if (profileLevelType->nProfileIndex == 2) { profileLevelType->eProfile = OMX_VIDEO_AVCProfileHigh; - profileLevelType->eLevel = OMX_VIDEO_AVCLevel4; + profileLevelType->eLevel = OMX_VIDEO_AVCLevel51; } else { DEBUG_PRINT_LOW("get_parameter: OMX_IndexParamVideoProfileLevelQuerySupported nProfileIndex ret NoMore %lu", profileLevelType->nProfileIndex); @@ -2967,7 +2967,7 @@ OMX_ERRORTYPE omx_vdec::get_parameter(OMX_IN OMX_HANDLETYPE hComp, DEBUG_PRINT_LOW("get_parameter: OMX_IndexParamVideoProfileLevelQuerySupported %08x", paramIndex); OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevelType = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *)paramData; - eRet = get_supported_profile_level_for_1080p(profileLevelType); + eRet = get_supported_profile_level(profileLevelType); break; } #if defined (_ANDROID_HONEYCOMB_) || defined (_ANDROID_ICS_) |