diff options
| author | Wen Chang Liu <wenchangliu@google.com> | 2021-03-25 04:17:54 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2021-03-25 04:17:54 +0000 |
| commit | f4ca89aa84787a036b270e8cc961c2431f73d4e9 (patch) | |
| tree | 794bc3d6b2f635a7048be022aec76458f50ca526 | |
| parent | d89538f568148cce452a0592ca311e10ed556faf (diff) | |
| parent | 2c774eef25a22a9722d79efbe3d2a338aaf96076 (diff) | |
| download | video-driver-f4ca89aa84787a036b270e8cc961c2431f73d4e9.tar.gz | |
Merge "msm: vidc: limit max level to 5.2 for avc encoder" into android-msm-barbet-4.19-rvcandroid-11.0.0_r0.116android-11.0.0_r0.110android-11.0.0_r0.106android-msm-barbet-4.19-android11-d2
| -rw-r--r-- | msm/vidc/msm_vidc_platform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/msm/vidc/msm_vidc_platform.c b/msm/vidc/msm_vidc_platform.c index 96e510e..0777e75 100644 --- a/msm/vidc/msm_vidc_platform.c +++ b/msm/vidc/msm_vidc_platform.c @@ -287,8 +287,8 @@ static struct msm_vidc_codec_capability lito_capabilities_v0[] = { unknown as well, which creates a problem of allowing client to set higher level than supported */ {CAP_H264_LEVEL, ENC, H264, V4L2_MPEG_VIDEO_H264_LEVEL_1_0, - V4L2_MPEG_VIDEO_H264_LEVEL_6_0, 1, - V4L2_MPEG_VIDEO_H264_LEVEL_6_0}, + V4L2_MPEG_VIDEO_H264_LEVEL_5_2, 1, + V4L2_MPEG_VIDEO_H264_LEVEL_5_2}, {CAP_HEVC_LEVEL, ENC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1, V4L2_MPEG_VIDEO_HEVC_LEVEL_6, 1, V4L2_MPEG_VIDEO_HEVC_LEVEL_6}, @@ -389,8 +389,8 @@ static struct msm_vidc_codec_capability lito_capabilities_v1[] = { unknown as well, which creates a problem of allowing client to set higher level than supported */ {CAP_H264_LEVEL, ENC, H264, V4L2_MPEG_VIDEO_H264_LEVEL_1_0, - V4L2_MPEG_VIDEO_H264_LEVEL_6_0, 1, - V4L2_MPEG_VIDEO_H264_LEVEL_6_0}, + V4L2_MPEG_VIDEO_H264_LEVEL_5_2, 1, + V4L2_MPEG_VIDEO_H264_LEVEL_5_2}, {CAP_HEVC_LEVEL, ENC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1, V4L2_MPEG_VIDEO_HEVC_LEVEL_6, 1, V4L2_MPEG_VIDEO_HEVC_LEVEL_6}, |