ffmpeg: update v4l2-drmprime patch

Patch created using revisions 9047fa1..99bbab2
from branch v4l2-drmprime-n8.1 of https://github.com/jernejsk/FFmpeg

Author: HiassofT

packages/multimedia/ffmpeg/patches/v4l2-drmprime/ffmpeg-001-v4l2-drmprime.patch

@@ -1,4 +1,4 @@
-From 8444b369120d0514e22b9d3537fa597d4bc7248a Mon Sep 17 00:00:00 2001
+From 8d0c529749096e58c1404a526530cb0273f3aafe Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <lorusak@gmail.com>
 Date: Tue, 24 Apr 2018 23:00:23 -0700
 Subject: [PATCH 1/8] libavcodec: v4l2m2m: output AVDRMFrameDescriptor
@@ -42,7 +42,7 @@ V5:
  5 files changed, 212 insertions(+), 11 deletions(-)
 
 diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c
-index 7f597a424aa9..c2c9905bc9a3 100644
+index 077c1ee9449d..863877ce2bb8 100644
 --- a/libavcodec/v4l2_buffers.c
 +++ b/libavcodec/v4l2_buffers.c
 @@ -21,6 +21,7 @@
@@ -61,7 +61,7 @@ index 7f597a424aa9..c2c9905bc9a3 100644
  #include "libavutil/pixdesc.h"
  #include "libavutil/refstruct.h"
  #include "v4l2_context.h"
-@@ -227,6 +229,78 @@ static void v4l2_get_interlacing(AVFrame *frame, V4L2Buffer *buf)
+@@ -233,6 +235,78 @@ static void v4l2_get_interlacing(AVFrame *frame, V4L2Buffer *buf)
      }
  }
 
@@ -140,7 +140,7 @@ index 7f597a424aa9..c2c9905bc9a3 100644
  static void v4l2_free_buffer(void *opaque, uint8_t *unused)
  {
      V4L2Buffer* avbuf = opaque;
-@@ -251,6 +325,36 @@ static void v4l2_free_buffer(void *opaque, uint8_t *unused)
+@@ -257,6 +331,36 @@ static void v4l2_free_buffer(void *opaque, uint8_t *unused)
      }
  }
 
@@ -177,7 +177,7 @@ index 7f597a424aa9..c2c9905bc9a3 100644
  static int v4l2_buf_increase_ref(V4L2Buffer *in)
  {
      V4L2m2mContext *s = buf_to_m2mctx(in);
-@@ -269,6 +373,24 @@ static int v4l2_buf_increase_ref(V4L2Buffer *in)
+@@ -275,6 +379,24 @@ static int v4l2_buf_increase_ref(V4L2Buffer *in)
      return 0;
  }
 
@@ -202,7 +202,7 @@ index 7f597a424aa9..c2c9905bc9a3 100644
  static int v4l2_buf_to_bufref(V4L2Buffer *in, int plane, AVBufferRef **buf)
  {
      int ret;
-@@ -318,13 +440,24 @@ static int v4l2_buffer_buf_to_swframe(AVFrame *frame, V4L2Buffer *avbuf)
+@@ -324,13 +446,24 @@ static int v4l2_buffer_buf_to_swframe(AVFrame *frame, V4L2Buffer *avbuf)
 
      frame->format = avbuf->context->av_pix_fmt;
 
@@ -231,7 +231,7 @@ index 7f597a424aa9..c2c9905bc9a3 100644
      }
 
      /* fixup special cases */
-@@ -560,9 +693,6 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
+@@ -566,9 +699,6 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
 
      avbuf->status = V4L2BUF_AVAILABLE;
 
@@ -241,7 +241,7 @@ index 7f597a424aa9..c2c9905bc9a3 100644
      if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) {
          avbuf->buf.m.planes = avbuf->planes;
          avbuf->buf.length   = avbuf->num_planes;
-@@ -572,6 +702,15 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
+@@ -578,6 +708,15 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
          avbuf->buf.length    = avbuf->planes[0].length;
      }
 
@@ -418,11 +418,8 @@ index ba1fe769e0fe..08cfb4e5a49f 100644
      }
 
  M2MDEC(h264,  "H.264", AV_CODEC_ID_H264,       "h264_mp4toannexb");
