summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeva Ramasubramanian <dramasub@codeaurora.org>2015-05-19 19:23:59 -0700
committerDeva Ramasubramanian <dramasub@codeaurora.org>2015-05-19 19:49:09 -0700
commitaf87f18b6112052338e44d4d8db3b81651534e5e (patch)
treebdf29b2d181638bbc4b6b564dd1ff97bef2018dd
parent57d0415ea84a203a8ee4fff73ef920944265a1df (diff)
downloadandroid_hardware_qcom_media-af87f18b6112052338e44d4d8db3b81651534e5e.tar.gz
android_hardware_qcom_media-af87f18b6112052338e44d4d8db3b81651534e5e.tar.bz2
android_hardware_qcom_media-af87f18b6112052338e44d4d8db3b81651534e5e.zip
mm-video-v4l2: vidc: Report supported profile & level for HEVC correctly
Previously, we didn't advertise the supported profile and level when queried from the client. This misled clients into beleiving that HEVC wasn't supported by the platform. Hence advertise the maximum profile and level. Change-Id: I0c421fa0117402ae18e758c4e0147df5943f797c
-rw-r--r--mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp9
1 files changed, 7 insertions, 2 deletions
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 d9fa1407..0843bcac 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
@@ -54,6 +54,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdlib.h>
#include <media/hardware/HardwareAPI.h>
#include <media/msm_media_info.h>
+#include <OMX_VideoExt.h>
#ifndef _ANDROID_
#include <sys/ioctl.h>
@@ -2703,9 +2704,13 @@ OMX_ERRORTYPE omx_vdec::get_supported_profile_level_for_1080p(OMX_VIDEO_PARAM_PR
eRet = OMX_ErrorNoMore;
}
} else if (!strncmp(drv_ctx.kind, "OMX.qcom.video.decoder.hevc", OMX_MAX_STRINGNAME_SIZE)) {
- DEBUG_PRINT_LOW("get_parameter: OMX_IndexParamVideoProfileLevelQuerySupported nProfileIndex ret NoMore %d",
- profileLevelType->nProfileIndex);
+ if (profileLevelType->nProfileIndex == 0) {
+ profileLevelType->eProfile = OMX_VIDEO_HEVCProfileMain;
+ profileLevelType->eLevel = OMX_VIDEO_HEVCMainTierLevel51;
+ } else {
+ DEBUG_PRINT_LOW("get_parameter: OMX_IndexParamVideoProfileLevelQuerySupported nProfileIndex ret NoMore %lu", profileLevelType->nProfileIndex);
eRet = OMX_ErrorNoMore;
+ }
} else if ((!strncmp(drv_ctx.kind, "OMX.qcom.video.decoder.h263",OMX_MAX_STRINGNAME_SIZE))) {
if (profileLevelType->nProfileIndex == 0) {
profileLevelType->eProfile = OMX_VIDEO_H263ProfileBaseline;