diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-01-08 21:07:30 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-01-08 21:07:30 -0800 |
| commit | 455f3d00642efda6471f7d1658f41d496e8149ab (patch) | |
| tree | 99dd58b489b372126d2fc192dad6c858eb775d45 | |
| parent | f8524bea5b8636f5c5a77152e3ac008ed051a9e2 (diff) | |
| parent | dbbc87bad99d6fd4f0b0c693191f4870cf7ded0b (diff) | |
| download | android_hardware_qcom_media-455f3d00642efda6471f7d1658f41d496e8149ab.tar.gz android_hardware_qcom_media-455f3d00642efda6471f7d1658f41d496e8149ab.tar.bz2 android_hardware_qcom_media-455f3d00642efda6471f7d1658f41d496e8149ab.zip | |
Merge branch 'LA.BF.1.1.3_rb1.7' of git://codeaurora.org/platform/hardware/qcom/media into cm-13.0
| -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 abea3046..dba0b8b6 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 && |