diff --git a/projects/Allwinner/patches/linux/0026-media-cedrus-hevc-Add-support-for-multiple-slices.patch b/projects/Allwinner/patches/linux/0026-media-cedrus-hevc-Add-support-for-multiple-slices.patch index 1a49b6f12d..eb22de15b0 100644 --- a/projects/Allwinner/patches/linux/0026-media-cedrus-hevc-Add-support-for-multiple-slices.patch +++ b/projects/Allwinner/patches/linux/0026-media-cedrus-hevc-Add-support-for-multiple-slices.patch @@ -68,7 +68,7 @@ Signed-off-by: Jernej Skrabec /* Initialize bitstream access. */ cedrus_write(dev, VE_DEC_H265_TRIGGER, VE_DEC_H265_TRIGGER_INIT_SWDEC); @@ -543,8 +549,8 @@ static void cedrus_h265_setup(struct ced - V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT, + V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT, pps->flags); - /* FIXME: For multi-slice support. */ diff --git a/projects/Allwinner/patches/linux/0058-media-cedrus-wip-hevc-dependent-flag.patch b/projects/Allwinner/patches/linux/0058-media-cedrus-wip-hevc-dependent-flag.patch deleted file mode 100644 index 8508ba14a4..0000000000 --- a/projects/Allwinner/patches/linux/0058-media-cedrus-wip-hevc-dependent-flag.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sun, 11 Apr 2021 10:45:50 +0200 -Subject: [PATCH] media: cedrus: wip: hevc: dependent flag - ---- - drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 4 ++-- - include/media/hevc-ctrls.h | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c -index 8861e1535886..ab6fc857a477 100644 ---- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c -+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c -@@ -634,8 +634,8 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, - slice_params->flags); - - reg |= VE_DEC_H265_FLAG(VE_DEC_H265_DEC_SLICE_HDR_INFO0_FLAG_DEPENDENT_SLICE_SEGMENT, -- V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT, -- pps->flags); -+ V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT, -+ slice_params->flags); - - if (ctx->fh.m2m_ctx->new_frame) - reg |= VE_DEC_H265_DEC_SLICE_HDR_INFO0_FLAG_FIRST_SLICE_SEGMENT_IN_PIC; -diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h -index eb83c1d61b8d..cd51fb6df1f0 100644 ---- a/include/media/hevc-ctrls.h -+++ b/include/media/hevc-ctrls.h -@@ -162,6 +162,7 @@ struct v4l2_hevc_pred_weight_table { - #define V4L2_HEVC_SLICE_PARAMS_FLAG_USE_INTEGER_MV (1ULL << 6) - #define V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_DEBLOCKING_FILTER_DISABLED (1ULL << 7) - #define V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED (1ULL << 8) -+#define V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT (1ULL << 9) - - struct v4l2_ctrl_hevc_slice_params { - __u32 bit_size;