add two ffmpeg patches

Author: debugly

patches/ffmpeg-n6.1/0030-not-very-useful-log-use-trace-level.patch

@@ -0,0 +1,76 @@
+From 4a89fee5b4793c8a116d3d33b712601fb6abddcf Mon Sep 17 00:00:00 2001
+From: qianlongxu <qianlongxu@gmail.com>
+Date: Thu, 17 Apr 2025 10:21:12 +0800
+Subject: [PATCH 30] not very useful log use trace level
+
+---
+ libavcodec/h2645_parse.c | 6 +++---
+ libavcodec/h2645_vui.c   | 2 +-
+ libavformat/demux.c      | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
+index 28db465..ac9e151 100644
+--- a/libavcodec/h2645_parse.c
++++ b/libavcodec/h2645_parse.c
+@@ -353,7 +353,7 @@ static int vvc_parse_nal_header(H2645NAL *nal, void *logctx)
+     if ((nal->type >= VVC_IDR_W_RADL && nal->type <= VVC_RSV_IRAP_11) && nal->temporal_id)
+         return AVERROR_INVALIDDATA;
+ 
+-    av_log(logctx, AV_LOG_DEBUG,
++    av_log(logctx, AV_LOG_TRACE,
+            "nal_unit_type: %d(%s), nuh_layer_id: %d, temporal_id: %d\n",
+            nal->type, vvc_nal_unit_name(nal->type), nal->nuh_layer_id, nal->temporal_id);
+ 
+@@ -374,7 +374,7 @@ static int hevc_parse_nal_header(H2645NAL *nal, void *logctx)
+     if (nal->temporal_id < 0)
+         return AVERROR_INVALIDDATA;
+ 
+-    av_log(logctx, AV_LOG_DEBUG,
++    av_log(logctx, AV_LOG_TRACE,
+            "nal_unit_type: %d(%s), nuh_layer_id: %d, temporal_id: %d\n",
+            nal->type, hevc_nal_unit_name(nal->type), nal->nuh_layer_id, nal->temporal_id);
+ 
+@@ -391,7 +391,7 @@ static int h264_parse_nal_header(H2645NAL *nal, void *logctx)
+     nal->ref_idc = get_bits(gb, 2);
+     nal->type    = get_bits(gb, 5);
+ 
+-    av_log(logctx, AV_LOG_DEBUG,
++    av_log(logctx, AV_LOG_TRACE,
+            "nal_unit_type: %d(%s), nal_ref_idc: %d\n",
+            nal->type, h264_nal_unit_name(nal->type), nal->ref_idc);
+ 
+diff --git a/libavcodec/h2645_vui.c b/libavcodec/h2645_vui.c
+index e5c7bf4..8301492 100644
+--- a/libavcodec/h2645_vui.c
++++ b/libavcodec/h2645_vui.c
+@@ -36,7 +36,7 @@
+ 
+ void ff_h2645_decode_common_vui_params(GetBitContext *gb, H2645VUI *vui, void *logctx)
+ {
+-    av_log(logctx, AV_LOG_DEBUG, "Decoding VUI\n");
++    av_log(logctx, AV_LOG_TRACE, "Decoding VUI\n");
+ 
+     vui->aspect_ratio_info_present_flag = get_bits1(gb);
+     if (vui->aspect_ratio_info_present_flag) {
+diff --git a/libavformat/demux.c b/libavformat/demux.c
+index 15807f6..535acaf 100644
+--- a/libavformat/demux.c
++++ b/libavformat/demux.c
+@@ -1979,11 +1979,11 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset)
+     for (unsigned i = 0; i < ic->nb_streams; i++) {
+         AVStream *const st = ic->streams[i];
+         if (st->time_base.den)
+-            av_log(ic, AV_LOG_TRACE, "stream %u: start_time: %s duration: %s\n", i,
++            av_log(ic, AV_LOG_DEBUG, "stream %u: start_time: %s duration: %s\n", i,
+                    av_ts2timestr(st->start_time, &st->time_base),
+                    av_ts2timestr(st->duration, &st->time_base));
+     }
+-    av_log(ic, AV_LOG_TRACE,
++    av_log(ic, AV_LOG_DEBUG,
+            "format: start_time: %s duration: %s (estimate from %s) bitrate=%"PRId64" kb/s\n",
+            av_ts2timestr(ic->start_time, &AV_TIME_BASE_Q),
+            av_ts2timestr(ic->duration, &AV_TIME_BASE_Q),
+-- 
+2.39.5 (Apple Git-154)
+

patches/ffmpeg-n6.1/0031-let-avio-can-retry-when-avio-encounter-error-but-not.patch

@@ -0,0 +1,28 @@
+From 3f0966825de7bf6ff6cb858c70f197fbeafe3419 Mon Sep 17 00:00:00 2001
+From: qianlongxu <qianlongxu@gmail.com>
+Date: Thu, 17 Apr 2025 10:36:54 +0800
+Subject: [PATCH 31] let avio can retry when avio encounter error but not eof
+
+---
+ libavformat/aviobuf.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
+index 2899c75..06012b7 100644
+--- a/libavformat/aviobuf.c
++++ b/libavformat/aviobuf.c
+@@ -569,7 +569,10 @@ static void fill_buffer(AVIOContext *s)
+         s->eof_reached = 1;
+ 
+     /* no need to do anything if EOF already reached */
+-    if (s->eof_reached)
++    /* when "len = read_packet_wrapper(s, dst, len);" has error, eof_reached marked to 1
++     * in effect the stream not eof but encounter network error
++     */
++    if (s->eof_reached && !s->error)
+         return;
+ 
+     if (s->update_checksum && dst == s->buffer) {
+-- 
+2.39.5 (Apple Git-154)
+