update ffmpeg patches

Author: debugly

patches/ffmpeg-release-5.1/0001-15-h264_ps-null-pointer-fault-tolerant.patch

@@ -1,7 +1,7 @@
 From 8d2dac9be4b04467c7d6bf4b4d3785adb8482a3f Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
 Date: Mon, 22 May 2023 17:21:37 +0800
-Subject: [PATCH 01/15] h264_ps null pointer fault tolerant
+Subject: [PATCH 01/17] h264_ps null pointer fault tolerant
 
 ---
  libavcodec/h264_ps.c | 8 ++++----

patches/ffmpeg-release-5.1/0002-flv-support-hevc.patch

@@ -1,7 +1,7 @@
 From 7b857db7e5c334b873ca7a113b47a35e5b1106e0 Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
 Date: Mon, 22 May 2023 17:27:59 +0800
-Subject: [PATCH 02/15] flv support hevc
+Subject: [PATCH 02/17] flv support hevc
 
 ---
  libavformat/flv.h    |  1 +

patches/ffmpeg-release-5.1/0003-correct-file-seekable-value-range-0-means-streamed-c.patch

@@ -0,0 +1,26 @@
+From 2b7025ea0b9f72c365f7ce79ba462496e07e9a3d Mon Sep 17 00:00:00 2001
+From: qianlongxu <[email protected]>
+Date: Wed, 22 May 2024 14:24:29 +0800
+Subject: [PATCH 03/17] correct file seekable value range, 0 means streamed can't
+ seek, 1 means not streamed can seek.
+
+---
+ libavformat/file.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavformat/file.c b/libavformat/file.c
+index 98c9e81..a35dfca 100644
+--- a/libavformat/file.c
++++ b/libavformat/file.c
+@@ -85,7 +85,7 @@ static const AVOption file_options[] = {
+     { "truncate", "truncate existing files on write", offsetof(FileContext, trunc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
+     { "blocksize", "set I/O operation maximum block size", offsetof(FileContext, blocksize), AV_OPT_TYPE_INT, { .i64 = INT_MAX }, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
+     { "follow", "Follow a file as it is being written", offsetof(FileContext, follow), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+-    { "seekable", "Sets if the file is seekable", offsetof(FileContext, seekable), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 0, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
++    { "seekable", "Sets if the file is seekable", offsetof(FileContext, seekable), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
+     { NULL }
+ };
+ 
+-- 
+2.39.3 (Apple Git-146)
+

patches/ffmpeg-release-5.1/0003-file-use-file_seek.patch

@@ -1,7 +1,7 @@
 From 3c3b8cd1efb6e28fccd4b964531c21bf0fc94c26 Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
 Date: Tue, 23 Jan 2024 15:32:33 +0800
-Subject: [PATCH 04/15] restore ijk custom protocols except long url
+Subject: [PATCH 04/17] restore ijk custom protocols except long url
 
 ---
  libavcodec/Makefile      |  1 +

patches/ffmpeg-release-5.1/0004-restore-ijk-custom-protocols-except-long.patch

@@ -1,14 +1,14 @@
-From ad70425a954678c0cbcb779b15d2bc3cd0d36f0f Mon Sep 17 00:00:00 2001
+From dc595d866ab9a0a67331b10dc969b434ab5e4e6b Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
-Date: Mon, 12 Jun 2023 16:15:15 +0800
-Subject: [PATCH 05/15] hls support discontinuity
+Date: Wed, 22 May 2024 14:55:43 +0800
+Subject: [PATCH 05/17] hls support discontinuity tag
 
 ---
- libavformat/hls.c | 60 +++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 53 insertions(+), 7 deletions(-)
+ libavformat/hls.c | 59 +++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 52 insertions(+), 7 deletions(-)
 
 diff --git a/libavformat/hls.c b/libavformat/hls.c
-index bf7fdc1..2e3bff6 100644
+index bf7fdc1..6cf1fc2 100644
 --- a/libavformat/hls.c
 +++ b/libavformat/hls.c
 @@ -73,6 +73,8 @@ enum KeyType {
@@ -20,15 +20,7 @@ index bf7fdc1..2e3bff6 100644
      int64_t duration;
      int64_t url_offset;
      int64_t size;
-@@ -686,6 +688,7 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
- 
-     av_dict_copy(&tmp, *opts, 0);
-     av_dict_copy(&tmp, opts2, 0);
-+    av_dict_set(&tmp, "seekable", "1", 0);
- 
-     if (is_http && c->http_persistent && *pb) {
-         ret = open_url_keepalive(c->ctx, pb, url, &tmp);
-@@ -726,6 +729,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
+@@ -726,6 +728,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
  static int parse_playlist(HLSContext *c, const char *url,
                            struct playlist *pls, AVIOContext *in)
  {
@@ -37,15 +29,15 @@ index bf7fdc1..2e3bff6 100644
      int ret = 0, is_segment = 0, is_variant = 0;
      int64_t duration = 0;
      enum KeyType key_type = KEY_NONE;
-@@ -797,6 +802,7 @@ static int parse_playlist(HLSContext *c, const char *url,
+@@ -797,6 +801,7 @@ static int parse_playlist(HLSContext *c, const char *url,
          pls->finished = 0;
          pls->type = PLS_TYPE_UNSPECIFIED;
      }
 +    int start_seq_no = -1;
      while (!avio_feof(in)) {
          ff_get_chomp_line(in, line, sizeof(line));
          if (av_strstart(line, "#EXT-X-STREAM-INF:", &ptr)) {
-@@ -846,7 +852,11 @@ static int parse_playlist(HLSContext *c, const char *url,
+@@ -846,7 +851,11 @@ static int parse_playlist(HLSContext *c, const char *url,
                          "INT64_MAX/2, mask out the highest bit\n");
                  seq_no &= INT64_MAX/2;
              }
@@ -58,7 +50,7 @@ index bf7fdc1..2e3bff6 100644
          } else if (av_strstart(line, "#EXT-X-PLAYLIST-TYPE:", &ptr)) {
              ret = ensure_playlist(c, &pls, url);
              if (ret < 0)
-@@ -911,6 +921,8 @@ static int parse_playlist(HLSContext *c, const char *url,
+@@ -911,6 +920,8 @@ static int parse_playlist(HLSContext *c, const char *url,
          } else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) {
              if (pls)
                  pls->finished = 1;
@@ -67,7 +59,7 @@ index bf7fdc1..2e3bff6 100644
          } else if (av_strstart(line, "#EXTINF:", &ptr)) {
              is_segment = 1;
              duration   = atof(ptr) * AV_TIME_BASE;
-@@ -986,6 +998,11 @@ static int parse_playlist(HLSContext *c, const char *url,
+@@ -986,6 +997,11 @@ static int parse_playlist(HLSContext *c, const char *url,
                                      " set to default value to 1ms.\n", seg->url);
                      duration = 0.001 * AV_TIME_BASE;
                  }
@@ -79,15 +71,15 @@ index bf7fdc1..2e3bff6 100644
                  seg->duration = duration;
                  seg->key_type = key_type;
                  dynarray_add(&pls->segments, &pls->n_segments, seg);
-@@ -2292,6 +2309,7 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
+@@ -2292,6 +2308,7 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
           * stream */
          if (pls->needed && !pls->pkt->data) {
              while (1) {
 +                int64_t pkt_ts = AV_NOPTS_VALUE;
                  int64_t ts_diff;
                  AVRational tb;
                  struct segment *seg = NULL;
-@@ -2305,12 +2323,40 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
+@@ -2305,12 +2322,40 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
                      if (pls->is_id3_timestamped && pls->pkt->stream_index == 0) {
                          /* audio elementary streams are id3 timestamped */
                          fill_timing_for_id3_timestamped_stream(pls);
@@ -132,7 +124,7 @@ index bf7fdc1..2e3bff6 100644
                  }
 
                  seg = current_segment(pls);
-@@ -2327,13 +2373,13 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
+@@ -2327,13 +2372,13 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
                  if (pls->seek_stream_index < 0 ||
                      pls->seek_stream_index == pls->pkt->stream_index) {
 
@@ -149,5 +141,5 @@ index bf7fdc1..2e3bff6 100644
                              pls->seek_timestamp;
                      if (ts_diff >= 0 && (pls->seek_flags  & AVSEEK_FLAG_ANY ||
 -- 
-2.39.3 (Apple Git-145)
+2.39.3 (Apple Git-146)
 

patches/ffmpeg-release-5.1/0005-hls-support-discontinuity.patch renamed to patches/ffmpeg-release-5.1/0005-hls-support-discontinuity-tag.patch

@@ -1,7 +1,7 @@
 From 742d238b20c760356ece1e23522e740fcfd8737f Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
 Date: Mon, 16 May 2022 16:15:10 +0800
-Subject: [PATCH 08/15] fix ffmpeg constructed wrong avcc for
+Subject: [PATCH 06/17] fix ffmpeg constructed wrong avcc for
  videotoolbox hwaccel.
 
 ---