jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 06:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux (Rockchip): rebase patches for 6.16-rc1

Browse Source 
media: rkvdec: Add image format concept
- 774837ed87

fixes:
drivers/staging/media/rkvdec/rkvdec.c:327:33: error: initialization of 'const struct rkvdec_decoded_fmt_desc *' from incompatible pointer type 'const u32 *' {aka 'const unsigned int *'} [-Wincompatible-pointer-types]
  327 |                 .decoded_fmts = rkvdec_hevc_decoded_fmts,
      |                                 ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/rkvdec/rkvdec.c:327:33: note: (near initialization for 'rkvdec_coded_fmts[0].decoded_fmts')
This commit is contained in:
Rudi Heitbaum 2025-06-12 12:58:53 +00:00
parent 02d5841af0
commit 7c10ce41f5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch
View File

@ -2620,7 +2620,7 @@ diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvde
index f55abb7c377f..00a9bf583596 100644 index f55abb7c377f..00a9bf583596 100644
--- a/drivers/staging/media/rkvdec/rkvdec.c --- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -134,6 +134,62 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { @@ -134,6 +134,68 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = {
}, },
}; };
@ -2674,9 +2674,15 @@ index f55abb7c377f..00a9bf583596 100644
+ .num_ctrls = ARRAY_SIZE(rkvdec_hevc_ctrl_descs), + .num_ctrls = ARRAY_SIZE(rkvdec_hevc_ctrl_descs),
+}; +};
+ +
+static const u32 rkvdec_hevc_decoded_fmts[] = { +static const struct rkvdec_decoded_fmt_desc rkvdec_hevc_decoded_fmts[] = {
+ V4L2_PIX_FMT_NV12, + {
+ V4L2_PIX_FMT_NV15, + .fourcc = V4L2_PIX_FMT_NV12,
+ .image_fmt = RKVDEC_IMG_FMT_420_8BIT,
+ },
+ {
+ .fourcc = V4L2_PIX_FMT_NV15,
+ .image_fmt = RKVDEC_IMG_FMT_420_10BIT,
+ },
+}; +};
+ +
+ +