summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanjay Singh <sisanj@codeaurora.org>2020-07-01 05:46:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-01 05:46:00 +0000
commit7b0ff07e22f7da8a88354ed5bab2dfa3c6a2c4a8 (patch)
tree6ace48e245836b349db1f128df56253566d49418
parentda4eb324a9511dbc6393e53f3e828085f3ceac36 (diff)
parent69e84a1221ef509e18488c98aee5727d43fc4ae4 (diff)
downloadmedia-7b0ff07e22f7da8a88354ed5bab2dfa3c6a2c4a8.tar.gz
mm-video-v4l2: venc: Correction in profile check for H.264 am: 6290468c22 am: 9ad99a7ff0 am: 69e84a1221
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/11999650 Change-Id: Ia1eed32dfac27bbeadf0b23a3a1a141d6d8a4060
-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;
}