bluray protocol add dvd fallback

debugly · debugly · commit bb34854d89f5 · 2025-03-21T18:29:53.000+08:00
diff --git a/patches/ffmpeg-n6.1/0017-fix-http-chunked-transfer-get-wrong-size-cause-av_re.patch b/patches/ffmpeg-n6.1/0017-fix-http-chunked-transfer-get-wrong-size-cause-av_re.patch
@@ -1,7 +1,7 @@
 From 2155673117b3d8377311b59a33b1afeae511554b Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Thu, 27 Jun 2024 18:31:15 +0800
-Subject: [PATCH 18] fix http chunked transfer get wrong size cause av_read_frame
+Subject: [PATCH 17] fix http chunked transfer get wrong size cause av_read_frame
  can not return eof bug
 
 ---
diff --git a/patches/ffmpeg-n6.1/0018-supportsFamily-is-only-available-on-iOS-13.0-or-newe.patch b/patches/ffmpeg-n6.1/0018-supportsFamily-is-only-available-on-iOS-13.0-or-newe.patch
@@ -1,7 +1,7 @@
 From 1ebd4c062a886049f3c3255c50fe56f6621b9844 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Fri, 26 Jul 2024 16:11:14 +0800
-Subject: [PATCH 19] 'supportsFamily:' is only available on iOS 13.0 or newer
+Subject: [PATCH 18] 'supportsFamily:' is only available on iOS 13.0 or newer
 
 ---
  libavfilter/metal/utils.m | 2 +-
diff --git a/patches/ffmpeg-n6.1/0019-add-built-in-smb2-protocol-via-libsmb2.patch b/patches/ffmpeg-n6.1/0019-add-built-in-smb2-protocol-via-libsmb2.patch
@@ -1,7 +1,7 @@
 From 229f417012635accc6506d0c179343654b984f38 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Thu, 27 Feb 2025 14:49:42 +0800
-Subject: [PATCH 20] add built-in smb2 protocol via libsmb2
+Subject: [PATCH 19] add built-in smb2 protocol via libsmb2
 
 ---
  configure               |   5 +
diff --git a/patches/ffmpeg-n6.1/0020-fix-http-open-and-http_seek-redirect-authentication-.patch b/patches/ffmpeg-n6.1/0020-fix-http-open-and-http_seek-redirect-authentication-.patch
@@ -1,7 +1,7 @@
 From 29b3f4f302406cc546d87e5e8d26a20417bfcb63 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Tue, 12 Nov 2024 16:00:23 +0800
-Subject: [PATCH 23] fix http open and http_seek (redirect) authentication bug
+Subject: [PATCH 20] fix http open and http_seek (redirect) authentication bug
 
 ---
  libavformat/http.c | 25 ++++++++++++++++++++++++-
diff --git a/patches/ffmpeg-n6.1/0021-Adapt-to-clang-16.patch b/patches/ffmpeg-n6.1/0021-Adapt-to-clang-16.patch
@@ -1,7 +1,7 @@
 From 338d6fb305a992bc2a24347e4d7793e02b54345d Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Thu, 31 Oct 2024 10:55:33 +0800
-Subject: [PATCH 24] Adapt to clang 16
+Subject: [PATCH 21] Adapt to clang 16
 
 ---
  configure | 8 +++++++-
diff --git a/patches/ffmpeg-n6.1/0022-fix-can-t-seek-to-00-00-bug-baidu-neddisk-hls-start_.patch b/patches/ffmpeg-n6.1/0022-fix-can-t-seek-to-00-00-bug-baidu-neddisk-hls-start_.patch
@@ -1,7 +1,7 @@
 From 411a7fc1b4be73f655ca2881cc8e16a862bfe194 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Fri, 1 Nov 2024 16:56:53 +0800
-Subject: [PATCH 25] fix can't seek to 00:00 bug, baidu neddisk hls start_time is
+Subject: [PATCH 22] fix can't seek to 00:00 bug, baidu neddisk hls start_time is
  less than  first_timestamp
 
 ---
diff --git a/patches/ffmpeg-n6.1/0022-support-probe-bluray-video.patch b/patches/ffmpeg-n6.1/0022-support-probe-bluray-video.patch
diff --git a/patches/ffmpeg-n6.1/0023-http-add-reconnect_first_delay-opt.patch b/patches/ffmpeg-n6.1/0023-http-add-reconnect_first_delay-opt.patch
@@ -1,7 +1,7 @@
 From 18f90d0efc60ba8bee97bbe1c7c1a6f139b9ff24 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Tue, 12 Nov 2024 14:42:37 +0800
-Subject: [PATCH 26] http add reconnect_first_delay opt
+Subject: [PATCH 23] http add reconnect_first_delay opt
 
 ---
  libavformat/http.c | 4 +++-
diff --git a/patches/ffmpeg-n6.1/0024-Audio-Vivid-Parser-and-Demuxer-but-av3a-Decoder-is-a.patch b/patches/ffmpeg-n6.1/0024-Audio-Vivid-Parser-and-Demuxer-but-av3a-Decoder-is-a.patch
@@ -1,7 +1,7 @@
 From f73942871770f5e268178c886b7d6100e1c5faba Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Mon, 18 Nov 2024 17:12:20 +0800
