bluray and dvd use dummy protocol

Author: debugly

apple/do-compile/any.sh

@@ -147,12 +147,12 @@ function main() {
         'build')
             resolve_dep
             for arch in $archs; do
-                init_env $arch
+                init_arch_env $arch
                 do_compile $arch
                 echo
             done
 
-            do_lipo_all "$XC_ALL_ARCHS"
+            do_lipo_all "$archs"
         ;;
         'rebuild')
             echo '---clean for rebuild-----------------'

apple/do-compile/bluray.sh

@@ -30,15 +30,22 @@ env_assert "XC_DEPLOYMENT_TARGET"
 env_assert "XCRUN_SDK_PATH"
 env_assert "XCRUN_CC"
 env_assert "THREAD_COUNT"
+env_assert "XC_OTHER_CFLAGS"
 echo "XC_OPTS:$XC_OPTS"
 echo "===check env end==="
 
+if [[ "$XC_OPTS" == "debug" ]];then
+    export XC_OTHER_CFLAGS="${XC_OTHER_CFLAGS} -g"
+else
+    export XC_OTHER_CFLAGS="${XC_OTHER_CFLAGS} -Os"
+fi
+
 # prepare build config
 CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --without-freetype --without-fontconfig --disable-doxygen-doc"
 CFLAGS="-arch $XC_ARCH $XC_DEPLOYMENT_TARGET $XC_OTHER_CFLAGS"
 
 if [[ "$XC_OPTS" == "debug" ]];then
-   CFG_FLAGS="${CFG_FLAGS} use_examples=yes"
+   CFG_FLAGS="${CFG_FLAGS} use_examples=yes --disable-optimizations"
 fi
 
 # for cross compile

apple/do-compile/ffmpeg.sh

@@ -66,7 +66,7 @@ if [[ "$XC_OPTS" == "debug" ]]; then
     CFG_FLAGS="$CFG_FLAGS --disable-optimizations"
     CFG_FLAGS="$CFG_FLAGS --enable-debug"
     CFG_FLAGS="$CFG_FLAGS --disable-small"
-    C_FLAGS="$C_FLAGS -D DEBUG_BLURAY=1"
+    #C_FLAGS="$C_FLAGS -D DEBUG_BLURAY=1"
 else
     CFG_FLAGS="$CFG_FLAGS --enable-optimizations"
     CFG_FLAGS="$CFG_FLAGS --disable-debug"
@@ -198,35 +198,6 @@ else
     echo "[*] --disable-libopus"
 fi
 
-echo "----------------------"
-echo "[*] check bluray"
-
-# with bluray
-if [[ -f "${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig/libbluray.pc" ]]; then
-
-# --enable-libxml2
-    CFG_FLAGS="$CFG_FLAGS --enable-libbluray --enable-protocol=bluray"
-
-    if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
-        MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
-    fi
-    MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig"
-
-    echo "[*] --enable-libbluray --enable-protocol=bluray"
-elif [[ -f "${XC_PRODUCT_ROOT}/universal/bluray/lib/pkgconfig/libbluray.pc" ]]; then
-# --enable-libxml2
-    CFG_FLAGS="$CFG_FLAGS --enable-libbluray --enable-protocol=bluray"
-
-    if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
-        MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
-    fi
-    MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/universal/bluray/lib/pkgconfig"
-
-    echo "[*] --enable-libbluray --enable-protocol=bluray"
-else
-    echo "[*] --disable-libbluray --disable-protocol=bluray"
-fi
-
 echo "----------------------"
 echo "[*] check dav1d"
 
@@ -259,27 +230,56 @@ fi
 #just wait videotoolbox support decode av1
 # CFG_FLAGS="$CFG_FLAGS --enable-decoder=av1"
 
-echo "----------------------"
-echo "[*] check dvdread"
+# echo "----------------------"
+# echo "[*] check bluray"
 
-if [[ -f "${XC_PRODUCT_ROOT}/dvdread-$XC_ARCH/lib/pkgconfig/dvdread.pc" || -f "${XC_PRODUCT_ROOT}/universal/dvdread/lib/pkgconfig/dvdread.pc" ]]; then
+# # with bluray
+# if [[ -f "${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig/libbluray.pc" ]]; then
 
-    CFG_FLAGS="$CFG_FLAGS --enable-libdvdread"
+# # --enable-libxml2
+#     CFG_FLAGS="$CFG_FLAGS --enable-libbluray --enable-protocol=bluray"
 
-    if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
-        MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
-    fi
+#     if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
+#         MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
+#     fi
+#     MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig"
 
