diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-12-14 00:09:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-12-14 00:09:33 -0800 |
| commit | dbbc87bad99d6fd4f0b0c693191f4870cf7ded0b (patch) | |
| tree | 9c183c9b2bb7dbfab22708db67ef729924b8f435 | |
| parent | 4193f60d9b89535fb74f8e98628a6ba61ec2e354 (diff) | |
| parent | 8baa29b1cfa70e149bab5e519426bb406d765343 (diff) | |
| download | android_hardware_qcom_media-dbbc87bad99d6fd4f0b0c693191f4870cf7ded0b.tar.gz android_hardware_qcom_media-dbbc87bad99d6fd4f0b0c693191f4870cf7ded0b.tar.bz2 android_hardware_qcom_media-dbbc87bad99d6fd4f0b0c693191f4870cf7ded0b.zip | |
Merge "mm-video-v4l2: Restrict hevc hybrid usecases upto 720p"
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp index 39e2dfee..cf2bff00 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc_swvdec.cpp @@ -3374,6 +3374,20 @@ OMX_ERRORTYPE omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE hComp, (int)portDefn->format.video.nFrameHeight, (int)portDefn->format.video.nFrameWidth); + // for 8x26, if the dimension exceeds 720p, reject it + // so that the stagefright can try the software hevc component + char platform_name[PROPERTY_VALUE_MAX]; + property_get("ro.board.platform", platform_name, "0"); + if (!strncmp(platform_name, "msm8226", 7)) + { + if ((portDefn->format.video.nFrameHeight * + portDefn->format.video.nFrameWidth) > (736 * 1280)) + { + DEBUG_PRINT_ERROR("8926 hevc-hybrid supports up to 720p only"); + return OMX_ErrorBadParameter; + } + } + // for pure dsp mode, if the dimension exceeds 720p, reject it // so that the stagefright can try the hybrid component if (!m_pSwVdec && |