diff options
author | Sanjay Singh <sisanj@codeaurora.org> | 2020-07-01 05:33:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 05:33:38 +0000 |
commit | 9147d401be52049c6783510aacb85edb824afa79 (patch) | |
tree | 9177cbff96b39f6013822f0f8e36637c30de773a | |
parent | d8c40b974cc12e493f750a73143b56a89bacbec1 (diff) | |
parent | 9ad99a7ff05132f8acd4f24b1acd9dfc88e37489 (diff) | |
download | media-9147d401be52049c6783510aacb85edb824afa79.tar.gz |
mm-video-v4l2: venc: Correction in profile check for H.264 am: 6290468c22 am: 9ad99a7ff0android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/11999650
Change-Id: I0686063eba950ff3406e9b8999ff34f07045d6a6
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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; } |