-    if [[ -f "${XC_PRODUCT_ROOT}/dvdread-$XC_ARCH/lib/pkgconfig/dvdread.pc" ]]; then
-        MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/dvdread-$XC_ARCH/lib/pkgconfig"
-    else
-        MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/universal/dvdread/lib/pkgconfig"
-    fi
+#     echo "[*] --enable-libbluray --enable-protocol=bluray"
+# elif [[ -f "${XC_PRODUCT_ROOT}/universal/bluray/lib/pkgconfig/libbluray.pc" ]]; then
+# # --enable-libxml2
+#     CFG_FLAGS="$CFG_FLAGS --enable-libbluray --enable-protocol=bluray"
 
-    echo "[*] --enable-libdvdread"
-else
-    echo "[*] --disable-libdvdread"
-fi
+#     if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
+#         MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
+#     fi
+#     MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/universal/bluray/lib/pkgconfig"
+
+#     echo "[*] --enable-libbluray --enable-protocol=bluray"
+# else
+#     echo "[*] --disable-libbluray --disable-protocol=bluray"
+# fi
+
+# echo "----------------------"
+# echo "[*] check dvdread"
+
+# if [[ -f "${XC_PRODUCT_ROOT}/dvdread-$XC_ARCH/lib/pkgconfig/dvdread.pc" || -f "${XC_PRODUCT_ROOT}/universal/dvdread/lib/pkgconfig/dvdread.pc" ]]; then
+
+#     CFG_FLAGS="$CFG_FLAGS --enable-libdvdread"
+
+#     if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
+#         MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
+#     fi
+
+#     if [[ -f "${XC_PRODUCT_ROOT}/dvdread-$XC_ARCH/lib/pkgconfig/dvdread.pc" ]]; then
+#         MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/dvdread-$XC_ARCH/lib/pkgconfig"
+#     else
+#         MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/universal/dvdread/lib/pkgconfig"
+#     fi
+
+#     echo "[*] --enable-libdvdread"
+# else
+#     echo "[*] --disable-libdvdread"
+# fi
 
 
 echo "----------------------"

apple/init-env.sh

@@ -23,19 +23,19 @@ echo "support thread count:$THREAD_COUNT"
 
 XCRUN_DEVELOPER=`xcode-select -print-path`
 if [ ! -d "$XCRUN_DEVELOPER" ]; then
-  echo "xcode path is not set correctly $XCRUN_DEVELOPER does not exist (most likely because of xcode > 4.3)"
-  echo "run"
-  echo "sudo xcode-select -switch <xcode path>"
-  echo "for default installation:"
-  echo "sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer"
-  exit 1
+    echo "xcode path is not set correctly $XCRUN_DEVELOPER does not exist (most likely because of xcode > 4.3)"
+    echo "run"
+    echo "sudo xcode-select -switch <xcode path>"
+    echo "for default installation:"
+    echo "sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer"
+    exit 1
 fi
 
-case $XCRUN_DEVELOPER in  
-     *\ * )
-           echo "Your Xcode path contains whitespaces, which is not supported."
-           exit 1
-          ;;
+case $XCRUN_DEVELOPER in
+    *\ * )
+        echo "Your Xcode path contains whitespaces, which is not supported."
+        exit 1
+    ;;
 esac
 
 echo $(xcodebuild -version)
@@ -51,13 +51,13 @@ function install_depends() {
     fi
 }
 
