summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanjay Singh <sisanj@codeaurora.org>2020-07-01 05:20:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-01 05:20:04 +0000
commit127a8592e28c259e8a563e99daf32a80fd9dd6f8 (patch)
tree9177cbff96b39f6013822f0f8e36637c30de773a
parentfa9f654f7ac4cf29535cbb782ff73adca5179332 (diff)
parent6290468c22ecccf32ebfc4438dd9ff0b67022048 (diff)
downloadmedia-android11-mainline-documentsui-release.tar.gz
mm-video-v4l2: venc: Correction in profile check for H.264 am: 6290468c22android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/11999650 Change-Id: Iae44b4d48eb0e794c7280100582fa863050c583f
-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;
}