jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-05 17:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: update v4l2-request patch

Browse Source 
Patch created using revisions e2ee55c..dec361c
from branch v4l2-request-hwaccel-4.3.2-old-kernel of https://github.com/jernejsk/FFmpeg
This commit is contained in:
Jernej Skrabec 2021-07-25 09:03:16 +02:00 committed by heitbaum
parent 70d8dfa57a
commit ce9e3b3fd5
1 changed files with 96 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
packages/multimedia/ffmpeg/patches/v4l2-request/ffmpeg-001-v4l2-request.patch
View File

@ -1,7 +1,7 @@
From 785728e72dbd513b58d97af2590fafba0f8a24bb Mon Sep 17 00:00:00 2001
From 5e6ad66e892d02b7ab2e20727c9532d0a903c82a Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 3 Dec 2018 23:48:04 +0100
Subject: [PATCH 01/22] avutil: add av_buffer_pool_flush()
Subject: [PATCH 01/23] avutil: add av_buffer_pool_flush()
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
@ -50,10 +50,10 @@ index c0f3f6cc9abe..998beec9ac5b 100644
* Mark the pool as being available for freeing. It will actually be freed only
* once all the allocated buffers associated with the pool are released. Thus it
From abd5308771a71ba582155a1665a1c40878232040 Mon Sep 17 00:00:00 2001
From 2d9818d9ee4d61cd0a386cc0b49259a7da4e86be Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 02/22] Add common V4L2 request API code
Subject: [PATCH 02/23] Add common V4L2 request API code
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
@ -67,7 +67,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
create mode 100644 libavcodec/v4l2_request.h
diff --git a/configure b/configure
index 8569a60bf827..9f9909a23696 100755
index 36713ab658f9..81ee0e740498 100755
--- a/configure
+++ b/configure
@@ -274,6 +274,7 @@ External library support:
@ -1237,10 +1237,10 @@ index 000000000000..58d2aa70af80
+
+#endif /* AVCODEC_V4L2_REQUEST_H */
From e1ae7e32ce4798f3032a04ccb20a1f76834c3bea Mon Sep 17 00:00:00 2001
From 41342491beb7377f1a0dbd6cd1bd061375974b82 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 03/22] Add V4L2 request API mpeg2 hwaccel
Subject: [PATCH 03/23] Add V4L2 request API mpeg2 hwaccel
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
@ -1253,7 +1253,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
create mode 100644 libavcodec/v4l2_request_mpeg2.c
diff --git a/configure b/configure
index 9f9909a23696..6b157d6d3ef0 100755
index 81ee0e740498..436ab72378cd 100755
--- a/configure
+++ b/configure
@@ -2967,6 +2967,8 @@ mpeg2_dxva2_hwaccel_deps="dxva2"
@ -1482,10 +1482,10 @@ index 000000000000..88d86cc4c23f
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+};
From 8a728ea300aee2fab7a181cab06c2c3cfdd0b705 Mon Sep 17 00:00:00 2001
From fe49e657618c7bf5e5d8f0d085545168f9883ea0 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 04/22] Add V4L2 request API h264 hwaccel
Subject: [PATCH 04/23] Add V4L2 request API h264 hwaccel
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
@ -1500,7 +1500,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
create mode 100644 libavcodec/v4l2_request_h264.c
diff --git a/configure b/configure
index 6b157d6d3ef0..1a7720ebe3be 100755
index 436ab72378cd..6ed48234dd25 100755
--- a/configure
+++ b/configure
@@ -2925,6 +2925,8 @@ h264_dxva2_hwaccel_deps="dxva2"
@ -1533,7 +1533,7 @@ index 8963bd3e91cf..9a10a292e377 100644
OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o
OBJS-$(CONFIG_H264_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index db8363e4cc98..3ae11ac8a711 100644
index 111e1dfe7fa1..984abda7b218 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -759,6 +759,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
@ -2047,10 +2047,10 @@ index 000000000000..94b9aca8ad45
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+};
From 72758190a3d062b64db756c60761187a2b9ce1c9 Mon Sep 17 00:00:00 2001
From 64bd31ac6e7cdbad566a5af3838089fdc949ff7a Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 05/22] Add V4L2 request API hevc hwaccel
Subject: [PATCH 05/23] Add V4L2 request API hevc hwaccel
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
@ -2064,7 +2064,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
create mode 100644 libavcodec/v4l2_request_hevc.c
diff --git a/configure b/configure
index 1a7720ebe3be..58abd99335b5 100755
index 6ed48234dd25..402a8566eb63 100755
--- a/configure
+++ b/configure
@@ -2941,6 +2941,8 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
@ -2097,7 +2097,7 @@ index 9a10a292e377..5d0e1d7dae77 100644
OBJS-$(CONFIG_HEVC_VDPAU_HWACCEL) += vdpau_hevc.o
OBJS-$(CONFIG_MJPEG_NVDEC_HWACCEL) += nvdec_mjpeg.o
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 0772608a30e0..d01b7b34bcee 100644
index 1eaeaf72f145..7e47bd7177e1 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -372,6 +372,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
@ -2128,7 +2128,7 @@ index 0772608a30e0..d01b7b34bcee 100644
#endif
break;
case AV_PIX_FMT_YUV444P:
@@ -3588,6 +3595,9 @@ AVCodec ff_hevc_decoder = {
@@ -3593,6 +3600,9 @@ AVCodec ff_hevc_decoder = {
#endif
#if CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL
HWACCEL_VIDEOTOOLBOX(hevc),
@ -2690,10 +2690,10 @@ index 000000000000..f72490954653
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+};
From ebc06b180bfc3c4c6e02cfe2f559e140ce0020e8 Mon Sep 17 00:00:00 2001
From 44b0e55923c95d997b5422961cc79ad89e7c8c7e Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Wed, 22 May 2019 14:46:58 +0200
Subject: [PATCH 06/22] Add V4L2 request API vp8 hwaccel
Subject: [PATCH 06/23] Add V4L2 request API vp8 hwaccel
Need to fix the STREAMOFF/STREAMON issue in a proper way.
@ -2709,7 +2709,7 @@ Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
create mode 100644 libavcodec/v4l2_request_vp8.c
diff --git a/configure b/configure
index 58abd99335b5..cbb91c2bca43 100755
index 402a8566eb63..94476afd5df1 100755
--- a/configure
+++ b/configure
@@ -3003,6 +3003,8 @@ vc1_vdpau_hwaccel_deps="vdpau"
@ -2940,7 +2940,7 @@ index 000000000000..7e75ee398a2e
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+};
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index bab4223aca11..0e1edb46fb20 100644
index e84fcdeaa1e7..0608d9e4e165 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -175,6 +175,9 @@ static enum AVPixelFormat get_pixel_format(VP8Context *s)
@ -2973,10 +2973,10 @@ index bab4223aca11..0e1edb46fb20 100644
NULL
},
From cf21ba63945bf6a0a60616ceb0a000e42d02f044 Mon Sep 17 00:00:00 2001
From 86a834fa296531a08e6c29d57cc55b4fe7e7aeb3 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel@collabora.com>
Date: Wed, 20 Feb 2019 11:18:00 -0300
Subject: [PATCH 07/22] avcodec/h264: parse idr_pic_id
Subject: [PATCH 07/23] avcodec/h264: parse idr_pic_id
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
@ -2986,7 +2986,7 @@ Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 3ae11ac8a711..96e8edd10289 100644
index 984abda7b218..1870a57df952 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1822,7 +1822,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
@ -3025,10 +3025,10 @@ index 94b9aca8ad45..9382e573b40b 100644
.delta_pic_order_cnt_bottom = sl->delta_poc_bottom,
.delta_pic_order_cnt0 = sl->delta_poc[0],
From 13d2f3430db4d83ce30c921bf2b3ee44e1d6ec55 Mon Sep 17 00:00:00 2001
From 0e6ea840dedfa7b7894ded46a554cd95361e36bc Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Wed, 22 May 2019 14:44:22 +0200
Subject: [PATCH 08/22] avcodec/h264: parse ref_pic_marking_size_in_bits and
Subject: [PATCH 08/23] avcodec/h264: parse ref_pic_marking_size_in_bits and
pic_order_cnt_bit_size
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
@ -3039,7 +3039,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 96e8edd10289..c3896cfd90ab 100644
index 1870a57df952..355e3e14347b 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1740,7 +1740,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
@ -3114,10 +3114,10 @@ index 9382e573b40b..bdaeb67d2618 100644
.cabac_init_idc = sl->cabac_init_idc,
.slice_qp_delta = sl->qscale - pps->init_qp,
From 5ba945f011277dee7b4fb36af60810fd9b401f79 Mon Sep 17 00:00:00 2001
From d264deca75a549d7839076b081761d97bc0d9357 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Thu, 14 Feb 2019 23:20:05 +0100
Subject: [PATCH 09/22] Add and use private linux headers for V4L2 request API
Subject: [PATCH 09/23] Add and use private linux headers for V4L2 request API
ctrls
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
@ -3138,7 +3138,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
create mode 100644 libavcodec/vp8-ctrls.h
diff --git a/configure b/configure
index cbb91c2bca43..623012757c60 100755
index 94476afd5df1..a2072b09b8f7 100755
--- a/configure
+++ b/configure
@@ -2925,7 +2925,7 @@ h264_dxva2_hwaccel_deps="dxva2"
@ -3857,10 +3857,10 @@ index 000000000000..53cba826e482
+
+#endif
From 77c91a97c87424c1d6bff888bc8562a9b6697aa2 Mon Sep 17 00:00:00 2001
From 40dd525080aadb6c513d5780e82a92d7e4db9af0 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 2 May 2020 11:00:26 +0000
Subject: [PATCH 10/22] Update to v5.7 private linux headers
Subject: [PATCH 10/23] Update to v5.7 private linux headers
---
libavcodec/h264-ctrls.h | 2 ++
@ -3901,10 +3901,10 @@ index 0254716e5239..d28ed07da3b4 100644
entry->flags |= V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM;
if (pic->field_poc[0] != INT_MAX)
From 40407184ac1cd48d35acc6b0d8bdec48a98c74fb Mon Sep 17 00:00:00 2001
From 515026026b46e28c1230d773c76a5b9cf7952c08 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 2 May 2020 22:03:42 +0000
Subject: [PATCH 11/22] Update to v5.8 private linux headers
Subject: [PATCH 11/23] Update to v5.8 private linux headers
---
libavcodec/h264-ctrls.h | 8 +++++++-
@ -3937,10 +3937,10 @@ index 1c6ff7d63bca..080fd1293c42 100644
__u16 nal_ref_idc;
__s32 top_field_order_cnt;
From 6a151e35d99c430030709b49a6abd36349a65887 Mon Sep 17 00:00:00 2001
From 5cb8582d315bb2d504233169a82781d3161fefd3 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 6 Sep 2020 16:07:13 +0000
Subject: [PATCH 12/22] Update to v5.10 private linux headers
Subject: [PATCH 12/23] Update to v5.10 private linux headers
---
libavcodec/h264-ctrls.h | 89 +++++++++-------
@ -4490,10 +4490,10 @@ index d28ed07da3b4..c9dbaf8c3e34 100644
ret = ff_v4l2_request_init(avctx, V4L2_PIX_FMT_H264_SLICE, 4 * 1024 * 1024, control, FF_ARRAY_ELEMS(control));
if (ret)
From f9f4a89058a6fac25712cc385eab72f70e9ac4c8 Mon Sep 17 00:00:00 2001
From 9867ec02f9e072031384247086e7aa17c59b1484 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 29 Apr 2019 22:08:59 +0000
Subject: [PATCH 13/22] HACK: hwcontext_drm: do not require drm device
Subject: [PATCH 13/23] HACK: hwcontext_drm: do not require drm device
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
@ -4517,10 +4517,10 @@ index 32cbde82ebfa..aa4794c5e665 100644
if (hwctx->fd < 0)
return AVERROR(errno);
From 027f8c90ec25c42899b24d96b434e6ed1a1a8c40 Mon Sep 17 00:00:00 2001
From 2e0e4fc392ce23b0793640dda2257f4fdd154f2c Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 14/22] WIP: hevc scaling matrix
Subject: [PATCH 14/23] WIP: hevc scaling matrix
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
@ -4610,10 +4610,10 @@ index c16f8a868e38..f400bf4f3c82 100644
.id = V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS,
.ptr = &controls->slice_params,
From 9c4a66cca0df6fd0976f907f1e315a715e5ffd87 Mon Sep 17 00:00:00 2001
From 401a94e82f7228e3ad1aa3fc5b46cd485f5e6bb4 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 15/22] WIP: hevc segment address
Subject: [PATCH 15/23] WIP: hevc segment address
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
@ -4659,10 +4659,10 @@ index f400bf4f3c82..98222fc74c36 100644
.nal_unit_type = h->nal_unit_type,
.nuh_temporal_id_plus1 = h->temporal_id + 1,
From 62795e555cfcccfc29c144f0ed5acae5336479c7 Mon Sep 17 00:00:00 2001
From c37e5239ba5744ab195ebf40f5c07547a843e349 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 16/22] WIP: hevc entry point offsets
Subject: [PATCH 16/23] WIP: hevc entry point offsets
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
@ -4714,10 +4714,10 @@ index 98222fc74c36..7e77c83e4e4b 100644
static void fill_sps(struct v4l2_ctrl_hevc_sps *ctrl, const HEVCContext *h)
From edaaede001e7fbae26a0a668ea1db2b642896322 Mon Sep 17 00:00:00 2001
From 4231aa409318a4fd904852cdfca4ec7ac4864152 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Thu, 12 Dec 2019 16:13:55 +0100
Subject: [PATCH 17/22] WIP: Add V4L2 request API vp9 hwaccel
Subject: [PATCH 17/23] WIP: Add V4L2 request API vp9 hwaccel
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
@ -4731,7 +4731,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
create mode 100644 libavcodec/v4l2_request_vp9.c
diff --git a/configure b/configure
index 623012757c60..2b723df55aed 100755
index a2072b09b8f7..27cb8f1cabfe 100755
--- a/configure
+++ b/configure
@@ -3015,6 +3015,8 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
@ -5198,10 +5198,10 @@ index 54726df742f9..fee3568736f7 100644
uint8_t pred_prob[3];
struct {
From ef82ae9fffba44e88d59a3fa4b958a38d1b5cd9e Mon Sep 17 00:00:00 2001
From bedadeb845d7a2ba3ffed3ca646aa114e3826ec1 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Thu, 12 Dec 2019 16:13:55 +0100
Subject: [PATCH 18/22] WIP: Add and use vp9 private linux header
Subject: [PATCH 18/23] WIP: Add and use vp9 private linux header
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
@ -5212,7 +5212,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
create mode 100644 libavcodec/vp9-ctrls.h
diff --git a/configure b/configure
index 2b723df55aed..87c6836af275 100755
index 27cb8f1cabfe..48154dc56c71 100755
--- a/configure
+++ b/configure
@@ -3015,7 +3015,7 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
@ -5728,10 +5728,10 @@ index 000000000000..0cdea8a18b72
+
+#endif /* _VP9_CTRLS_H_ */
From 4b268a93e5945dc7863a8dc953a12fa157b4f8e6 Mon Sep 17 00:00:00 2001
From d0df3f1ca04b103ad3ec4dfa87f044ef02d7bc6c Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Fri, 15 May 2020 16:54:05 +0000
Subject: [PATCH 19/22] WIP: add NV15 and NV20 support
Subject: [PATCH 19/23] WIP: add NV15 and NV20 support
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
@ -5740,7 +5740,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index c3896cfd90ab..39ae8fabfd3b 100644
index 355e3e14347b..8d79d254e0a7 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -785,10 +785,17 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
@ -5815,10 +5815,10 @@ index 5234b5049b0d..0b294feff2eb 100644
default:
return -1;
From fa7165e391287bf970569e36b0b19bff947b084f Mon Sep 17 00:00:00 2001
From 593fff35db5ffaeaf4bcea8e341bfd46f25dcb7e Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 27 Jul 2020 23:15:45 +0000
Subject: [PATCH 20/22] HACK: define drm NV15 and NV20 format
Subject: [PATCH 20/23] HACK: define drm NV15 and NV20 format
---
libavcodec/v4l2_request.c | 8 ++++++++
@ -5844,10 +5844,10 @@ index 0b294feff2eb..a8f0ee79eeef 100644
{
V4L2RequestDescriptor *req = (V4L2RequestDescriptor*)frame->data[0];
From 4ee9ede28d912637e64a7472acd3e8ab5272f41b Mon Sep 17 00:00:00 2001
From 1b6604052fe9e86a124719e765892cf9262fe29b Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sun, 11 Apr 2021 08:40:57 +0000
Subject: [PATCH 21/22] WIP: hevc: slice dependent flag
Subject: [PATCH 21/23] WIP: hevc: slice dependent flag
---
libavcodec/hevc-ctrls.h | 1 +
@ -5881,10 +5881,10 @@ index 7e77c83e4e4b..116a69340af3 100644
const HEVCFrame *frame = &h->DPB[i];
if (frame != pic && (frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) {
From a327aa791645517b031ac8d89a720b1907cfb96a Mon Sep 17 00:00:00 2001
From d1b337d8733208685d527612c3dbefff4960fe3a Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Wed, 13 May 2020 22:51:21 +0000
Subject: [PATCH 22/22] WIP: hevc rkvdec fields
Subject: [PATCH 22/23] WIP: hevc rkvdec fields
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
@ -6004,3 +6004,40 @@ index 116a69340af3..eb493b309fe9 100644
return ff_v4l2_request_decode_frame(avctx, h->ref->frame, control, FF_ARRAY_ELEMS(control));
}
From dec361c86ab63081e9d1eb0ea4a143ec500c0cf9 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Sun, 25 Jul 2021 08:40:58 +0200
Subject: [PATCH 23/23] WIP: hevc: Align naming with mainline
---
libavcodec/hevc-ctrls.h | 2 +-
libavcodec/v4l2_request_hevc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/hevc-ctrls.h b/libavcodec/hevc-ctrls.h
index c54687bfe658..10a4296ac219 100644
--- a/libavcodec/hevc-ctrls.h
+++ b/libavcodec/hevc-ctrls.h
@@ -86,7 +86,7 @@ struct v4l2_ctrl_hevc_sps {
__u64 flags;
};
-#define V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT (1ULL << 0)
+#define V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT_ENABLED (1ULL << 0)
#define V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT (1ULL << 1)
#define V4L2_HEVC_PPS_FLAG_SIGN_DATA_HIDING_ENABLED (1ULL << 2)
#define V4L2_HEVC_PPS_FLAG_CABAC_INIT_PRESENT (1ULL << 3)
diff --git a/libavcodec/v4l2_request_hevc.c b/libavcodec/v4l2_request_hevc.c
index eb493b309fe9..c5ecd12ec235 100644
--- a/libavcodec/v4l2_request_hevc.c
+++ b/libavcodec/v4l2_request_hevc.c
@@ -350,7 +350,7 @@ static int v4l2_request_hevc_start_frame(AVCodecContext *avctx,
};
if (pps->dependent_slice_segments_enabled_flag)
- controls->pps.flags |= V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT;
+ controls->pps.flags |= V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT_ENABLED;
if (pps->output_flag_present_flag)
controls->pps.flags |= V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT;