diff options
| author | Xin Li <delphij@google.com> | 2020-09-08 16:55:38 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-09-08 16:55:38 -0700 |
| commit | d35f73268556c503da7845378db4676468b7fa4d (patch) | |
| tree | 6ace48e245836b349db1f128df56253566d49418 | |
| parent | 5a55889bc09d9972e188287e60f1f8f616c09d1b (diff) | |
| parent | ce53e79382e78b154ee666926bd62171af2dbe22 (diff) | |
| download | media-d35f73268556c503da7845378db4676468b7fa4d.tar.gz | |
Merge Android R
Bug: 168057903
Merged-In: I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e
Change-Id: I5aa590d6a789b545d6939396ffeb20d7a4ffe970
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 2 | ||||
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index 7079f81..c4ba834 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -3600,7 +3600,7 @@ OMX_ERRORTYPE omx_vdec::get_supported_profile_level(OMX_VIDEO_PARAM_PROFILELEVEL if (profileLevelType->nPortIndex == 0) { if (!strncmp(drv_ctx.kind, "OMX.qcom.video.decoder.avc",OMX_MAX_STRINGNAME_SIZE)) { - profileLevelType->eLevel = OMX_VIDEO_AVCLevel51; + profileLevelType->eLevel = OMX_VIDEO_AVCLevel52; if (profileLevelType->nProfileIndex == 0) { profileLevelType->eProfile = OMX_VIDEO_AVCProfileBaseline; } else if (profileLevelType->nProfileIndex == 1) { diff --git a/msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp index 0bdd914..ef691d6 100644 --- a/msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp +++ b/msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp @@ -7733,10 +7733,12 @@ bool venc_dev::venc_validate_profile_level(OMX_U32 *eProfile, OMX_U32 *eLevel) profile_tbl = (unsigned int const *)h264_profile_level_table; if ((*eProfile != OMX_VIDEO_AVCProfileBaseline) && - (*eProfile != QOMX_VIDEO_AVCProfileConstrainedBaseline) && + (*eProfile != OMX_VIDEO_AVCProfileMain) && (*eProfile != OMX_VIDEO_AVCProfileHigh) && - (*eProfile != QOMX_VIDEO_AVCProfileConstrainedHigh) && - (*eProfile != OMX_VIDEO_AVCProfileMain)) { + (*eProfile != OMX_VIDEO_AVCProfileConstrainedBaseline) && + (*eProfile != QOMX_VIDEO_AVCProfileConstrainedBaseline) && + (*eProfile != OMX_VIDEO_AVCProfileConstrainedHigh) && + (*eProfile != QOMX_VIDEO_AVCProfileConstrainedHigh)) { DEBUG_PRINT_LOW("Unsupported AVC profile type %u", (unsigned int)*eProfile); return false; } |