Revert "amlogic: add ffmpeg patches for improved HEVC seek"

This reverts commit 57249674d9fc02493f8cb030ea529d1003d840d6.

These patches are included in https://github.com/jc-kynesim/rpi-ffmpeg/tree/dev/6.0/rpi_import_1/
since 2c9e9d043c2da0108f635d19461c0461adffb43c

projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-001.patch

@@ -1,31 +0,0 @@
-From 5da6d4bdf0ce603d48415dcbc657e56a050a8d24 Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Wed, 11 Jan 2023 16:30:37 +0000
-Subject: [PATCH] v4l2_m2m_dec: Fix initial pkt send if no extradata
-
----
- libavcodec/v4l2_m2m_dec.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
-index b58657021c..d540d00bdd 100644
---- a/libavcodec/v4l2_m2m_dec.c
-+++ b/libavcodec/v4l2_m2m_dec.c
-@@ -240,7 +240,7 @@ copy_extradata(AVCodecContext * const avctx,
-     else
-         len = src_len < 0 ? AVERROR(EINVAL) : src_len;
- 
--    // Zero length is OK but we swant to stop - -ve is error val
-+    // Zero length is OK but we want to stop - -ve is error val
-     if (len <= 0)
-         return len;
- 
-@@ -533,7 +533,7 @@ static int try_enqueue_src(AVCodecContext * const avctx, V4L2m2mContext * const
- 
-     if (s->extdata_sent)
-         ret = ff_v4l2_context_enqueue_packet(&s->output, &s->buf_pkt, NULL, 0);
--    else if (s->extdata_data)
-+    else
-         ret = ff_v4l2_context_enqueue_packet(&s->output, &s->buf_pkt, s->extdata_data, s->extdata_size);
- 
-     if (ret == AVERROR(EAGAIN)) {

projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-002.patch

@@ -1,57 +0,0 @@
-From 89a5440ab5110d5460c4919865016e66b9dfbc48 Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Wed, 11 Jan 2023 18:34:04 +0000
-Subject: [PATCH] Make capture timeout long once we've started getting frames
-
----
- libavcodec/v4l2_m2m.h     |  1 +
- libavcodec/v4l2_m2m_dec.c | 10 ++++++++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h
-index 058cec5033..87f81febd2 100644
---- a/libavcodec/v4l2_m2m.h
-+++ b/libavcodec/v4l2_m2m.h
-@@ -88,6 +88,7 @@ typedef struct V4L2m2mContext {
- 
-     /* null frame/packet received */
-     int draining;
-+    int running;
-     AVPacket buf_pkt;
- 
-     /* Reference to self; only valid while codec is active. */
-diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
-index d540d00bdd..6078811404 100644
---- a/libavcodec/v4l2_m2m_dec.c
-+++ b/libavcodec/v4l2_m2m_dec.c
-@@ -622,7 +622,7 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame)
-             const int t =
-                 src_rv == NQ_Q_FULL ? -1 :
-                 src_rv == NQ_DRAINING ? 300 :
--                prefer_dq ? 5 : 0;
-+                prefer_dq ? (s->running ? 100 : 5) : 0;
- 
-             // Dequeue frame will unref any previous contents of frame
-             // if it returns success so we don't need an explicit unref
-@@ -639,6 +639,11 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame)
-                 }
-             }
- 
-+            if (s->running != (dst_rv == 0) && prefer_dq) {
-+                s->running = (dst_rv == 0);
-+                av_log(avctx, AV_LOG_VERBOSE, "%s running\n", s->running ? "Start" : "Stop");
-+            }
-+
-             if (dst_rv == 0)
-                 set_best_effort_pts(avctx, &s->pts_stat, frame);
- 
-@@ -1006,7 +1011,8 @@ static void v4l2_decode_flush(AVCodecContext *avctx)
- 
-     // resend extradata
-     s->extdata_sent = 0;
--    // clear EOS status vars
-+    // clear status vars
-+    s->running = 0;
-     s->draining = 0;
-     output->done = 0;
-     capture->done = 0;

projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-003.patch

@@ -1,72 +0,0 @@
-From 840aae6cdcc1b1d3ef11da1c33a7ed6519a64cd6 Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Fri, 13 Jan 2023 17:56:55 +0000
-Subject: [PATCH] Be much more relaxed before long timeout
-
----
- libavcodec/v4l2_m2m.h     |  2 +-
- libavcodec/v4l2_m2m_dec.c | 20 ++++++++++++--------
- 2 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h
-index 87f81febd2..c109b21d08 100644
---- a/libavcodec/v4l2_m2m.h
-+++ b/libavcodec/v4l2_m2m.h
-@@ -66,7 +66,7 @@ typedef struct pts_stats_s
- 
- typedef struct xlat_track_s {
-     unsigned int track_no;
--    int64_t last_pts;
-+    int64_t last_pts;    // Last valid PTS decoded
-     int64_t last_opaque;
-     V4L2m2mTrackEl track_els[FF_V4L2_M2M_TRACK_SIZE];
- } xlat_track_t;
-diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
-index 6078811404..2bd113facb 100644
---- a/libavcodec/v4l2_m2m_dec.c
-+++ b/libavcodec/v4l2_m2m_dec.c
-@@ -590,7 +590,7 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame)
- 
-     do {
-         const int pending = xlat_pending(&s->xlat);
--        const int prefer_dq = (pending > 3);
-+        const int prefer_dq = (pending > 4);
-         const int last_src_rv = src_rv;
- 
-         av_log(avctx, AV_LOG_TRACE, "Pending=%d, src_rv=%d, req_pkt=%d\n", pending, src_rv, s->req_pkt);
-@@ -619,10 +619,14 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame)
-         // (b) enqueue returned a status indicating that decode should be attempted
-         if (dst_rv != 0 && TRY_DQ(src_rv)) {
-             // Pick a timeout depending on state
-+            // The pending count isn't completely reliable so it is good enough
-+            // hint that we want a frame but not good enough to require it in
-+            // all cases; however if it has got > 31 that exceeds its margin of
-+            // error so require a frame to prevent ridiculous levels of latency
-             const int t =
-                 src_rv == NQ_Q_FULL ? -1 :
-                 src_rv == NQ_DRAINING ? 300 :
--                prefer_dq ? (s->running ? 100 : 5) : 0;
-+                prefer_dq ? (s->running && pending > 31 ? 100 : 5) : 0;
- 
-             // Dequeue frame will unref any previous contents of frame
-             // if it returns success so we don't need an explicit unref
-@@ -639,13 +643,13 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame)
-                 }
-             }
- 
--            if (s->running != (dst_rv == 0) && prefer_dq) {
--                s->running = (dst_rv == 0);
--                av_log(avctx, AV_LOG_VERBOSE, "%s running\n", s->running ? "Start" : "Stop");
--            }
--
--            if (dst_rv == 0)
-+            if (dst_rv == 0) {
-                 set_best_effort_pts(avctx, &s->pts_stat, frame);
-+                if (!s->running) {
-+                    s->running = 1;
-+                    av_log(avctx, AV_LOG_VERBOSE, "Decode running\n");
-+                }
-+            }
- 
-             if (dst_rv == AVERROR(EAGAIN) && src_rv == NQ_DRAINING) {
-                 av_log(avctx, AV_LOG_WARNING, "Timeout in drain - assume EOF");