44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
||
|
|
Date: Thu, 25 Nov 2021 11:31:43 +0000
|
||
|
|
Subject: drivers: meson: vdec: add VP9 support to GXM
|
||
|
|
|
||
|
|
VP9 support for GXM appears to have been missed from the original
|
||
|
|
codec submission [0] but it works well, so let's add support.
|
||
|
|
|
||
|
|
[0] https://github.com/torvalds/linux/commit/00c43088aa680989407b6afbda295f67b3f123f1
|
||
|
|
|
||
|
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||
|
|
---
|
||
|
|
drivers/staging/media/meson/vdec/vdec_platform.c | 14 +++++++++-
|
||
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||
|
|
index 810039a02b44..38f353c6d27d 100644
|
||
|
|
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
|
||
|
|
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
|
||
|
|
@@ -27,7 +27,19 @@ 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_VP9,
|
||
|
|
+ .min_buffers = 16,
|
||
|
|
+ .max_buffers = 24,
|
||
|
|
+ .max_width = 3840,
|
||
|
|
+ .max_height = 2160,
|
||
|
|
+ .vdec_ops = &vdec_hevc_ops,
|
||
|
|
+ .codec_ops = &codec_vp9_ops,
|
||
|
|
+ .firmware_path = "meson/vdec/gxl_vp9.bin",
|
||
|
|
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
|
||
|
|
+ .flags = V4L2_FMT_FLAG_COMPRESSED |
|
||
|
|
+ V4L2_FMT_FLAG_DYN_RESOLUTION,
|
||
|
|
+ }, {
|
||
|
|
.pixfmt = V4L2_PIX_FMT_H264,
|
||
|
|
.min_buffers = 2,
|
||
|
|
.max_buffers = 24,
|
||
|
|
--
|
||
|
|
Armbian
|
||
|
|
|