Merge 81426844a2 on remote branch

Change-Id: I01a209ad4ed0355032e5fe374ae244d88f7215c1
This commit is contained in:
Linux Build Service Account 2023-07-13 06:13:05 -07:00
commit 79b173e596

View File

@ -532,10 +532,10 @@ static struct msm_vidc_codec_capability lahaina_capabilities[] = {
/* Level for AVC, HEVC and VP9 decoder specific */ /* Level for AVC, HEVC and VP9 decoder specific */
{CAP_H264_LEVEL, DEC, H264, V4L2_MPEG_VIDEO_H264_LEVEL_1_0, {CAP_H264_LEVEL, DEC, H264, V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
V4L2_MPEG_VIDEO_H264_LEVEL_6_1, 1, V4L2_MPEG_VIDEO_H264_LEVEL_6_2, 1,
V4L2_MPEG_VIDEO_H264_LEVEL_5_0}, V4L2_MPEG_VIDEO_H264_LEVEL_5_0},
{CAP_HEVC_LEVEL, DEC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1, {CAP_HEVC_LEVEL, DEC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1,
V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1, 1, V4L2_MPEG_VIDEO_HEVC_LEVEL_6_2, 1,
V4L2_MPEG_VIDEO_HEVC_LEVEL_5}, V4L2_MPEG_VIDEO_HEVC_LEVEL_5},
{CAP_VP9_LEVEL, DEC, VP9, V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED, {CAP_VP9_LEVEL, DEC, VP9, V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED,
V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51, 1, V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51, 1,