fix net bluray seek slow bug

Author: debugly

patches/ffmpeg-n6.1/0027-custom-bluray-fs_access-for-network-Blu-ray-Disc-and.patch

@@ -1,17 +1,17 @@
-From 00deddc6742a443adc34314586e0186ee515f06d Mon Sep 17 00:00:00 2001
+From a4c4fdb6fd792792c0528fc4b99c6ab77d55725f Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
-Date: Thu, 20 Mar 2025 11:07:30 +0800
-Subject: [PATCH 27] custom bluray fs_access for network Blu-ray Disc and BDMV,
+Date: Thu, 20 Mar 2025 18:48:01 +0800
+Subject: [PATCH 27] custom bluray fs_access for network Blu-ray Disc and BDMV, 
  use cache improve performance
 
 ---
  libavformat/Makefile           |   2 +-
- libavformat/bluray.c           | 154 ++++++++--
+ libavformat/bluray.c           | 148 +++++++--
  libavformat/bluray_custom_fs.c | 536 +++++++++++++++++++++++++++++++++
  libavformat/bluray_custom_fs.h |  33 ++
  libavformat/lrucache.c         | 112 +++++++
  libavformat/lrucache.h         |  30 ++
- 6 files changed, 848 insertions(+), 19 deletions(-)
+ 6 files changed, 842 insertions(+), 19 deletions(-)
  create mode 100644 libavformat/bluray_custom_fs.c
  create mode 100644 libavformat/bluray_custom_fs.h
  create mode 100644 libavformat/lrucache.c
@@ -31,7 +31,7 @@ index 19ba54e..4184bfd 100644
  OBJS-$(CONFIG_CONCAT_PROTOCOL)           += concat.o
  OBJS-$(CONFIG_CONCATF_PROTOCOL)          += concat.o
 diff --git a/libavformat/bluray.c b/libavformat/bluray.c
-index 1845551..fa7b9bd 100644
+index 1845551..c162da3 100644
 --- a/libavformat/bluray.c
 +++ b/libavformat/bluray.c
 @@ -20,24 +20,29 @@
@@ -69,7 +69,7 @@ index 1845551..fa7b9bd 100644
  } BlurayContext;
 
  #define OFFSET(x) offsetof(BlurayContext, x)
-@@ -106,24 +111,63 @@ static int bluray_close(URLContext *h)
+@@ -106,23 +111,56 @@ static int bluray_close(URLContext *h)
      if (bd->bd) {
          bd_close(bd->bd);
      }
@@ -84,7 +84,7 @@ index 1845551..fa7b9bd 100644
 +#define BLURAY_DEBUG_MASK 0xFFFFF //(0xFFFFF & ~DBG_STREAM)
 +
 +static void bluray_DebugHandler(const char *psz)
- {
++{
 +    size_t len = strlen(psz);
 +    if (len < 1)
 +        return;
@@ -94,7 +94,7 @@ index 1845551..fa7b9bd 100644
 +
 +static int bluray_open(URLContext *h, const char *path, int flags,
 +                       AVDictionary **options)
-+{
+ {
 +#ifdef DEBUG_BLURAY
 +    bd_set_debug_mask(BLURAY_DEBUG_MASK);
 +    bd_set_debug_handler(bluray_DebugHandler);
@@ -108,15 +108,15 @@ index 1845551..fa7b9bd 100644
 -    bd->bd = bd_open(diskname, NULL);
 -    if (!bd->bd) {
 +    diskname = ff_urldecode(diskname, 0);
-+    
++
 +    fs_access *access = NULL;
 +    int is_file = av_strstart(diskname, "file://", NULL) || av_strstart(diskname, "/", NULL);
-+    
++
 +    // file protocl can't handle AVIO_FLAG_DIRECT flag,so file not create custom access
 +    if (!is_file) {
 +        access = create_bluray_custom_access(diskname, options, &h->interrupt_callback);
 +    }
-+    
++
 +    bd->bd = bd_open_fs(diskname, NULL, access);
 +
 +    if (!bd->bd || is_bluray_custom_access_cancelled(access)) {
@@ -128,16 +128,9 @@ index 1845551..fa7b9bd 100644
      }
 +    bd->access = access;
 
-+    if (!is_file) {
-+        // set read packet buffer size is important! the default packet size is
-+        // 32768, when use smb2 protocol, download speed is limited to 2MB; but
-+        // when set the size to 1048576, download speed is 16MB;
-+        h->max_packet_size = 1048576;
-+    }
      /* check if disc can be played */
      if (check_disc_info(h) < 0) {
-         return AVERROR(EIO);
-@@ -137,7 +181,7 @@ static int bluray_open(URLContext *h, const char *path, int flags)
+@@ -137,7 +175,7 @@ static int bluray_open(URLContext *h, const char *path, int flags)
      }
      */
 
@@ -146,7 +139,7 @@ index 1845551..fa7b9bd 100644
      num_title_idx = bd_get_titles(bd->bd, TITLES_RELEVANT, MIN_PLAYLIST_LENGTH);
      av_log(h, AV_LOG_INFO, "%d usable playlists:\n", num_title_idx);
      if (num_title_idx < 1) {
-@@ -150,26 +194,31 @@ static int bluray_open(URLContext *h, const char *path, int flags)
+@@ -150,26 +188,31 @@ static int bluray_open(URLContext *h, const char *path, int flags)
          int i;
          for (i = 0; i < num_title_idx; i++) {
              BLURAY_TITLE_INFO *info = bd_get_title_info(bd->bd, i, 0);
@@ -183,23 +176,23 @@ index 1845551..fa7b9bd 100644
          return AVERROR(EIO);
      }
 
-@@ -182,7 +231,6 @@ static int bluray_open(URLContext *h, const char *path, int flags)
+@@ -182,7 +225,6 @@ static int bluray_open(URLContext *h, const char *path, int flags)
      if (bd->chapter > 1) {
          bd_seek_chapter(bd->bd, bd->chapter - 1);
      }
 -
      return 0;
  }
 
-@@ -213,7 +261,6 @@ static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)
+@@ -213,7 +255,6 @@ static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)
      case SEEK_CUR:
      case SEEK_END:
          return bd_seek(bd->bd, pos);
 -
      case AVSEEK_SIZE:
          return bd_get_title_size(bd->bd);
      }
-@@ -222,13 +269,84 @@ static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)
+@@ -222,13 +263,84 @@ static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)
      return AVERROR(EINVAL);
  }
 
@@ -287,7 +280,7 @@ index 1845551..fa7b9bd 100644
  };
 diff --git a/libavformat/bluray_custom_fs.c b/libavformat/bluray_custom_fs.c
 new file mode 100644
-index 0000000..f51bac0
+index 0000000..70cb00f
 --- /dev/null
 +++ b/libavformat/bluray_custom_fs.c
 @@ -0,0 +1,536 @@
@@ -550,7 +543,7 @@ index 0000000..f51bac0
 +    int got = -1;
 +    int64_t pos = (int64_t)lba * UDF_BLOCK_SIZE;
 +    int buf_size = num_blocks * UDF_BLOCK_SIZE;
-+    int use_cache = io->allow_cache && (num_blocks == 1);
++    int use_cache = io->allow_cache && (buf_size < 512 * 1024); // && (num_blocks == 1);
 +
 +    if (use_cache) {
 +        if (!io->cache) {