| commit | 9147d401be52049c6783510aacb85edb824afa79 | [log] [tgz] |
|---|---|---|
| author | Sanjay Singh <sisanj@codeaurora.org> | Wed Jul 01 05:33:38 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 01 05:33:38 2020 +0000 |
| tree | 9177cbff96b39f6013822f0f8e36637c30de773a | |
| parent | d8c40b974cc12e493f750a73143b56a89bacbec1 [diff] | |
| parent | 9ad99a7ff05132f8acd4f24b1acd9dfc88e37489 [diff] |
mm-video-v4l2: venc: Correction in profile check for H.264 am: 6290468c22 am: 9ad99a7ff0 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/11999650 Change-Id: I0686063eba950ff3406e9b8999ff34f07045d6a6
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 @@ 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; }