-function init_env () {
+function init_arch_env () {
 
     if [[ -z "$XC_PLAT" ]]; then
         echo "XC_PLAT can't be nil."
         exit 1
     fi
-
+    
     if [[ "$XC_PLAT" == 'ios' ]]; then
         case $1 in
             'x86_64')
@@ -69,31 +69,33 @@ function init_env () {
                 export XC_DEPLOYMENT_TARGET='-miphoneos-version-min=11.0'
             ;;
         esac
-        export XC_OTHER_CFLAGS='-fembed-bitcode -Os'
+        
+        export XC_OTHER_CFLAGS="-fembed-bitcode"
+
     else
         export XCRUN_PLATFORM='MacOSX'
         export MACOSX_DEPLOYMENT_TARGET=10.11
         export XC_DEPLOYMENT_TARGET="-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
-        export XC_OTHER_CFLAGS='-Os'
+        export XC_OTHER_CFLAGS=""
     fi
-
+    
     #common xcode configuration
     export XC_TAGET_OS="darwin"
     export DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
 
     # macosx
     export XCRUN_SDK=`echo $XCRUN_PLATFORM | tr '[:upper:]' '[:lower:]'`
-    # xcrun -sdk macosx clang 
+    # xcrun -sdk macosx clang
     export XCRUN_CC="xcrun -sdk $XCRUN_SDK clang"
     export XCRUN_CXX="xcrun -sdk $XCRUN_SDK clang++"
-    # xcrun -sdk macosx --show-sdk-platform-path 
+    # xcrun -sdk macosx --show-sdk-platform-path
     # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform
     export XCRUN_SDK_PLATFORM_PATH=`xcrun -sdk $XCRUN_SDK --show-sdk-platform-path`
-    # xcrun -sdk macosx --show-sdk-path 
+    # xcrun -sdk macosx --show-sdk-path
     # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk
     export XCRUN_SDK_PATH=`xcrun -sdk $XCRUN_SDK --show-sdk-path`
 }
 
 export -f install_depends
-export -f init_env
+export -f init_arch_env
 export XC_ALL_ARCHS="x86_64 arm64"

patches/bluray/0001-skip-check-bdj-and-provide-reading-current-stream-fi.patch

@@ -0,0 +1,67 @@
+From 89be19cefe0ad81337e72189af7db3dfe63107fc Mon Sep 17 00:00:00 2001
+From: qianlongxu <[email protected]>
+Date: Tue, 28 May 2024 16:55:19 +0800
+Subject: [PATCH] skip check bdj and provide reading current stream file
+ functions
+
+---
+ src/libbluray/bluray.c | 21 +++++++++++++++++++++
+ src/libbluray/bluray.h |  3 +++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
+index b3b55f7..e9ff566 100644
+--- a/src/libbluray/bluray.c
++++ b/src/libbluray/bluray.c
+@@ -612,6 +612,24 @@ static void _close_m2ts(BD_STREAM *st)
+     m2ts_filter_close(&st->m2ts_filter);
+ }
+ 
++int64_t bd_file_read(BLURAY *bd, unsigned char *buf, int size)
++{
++    BD_STREAM *st = &bd->st0;
++    return file_read(st->fp, buf, size);
++}
++
++int64_t bd_file_seek(BLURAY *bd, int64_t pos, int whence)
++{
++    BD_STREAM *st = &bd->st0;
++    return file_seek(st->fp, pos, whence);
++}
++
++int64_t bd_file_size(BLURAY *bd)
++{
++    BD_STREAM *st = &bd->st0;
++    return file_size(st->fp);
++}
++
+ static int _open_m2ts(BLURAY *bd, BD_STREAM *st)
+ {
+     _close_m2ts(st);
+@@ -955,6 +973,9 @@ static int _run_gc(BLURAY *bd, gc_ctrl_e msg, uint32_t param)
+ 
+ static void _check_bdj(BLURAY *bd)
+ {
++    BD_DEBUG(DBG_BLURAY, "skip check bdj!\n");
++    return;
++
+     if (!bd->disc_info.bdj_handled) {
+         if (!bd->disc || bd->disc_info.bdj_detected) {
+ 
+diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
+index 41cd4f6..756520e 100644
+--- a/src/libbluray/bluray.h
++++ b/src/libbluray/bluray.h
+@@ -1210,6 +1210,9 @@ struct bd_dir_s *bd_open_dir(BLURAY *bd, const char *dir);
+  */
+ struct bd_file_s *bd_open_file_dec(BLURAY *bd, const char *path);
+ 
++int64_t bd_file_read(BLURAY *bd, unsigned char *buf, int size);
++int64_t bd_file_seek(BLURAY *bd, int64_t pos, int whence);
++int64_t bd_file_size(BLURAY *bd);
+ 
+ #ifdef __cplusplus
+ }
+-- 
+2.39.3 (Apple Git-146)
+

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/17] h264_ps null pointer fault tolerant
+Subject: [PATCH 01/16] 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/17] flv support hevc
+Subject: [PATCH 02/16] flv support hevc
 
 ---
  libavformat/flv.h    |  1 +

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

@@ -1,7 +1,7 @@
 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
+Subject: [PATCH 03/16] correct file seekable value range, 0 means streamed can't
  seek, 1 means not streamed can seek.
 
 ---

patches/ffmpeg-release-5.1/0004-restore-ijk-custom-protocols-except-long.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/17] restore ijk custom protocols except long url
+Subject: [PATCH 04/16] restore ijk custom protocols except long url
 
 ---
  libavcodec/Makefile      |  1 +

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

@@ -1,7 +1,7 @@
 From dc595d866ab9a0a67331b10dc969b434ab5e4e6b Mon Sep 17 00:00:00 2001
 From: qianlongxu <[email protected]>
 Date: Wed, 22 May 2024 14:55:43 +0800
-Subject: [PATCH 05/17] hls support discontinuity tag
+Subject: [PATCH 05/16] hls support discontinuity tag
 
 ---
  libavformat/hls.c | 59 +++++++++++++++++++++++++++++++++++++++++------