-Subject: [PATCH 27] Audio Vivid Parser and Demuxer, but av3a Decoder is absent
+Subject: [PATCH 24] Audio Vivid Parser and Demuxer, but av3a Decoder is absent
 
 ---
  libavcodec/Makefile      |   1 +
diff --git a/patches/ffmpeg-n6.1/0025-add-4-dummy-ijkplaceholder-demuxers.patch b/patches/ffmpeg-n6.1/0025-add-4-dummy-ijkplaceholder-demuxers.patch
@@ -1,7 +1,7 @@
 From 6d78475920216bbc66a63d6aa7484b7ad57f7ff8 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Thu, 28 Nov 2024 11:28:43 +0800
-Subject: [PATCH 28] add 4 dummy ijkplaceholder demuxers
+Subject: [PATCH 25] add 4 dummy ijkplaceholder demuxers
 
 ---
  libavformat/allformats.c | 5 +++++
diff --git a/patches/ffmpeg-n6.1/0026-add-3-dummy-ijkhttp-protocols-and-use-selected_http-.patch b/patches/ffmpeg-n6.1/0026-add-3-dummy-ijkhttp-protocols-and-use-selected_http-.patch
@@ -1,7 +1,7 @@
 From ab8fe6d0c2de932980f6f1e9d31e24f25750da37 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Fri, 14 Mar 2025 17:41:28 +0800
-Subject: [PATCH 29] add 3 dummy ijkhttp protocols and use selected_http option
+Subject: [PATCH 26] add 3 dummy ijkhttp protocols and use selected_http option
  choose
 
 ---
diff --git a/patches/ffmpeg-n6.1/0027-custom-bluray-fs-for-network-Blu-ray-Disc-and-BDMV.patch b/patches/ffmpeg-n6.1/0027-custom-bluray-fs-for-network-Blu-ray-Disc-and-BDMV.patch
diff --git a/patches/ffmpeg-n6.1/0028-bluray-protocol-add-dvd-fallback.patch b/patches/ffmpeg-n6.1/0028-bluray-protocol-add-dvd-fallback.patch
@@ -0,0 +1,54 @@
+From b5176510c15322f2223c5e16af20e65be98db163 Mon Sep 17 00:00:00 2001
+From: qianlongxu <qianlongxu@gmail.com>
+Date: Wed, 19 Mar 2025 13:22:27 +0800
+Subject: [PATCH 28] bluray protocol add dvd fallback
+
+---
+ libavformat/demux.c | 24 +++++++++++++++++++++---
+ 1 file changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/libavformat/demux.c b/libavformat/demux.c
+index 51fff7b..05e02db 100644
+--- a/libavformat/demux.c
++++ b/libavformat/demux.c
+@@ -158,7 +158,10 @@ static int init_input(AVFormatContext *s, const char *filename,
+     int ret;
+     AVProbeData pd = { filename, NULL, 0 };
+     int score = AVPROBE_SCORE_RETRY;
+-
++    AVDictionary *tmp_opts = NULL;
++    if (options && (av_stristart(filename, "bluray://", NULL) || av_stristart(filename, "dvd://", NULL))) {
++        av_dict_copy(&tmp_opts, *options, 0);
++    }
+     if (s->pb) {
+         s->flags |= AVFMT_FLAG_CUSTOM_IO;
+         if (!s->iformat)
+@@ -174,8 +177,23 @@ static int init_input(AVFormatContext *s, const char *filename,
+         (!s->iformat && (s->iformat = av_probe_input_format2(&pd, 0, &score))))
+         return score;
+ 
+-    if ((ret = s->io_open(s, &s->pb, filename, AVIO_FLAG_READ | s->avio_flags, options)) < 0)
+-        return ret;
++    if ((ret = s->io_open(s, &s->pb, filename, AVIO_FLAG_READ | s->avio_flags,
++                          options)) < 0) {
++        if (av_stristart(filename, "bluray://", NULL)) {
++            const char *dvd_name =
++                av_strireplace(filename, "bluray://", "dvd://");
++            ret = init_input(s, dvd_name, &tmp_opts);
++            av_dict_free(&tmp_opts);
++            return ret;
++        } else if (av_stristart(filename, "dvd://", NULL)) {
++            const char *a_name = av_strireplace(filename, "dvd://", "");
++            ret = init_input(s, a_name, &tmp_opts);
++            av_dict_free(&tmp_opts);
++            return ret;
++        } else {
++            return ret;
++        }
++    }
+ 
+     if (s->iformat)
+         return 0;
+-- 
+2.39.5 (Apple Git-154)
+
diff --git a/patches/ffmpeg-n6.1/0029-bluray-open-and-find-the-right-m2ts-then-read-seek-i.patch b/patches/ffmpeg-n6.1/0029-bluray-open-and-find-the-right-m2ts-then-read-seek-i.patch
