Merge "msm: vidc: cleanup unsupported profile and levels for VP9"

This commit is contained in:
qctecmdr 2020-09-17 10:04:47 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3de9db9637

View file

@ -77,8 +77,6 @@ static const char *const vp9_level[] = {
"4.1",
"5.0",
"5.1",
"6.0",
"6.1",
NULL
};
@ -274,7 +272,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = {
.default_value = V4L2_MPEG_VIDEO_VP9_PROFILE_0,
.menu_skip_mask = ~(
(1 << V4L2_MPEG_VIDEO_VP9_PROFILE_0) |
(1 << V4L2_MPEG_VIDEO_VP9_PROFILE_1) |
(1 << V4L2_MPEG_VIDEO_VP9_PROFILE_2)
),
.qmenu = NULL,
@ -284,8 +281,8 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = {
.name = "VP9 Level",
.type = V4L2_CTRL_TYPE_MENU,
.minimum = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED,
.maximum = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61,
.default_value = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61,
.maximum = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51,
.default_value = V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51,
.menu_skip_mask = ~(
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_UNUSED) |
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_1) |
@ -297,9 +294,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = {
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_4) |
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_41) |
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_5) |
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51) |
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_6) |
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_61)
(1 << V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51)
),
.qmenu = vp9_level,
},