commit d6c21a4c8ae93915f47166ececd4c655ec097dd2
author android-build-team Robot <android-build-team-robot@google.com> Thu Jul 02 01:06:48 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 02 01:06:48 2020 +0000
tree 9177cbff96b39f6013822f0f8e36637c30de773a
parent db2409378cb8152d6c1d98febabf3443573ab77c
parent 6290468c22ecccf32ebfc4438dd9ff0b67022048

Snap for 6647388 from 6290468c22ecccf32ebfc4438dd9ff0b67022048 to rvc-release

Change-Id: Ifc376b5ce50f879d37afa881efd6becd7f3ac2d1

msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp

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;
         }