From 866fcbd4b9f8e1f3502ab857a23a7a19f2d0ba9e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 Subject: [PATCH 064/120] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware decoding The MPEG1/2 decoder is broken and nobody has volunteered to poke code and fix it. As media is almost never over 1080p resolution boards should be able to software decode it. So lets just disable hardware decoding for now. Signed-off-by: Christian Hewitt --- .../staging/media/meson/vdec/vdec_platform.c | 110 ------------------ 1 file changed, 110 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c index ea2aa0e8cf0b..1c0d188929dc 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -39,28 +39,6 @@ static const struct amvdec_format vdec_formats_gxbb[] = { .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 }, .flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG1, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG2, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, }, }; @@ -101,28 +79,6 @@ static const struct amvdec_format vdec_formats_gxl[] = { .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 }, .flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG1, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG2, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, }, }; @@ -163,28 +119,6 @@ static const struct amvdec_format vdec_formats_gxm[] = { .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 }, .flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG1, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG2, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, }, }; @@ -213,28 +147,6 @@ static const struct amvdec_format vdec_formats_g12a[] = { .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 }, .flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG1, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG2, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, }, }; @@ -263,28 +175,6 @@ static const struct amvdec_format vdec_formats_sm1[] = { .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 }, .flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG1, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, - }, { - .pixfmt = V4L2_PIX_FMT_MPEG2, - .min_buffers = 8, - .max_buffers = 8, - .max_width = 1920, - .max_height = 1080, - .vdec_ops = &vdec_1_ops, - .codec_ops = &codec_mpeg12_ops, - .firmware_path = "meson/vdec/gxl_mpeg12.bin", - .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, - .flags = V4L2_FMT_FLAG_COMPRESSED, }, }; -- 2.34.1