--- 
-2.47.3
 
-
-From f889be857730b6df1b70c8d7cbea014535539829 Mon Sep 17 00:00:00 2001
+From 6e07edda13a1af6202d0edcee5e4a3140e3b3d85 Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <lorusak@gmail.com>
 Date: Thu, 16 Aug 2018 21:09:40 -0700
 Subject: [PATCH 2/8] libavcodec: v4l2m2m: depends on libdrm
@@ -433,10 +430,10 @@ Subject: [PATCH 2/8] libavcodec: v4l2m2m: depends on libdrm
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index a0eed36abfe3..f38d1db91f76 100755
+index 17596942749a..25f05fd2f2a6 100755
 --- a/configure
 +++ b/configure
-@@ -3831,6 +3831,7 @@ sndio_indev_deps="sndio"
+@@ -4000,6 +4000,7 @@ sndio_indev_deps="sndio"
  sndio_outdev_deps="sndio"
  v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
  v4l2_indev_suggest="libv4l2"
@@ -445,7 +442,7 @@ index a0eed36abfe3..f38d1db91f76 100755
  v4l2_outdev_suggest="libv4l2"
  vfwcap_indev_deps="vfw32 vfwcap_defines"
 diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c
-index c2c9905bc9a3..75070206d71d 100644
+index 863877ce2bb8..b6b1c6b586e2 100644
 --- a/libavcodec/v4l2_buffers.c
 +++ b/libavcodec/v4l2_buffers.c
 @@ -21,7 +21,7 @@
@@ -457,11 +454,8 @@ index c2c9905bc9a3..75070206d71d 100644
  #include <linux/videodev2.h>
  #include <sys/ioctl.h>
  #include <sys/mman.h>
--- 
-2.47.3
-
 
-From 3e081e0f53419ed80dbaf108d8691cbfb5ee255c Mon Sep 17 00:00:00 2001
+From 52d0550fba278f41bf5a74a10197286c87c0d44d Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <lorusak@gmail.com>
 Date: Thu, 16 Aug 2018 21:10:13 -0700
 Subject: [PATCH 3/8] libavcodec: v4l2m2m: set format_modifier to
@@ -472,10 +466,10 @@ Subject: [PATCH 3/8] libavcodec: v4l2m2m: set format_modifier to
  1 file changed, 2 insertions(+)
 
 diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c
-index 75070206d71d..0035d7cff3a6 100644
+index b6b1c6b586e2..40420a50a3b2 100644
 --- a/libavcodec/v4l2_buffers.c
 +++ b/libavcodec/v4l2_buffers.c
-@@ -345,10 +345,12 @@ static int v4l2_buffer_export_drm(V4L2Buffer* avbuf)
+@@ -351,10 +351,12 @@ static int v4l2_buffer_export_drm(V4L2Buffer* avbuf)
              /* drm frame */
              avbuf->drm_frame.objects[i].size = avbuf->buf.m.planes[i].length;
              avbuf->drm_frame.objects[i].fd = expbuf.fd;
@@ -488,11 +482,8 @@ index 75070206d71d..0035d7cff3a6 100644
          }
      }
 
--- 
-2.47.3
 
-
-From dc01c0a40ce5b585809ab0b30b6c5512bf9d3a93 Mon Sep 17 00:00:00 2001
+From 2a9066cf6f683c9855cc9774ea3ee57fa333d2eb Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <lorusak@gmail.com>
 Date: Thu, 16 Aug 2018 21:10:53 -0700
 Subject: [PATCH 4/8] libavcodec: v4l2m2m: only mmap the buffer when it is
@@ -503,10 +494,10 @@ Subject: [PATCH 4/8] libavcodec: v4l2m2m: only mmap the buffer when it is
  1 file changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c
-index 0035d7cff3a6..0b04f8fbca4b 100644
+index 40420a50a3b2..ad537dcc1184 100644
 --- a/libavcodec/v4l2_buffers.c
 +++ b/libavcodec/v4l2_buffers.c
