diff options
| author | Sanjay Singh <sisanj@codeaurora.org> | 2020-06-26 16:34:22 +0530 |
|---|---|---|
| committer | Jerry Huang <huangjerry@google.com> | 2020-06-29 03:49:44 +0000 |
| commit | 6290468c22ecccf32ebfc4438dd9ff0b67022048 (patch) | |
| tree | 9177cbff96b39f6013822f0f8e36637c30de773a | |
| parent | fa9f654f7ac4cf29535cbb782ff73adca5179332 (diff) | |
| download | media-6290468c22ecccf32ebfc4438dd9ff0b67022048.tar.gz | |
mm-video-v4l2: venc: Correction in profile check for H.264android11-dev
Encoder publishes some profile as supported capablities, but
it denies these profiles if client sets it back.
Bug: 153827610
Test: android.mediav2.cts.EncoderProfileLevelTest
Change-Id: I3812602b176448c63ab7d9ca4773fae88dcb3f54
| -rw-r--r-- | msm8998/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 8 |
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; } |