diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-08 23:22:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-08 23:22:04 -0700 |
| commit | bb13d26efe4c413abaa22c47ebf29d703a3b7a8e (patch) | |
| tree | e4790cdc36d7fca5023fb1dea013047b2a535f6c /mm-video-v4l2 | |
| parent | 3d37db98b216d900c7938870ce74f06c6ad9c16b (diff) | |
| parent | b1938a96ab5bb02397162bfd1654c65d2a0bba32 (diff) | |
| download | media-bb13d26efe4c413abaa22c47ebf29d703a3b7a8e.tar.gz | |
Merge "mm-video-v4l2: vdec: Advertise Main10HDR10 Profile"
Diffstat (limited to 'mm-video-v4l2')
| -rw-r--r-- | mm-video-v4l2/vidc/common/src/vidc_common.cpp | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mm-video-v4l2/vidc/common/src/vidc_common.cpp b/mm-video-v4l2/vidc/common/src/vidc_common.cpp index de46cac5..d9c6e7e9 100644 --- a/mm-video-v4l2/vidc/common/src/vidc_common.cpp +++ b/mm-video-v4l2/vidc/common/src/vidc_common.cpp @@ -58,7 +58,7 @@ pl_map profile_level_converter::profile_avc_v4l2_to_omx ({}); pl_map profile_level_converter::profile_hevc_omx_to_v4l2 ({ {OMX_VIDEO_HEVCProfileMain, V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN}, - {OMX_VIDEO_HEVCProfileMain10, + {OMX_VIDEO_HEVCProfileMain10HDR10, V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN10}, }); diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index ba5436ec..df898d3c 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -3315,7 +3315,7 @@ OMX_ERRORTYPE omx_vdec::get_supported_profile_level(OMX_VIDEO_PARAM_PROFILELEVEL QOMX_VIDEO_AVCProfileConstrainedHigh, QOMX_VIDEO_AVCProfileHigh }; int hevc_profiles[2] = { OMX_VIDEO_HEVCProfileMain, - OMX_VIDEO_HEVCProfileMain10 }; + OMX_VIDEO_HEVCProfileMain10HDR10 }; int mpeg2_profiles[2] = { OMX_VIDEO_MPEG2ProfileSimple, OMX_VIDEO_MPEG2ProfileMain}; int vp9_profiles[2] = { OMX_VIDEO_VP9Profile0, |