Update patches

Author: ioppermann

.github/workflows/build_base_ubuntu-cuda.yaml

@@ -16,7 +16,7 @@ jobs:
             os: ubuntu
             os_version: "24.04"
             platforms: linux/amd64
-            cuda_version: "12.8.0"
+            cuda_version: "12.8.1"
             ffnvcodec_version: "12.2.72.0"
             ffmpeg_version: "7.1.1"
     steps:

contrib/ffmpeg-hls.patch

@@ -1,12 +1,12 @@
-From 763304129a1fb2e347c870b1250b90a696ee4317 Mon Sep 17 00:00:00 2001
+From 014b594a77161a7b4ffb5d63846547bb176fe6ba Mon Sep 17 00:00:00 2001
 From: Ingo Oppermann <[email protected]>
-Date: Mon, 20 Jan 2025 17:32:20 +0100
-Subject: [PATCH v3] hls (7.1.0)
+Date: Wed, 22 Oct 2025 17:28:57 +0200
+Subject: [PATCH v2] hls (7.1.1)
 
 ---
- README.HLS.md        | 48 +++++++++++++++++++++++++++
- libavformat/hlsenc.c | 79 ++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 125 insertions(+), 2 deletions(-)
+ README.HLS.md        |  48 ++++++++++++++++++++
+ libavformat/hlsenc.c | 104 +++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 149 insertions(+), 3 deletions(-)
  create mode 100644 README.HLS.md
 
 diff --git a/README.HLS.md b/README.HLS.md
@@ -64,18 +64,26 @@ index 00000000..5462338b
 +
 +In the command, the `-var_stream_map` option had the value `v:0,a:0 v:1,a:1`.
 diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
-index 1e932b7b..11a3f0dd 100644
+index 081d91f7..14fa5480 100644
 --- a/libavformat/hlsenc.c
 +++ b/libavformat/hlsenc.c
