summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-07-02 01:06:48 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-07-02 01:06:48 +0000
commitd6c21a4c8ae93915f47166ececd4c655ec097dd2 (patch)
tree9177cbff96b39f6013822f0f8e36637c30de773a
parentdb2409378cb8152d6c1d98febabf3443573ab77c (diff)
parent6290468c22ecccf32ebfc4438dd9ff0b67022048 (diff)
downloadmedia-android11-security-release.tar.gz
Snap for 6647388 from 6290468c22ecccf32ebfc4438dd9ff0b67022048 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release
Change-Id: Ifc376b5ce50f879d37afa881efd6becd7f3ac2d1
-rw-r--r--msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp8
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;
}