-@@ -679,14 +679,22 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
+@@ -685,14 +685,22 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
 
          if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) {
              avbuf->plane_info[i].length = avbuf->buf.m.planes[i].length;
@@ -535,11 +526,8 @@ index 0035d7cff3a6..0b04f8fbca4b 100644
          }
 
          if (avbuf->plane_info[i].mm_addr == MAP_FAILED)
--- 
-2.47.3
-
 
-From bdd736ae2a0ecceb9843acd8e86dc56c15d9360f Mon Sep 17 00:00:00 2001
+From 90acef9ad745d9d1f6ab583f74495b0a67c153ac Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <lorusak@gmail.com>
 Date: Thu, 16 Aug 2018 21:11:38 -0700
 Subject: [PATCH 5/8] libavcodec: v4l2m2m: allow using software pixel formats
@@ -578,11 +566,8 @@ index 08cfb4e5a49f..a500cad0b38b 100644
                                                           AV_PIX_FMT_NONE}, \
          .hw_configs     = v4l2_m2m_hw_configs, \
      }
--- 
-2.47.3
 
-
-From fd47ac58a6ca82748ab7af07311476717409fae3 Mon Sep 17 00:00:00 2001
+From 0b204bfb795cc19fe0135429e1cf9055d0035f32 Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <lorusak@gmail.com>
 Date: Mon, 24 Sep 2018 13:39:31 -0700
 Subject: [PATCH 6/8] libavcodec: v4l2m2m: implement hwcontext
@@ -595,18 +580,18 @@ Subject: [PATCH 6/8] libavcodec: v4l2m2m: implement hwcontext
  4 files changed, 37 insertions(+)
 
 diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c
-index 0b04f8fbca4b..5e75dec11c50 100644
+index ad537dcc1184..0d3029573cda 100644
 --- a/libavcodec/v4l2_buffers.c
 +++ b/libavcodec/v4l2_buffers.c
-@@ -450,6 +450,7 @@ static int v4l2_buffer_buf_to_swframe(AVFrame *frame, V4L2Buffer *avbuf)
+@@ -456,6 +456,7 @@ static int v4l2_buffer_buf_to_swframe(AVFrame *frame, V4L2Buffer *avbuf)
 
          frame->data[0] = (uint8_t *) v4l2_get_drm_frame(avbuf);
          frame->format = AV_PIX_FMT_DRM_PRIME;
 +        frame->hw_frames_ctx = av_buffer_ref(avbuf->context->frames_ref);
      } else {
          /* 1. get references to the actual data */
          for (i = 0; i < avbuf->num_planes; i++) {
-@@ -652,6 +653,27 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
+@@ -658,6 +659,27 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
      avbuf->buf.type = ctx->type;
      avbuf->buf.index = index;
 
@@ -689,11 +674,8 @@ index a500cad0b38b..3512928895f0 100644
      s->avctx = avctx;
      ret = ff_v4l2_m2m_codec_init(priv);
      if (ret) {
--- 
-2.47.3
-
 
-From 0cda0ccaf7f90a29cfc0a5dac83fb5f28da5dd98 Mon Sep 17 00:00:00 2001
+From 1d7da897085e1eb82c93af8037b6bb468b50aa0e Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <lorusak@gmail.com>
 Date: Wed, 6 May 2020 11:12:58 -0700
 Subject: [PATCH 7/8] libavcodec: v4l2m2m: add option to specify pixel format
@@ -764,11 +746,8 @@ index 3512928895f0..3ec484b37a6a 100644
      { NULL},
  };
 
--- 
-2.47.3
 
-
-From 01f52ab76139855c0d17bd338a7fed0f48648b4b Mon Sep 17 00:00:00 2001
+From 99bbab25229ac2d9f543f99fff5e4e38c6fe3a55 Mon Sep 17 00:00:00 2001
 From: Lukas Rusak <lorusak@gmail.com>
 Date: Mon, 24 Sep 2018 13:39:56 -0700
 Subject: [PATCH 8/8] libavcodec: v4l2m2m: implement flush
@@ -831,6 +810,3 @@ index 3ec484b37a6a..0dc848fb1cbe 100644
          .bsfs           = bsf_name, \
          .p.capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, \
          .caps_internal  = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \
--- 
-2.47.3
-