-@@ -125,6 +125,7 @@ typedef struct VariantStream {
+@@ -109,6 +109,7 @@ typedef enum HLSFlags {
+     HLS_PERIODIC_REKEY = (1 << 12),
+     HLS_INDEPENDENT_SEGMENTS = (1 << 13),
+     HLS_I_FRAMES_ONLY = (1 << 14),
++    HLS_ADJUST_SEQUENCE = (1 << 15),
+ } HLSFlags;
+ 
+ typedef enum {
+@@ -125,6 +126,7 @@ typedef struct VariantStream {
      AVIOContext *out;
      AVIOContext *out_single_file;
      int packets_written;
 +    uint64_t bytes_written;
      int init_range_length;
      uint8_t *temp_buffer;
      uint8_t *init_buffer;
-@@ -139,6 +140,8 @@ typedef struct VariantStream {
+@@ -139,6 +141,8 @@ typedef struct VariantStream {
      double dpp;           // duration per packet
      int64_t start_pts;
      int64_t end_pts;
@@ -84,14 +92,26 @@ index 1e932b7b..11a3f0dd 100644
      int64_t video_lastpos;
      int64_t video_keyframe_pos;
      int64_t video_keyframe_size;
-@@ -1507,6 +1510,16 @@ static int create_master_playlist(AVFormatContext *s,
+@@ -1503,12 +1507,28 @@ static int create_master_playlist(AVFormatContext *s,
+         if (final) {
+             bandwidth = vs->max_bitrate;
+             avg_bandwidth = vs->avg_bitrate;
++            if (avg_bandwidth < 0) {
++                avg_bandwidth = 0;
++            }
+         } else {
+             bandwidth = 0;
+             if (vid_st)
                  bandwidth += get_stream_bit_rate(vid_st);
              if (aud_st)
                  bandwidth += get_stream_bit_rate(aud_st);
 +
 +            if (bandwidth == 0) {
 +                // Estimate bandwidth
 +                bandwidth = (int)round((double)vs->bytes_written / (av_q2d(AV_TIME_BASE_Q) * (vs->scaled_cur_pts - vs->scaled_start_pts)) * 8);
++                if (bandwidth < 0) {
++                    bandwidth = 0;
++                }
 +
 +                // Reset counters
 +                vs->bytes_written = 0;
@@ -101,7 +121,33 @@ index 1e932b7b..11a3f0dd 100644
              bandwidth += bandwidth / 10;
          }
 
-@@ -2475,6 +2488,19 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
+@@ -2439,7 +2459,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
+     HLSContext *hls = s->priv_data;
+     AVFormatContext *oc = NULL;
+     AVStream *st = s->streams[pkt->stream_index];
+-    int64_t end_pts = 0;
++    int64_t end_pts = 0, max_sequence = 0;
+     int is_ref_pkt = 1;
+     int ret = 0, can_split = 1, i, j;
+     int stream_index = 0;
+@@ -2449,6 +2469,16 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
+     VariantStream *vs = NULL;
+     char *old_filename = NULL;
+ 
++    if (hls->flags & HLS_ADJUST_SEQUENCE) {
++        for (i = 0; i < hls->nb_varstreams; i++) {
++            vs = &hls->var_streams[i];
++
++            if (vs->sequence > max_sequence) {
++                max_sequence = vs->sequence;
++            }
++        }
++    }
++
+     for (i = 0; i < hls->nb_varstreams; i++) {
+         int subtitle_streams = 0;
+         vs = &hls->var_streams[i];
+@@ -2477,6 +2507,19 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
          return AVERROR(ENOMEM);
      }
 
@@ -121,7 +167,7 @@ index 1e932b7b..11a3f0dd 100644
      end_pts = hls->recording_time * vs->number;
 
      if (vs->sequence - vs->nb_entries > hls->start_sequence && hls->init_time > 0) {
-@@ -2523,8 +2549,8 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
+@@ -2525,8 +2568,8 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
      }
 
      can_split = can_split && (pkt->pts - vs->end_pts > 0);
@@ -132,15 +178,27 @@ index 1e932b7b..11a3f0dd 100644
          int64_t new_start_pos;
          int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
          double cur_duration;
-@@ -2700,6 +2726,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
+@@ -2643,6 +2686,11 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
+ 
+         cur_duration = (double)(pkt->pts - vs->end_pts) * st->time_base.num / st->time_base.den;
+         ret = hls_append_segment(s, hls, vs, cur_duration, vs->start_pos, vs->size);
++        if ((hls->flags & HLS_ADJUST_SEQUENCE) && vs->sequence < max_sequence) {
++            av_log(s, AV_LOG_WARNING, "fixing sequence number of variant %s.\n", vs->m3u8_name);
++            vs->sequence = max_sequence + 1;
++            vs->discontinuity = 1;
++        }
+         vs->end_pts = pkt->pts;
+         vs->duration = 0;
+         if (ret < 0) {
+@@ -2702,6 +2750,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
      }
 
      vs->packets_written++;
 +    vs->bytes_written += (uint64_t)pkt->size;
      if (oc->pb) {
          ret = ff_write_chained(oc, stream_index, pkt, s, 0);
          vs->video_keyframe_size += pkt->size;
-@@ -2888,6 +2915,49 @@ failed:
+@@ -2890,6 +2939,49 @@ failed:
      return 0;
  }
 
@@ -190,7 +248,7 @@ index 1e932b7b..11a3f0dd 100644
 
  static int hls_init(AVFormatContext *s)
  {
-@@ -2995,6 +3065,8 @@ static int hls_init(AVFormatContext *s)
+@@ -2997,6 +3089,8 @@ static int hls_init(AVFormatContext *s)
          vs->sequence  = hls->start_sequence;
          vs->start_pts = AV_NOPTS_VALUE;
          vs->end_pts   = AV_NOPTS_VALUE;
@@ -199,7 +257,7 @@ index 1e932b7b..11a3f0dd 100644
          vs->current_segment_final_filename_fmt[0] = '\0';
          vs->initial_prog_date_time = initial_program_date_time;
 
-@@ -3137,6 +3209,9 @@ static int hls_init(AVFormatContext *s)
+@@ -3139,6 +3233,9 @@ static int hls_init(AVFormatContext *s)
          vs->number++;
      }
 
@@ -209,8 +267,16 @@ index 1e932b7b..11a3f0dd 100644
      return ret;
  }
 
+@@ -3183,6 +3280,7 @@ static const AVOption options[] = {
+     {"periodic_rekey", "reload keyinfo file periodically for re-keying", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_PERIODIC_REKEY }, 0, UINT_MAX,   E, .unit = "flags"},
+     {"independent_segments", "add EXT-X-INDEPENDENT-SEGMENTS, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_INDEPENDENT_SEGMENTS }, 0, UINT_MAX, E, .unit = "flags"},
+     {"iframes_only", "add EXT-X-I-FRAMES-ONLY, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_I_FRAMES_ONLY }, 0, UINT_MAX, E, .unit = "flags"},
++    {"adjust_sequence", "adjust sequence numbers of variants if they diverge", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_ADJUST_SEQUENCE }, 0, UINT_MAX, E, .unit = "flags"},
+     {"strftime", "set filename expansion with strftime at segment creation", OFFSET(use_localtime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
+     {"strftime_mkdir", "create last directory component in strftime-generated filename", OFFSET(use_localtime_mkdir), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
+     {"hls_playlist_type", "set the HLS playlist type", OFFSET(pl_type), AV_OPT_TYPE_INT, {.i64 = PLAYLIST_TYPE_NONE }, 0, PLAYLIST_TYPE_NB-1, E, .unit = "pl_type" },
 
-base-commit: e1601d14100f6c7d088eba676d9555118ca94931
+base-commit: c526666f8869a5fffb04fbfeb862cde13338b001
 -- 
-2.39.5 (Apple Git-154)
+2.50.1 (Apple Git-155)