not use dummy protocol

debugly · debugly · commit ddbee4d9a0be · 2024-05-29T11:49:41.000+08:00
diff --git a/apple/do-compile/ffmpeg.sh b/apple/do-compile/ffmpeg.sh
@@ -230,56 +230,56 @@ fi
 #just wait videotoolbox support decode av1
 # CFG_FLAGS="$CFG_FLAGS --enable-decoder=av1"
 
-# echo "----------------------"
-# echo "[*] check bluray"
+echo "----------------------"
+echo "[*] check bluray"
 
-# # with bluray
-# if [[ -f "${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig/libbluray.pc" ]]; then
+# 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"
+    # --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"
+    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"
+    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"
+    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 "[*] --enable-libbluray --enable-protocol=bluray"
+else
+    echo "[*] --disable-libbluray --disable-protocol=bluray"
+fi
 
-# echo "----------------------"
-# echo "[*] check dvdread"
+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
+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"
+    CFG_FLAGS="$CFG_FLAGS --enable-libdvdread"
 
-#     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
 
-#     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
+    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 "[*] --enable-libdvdread"
+else
+    echo "[*] --disable-libdvdread"
+fi
 
 
 echo "----------------------"
diff --git a/patches/ffmpeg-release-5.1/0001-15-h264_ps-null-pointer-fault-tolerant.patch b/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 <qianlongxu@gmail.com>
 Date: Mon, 22 May 2023 17:21:37 +0800
-Subject: [PATCH 01/16] h264_ps null pointer fault tolerant
+Subject: [PATCH 01] h264_ps null pointer fault tolerant
 
 ---
  libavcodec/h264_ps.c | 8 ++++----
diff --git a/patches/ffmpeg-release-5.1/0002-flv-support-hevc.patch b/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 <qianlongxu@gmail.com>
 Date: Mon, 22 May 2023 17:27:59 +0800
-Subject: [PATCH 02/16] flv support hevc
+Subject: [PATCH 02] flv support hevc
 
 ---
  libavformat/flv.h    |  1 +
diff --git a/patches/ffmpeg-release-5.1/0003-correct-file-seekable-value-range-0-means-streamed-c.patch b/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 <qianlongxu@gmail.com>
 Date: Wed, 22 May 2024 14:24:29 +0800
-Subject: [PATCH 03/16] correct file seekable value range, 0 means streamed can't
+Subject: [PATCH 03] correct file seekable value range, 0 means streamed can't
  seek, 1 means not streamed can seek.
 
 ---
diff --git a/patches/ffmpeg-release-5.1/0004-restore-ijk-custom-protocols-except-long.patch b/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 <qianlongxu@gmail.com>
 Date: Tue, 23 Jan 2024 15:32:33 +0800
-Subject: [PATCH 04/16] restore ijk custom protocols except long url
+Subject: [PATCH 04] restore ijk custom protocols except long url
 
 ---
  libavcodec/Makefile      |  1 +
diff --git a/patches/ffmpeg-release-5.1/0005-hls-support-discontinuity-tag.patch b/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 <qianlongxu@gmail.com>
 Date: Wed, 22 May 2024 14:55:43 +0800
-Subject: [PATCH 05/16] hls support discontinuity tag
+Subject: [PATCH 05] hls support discontinuity tag
 
 ---
  libavformat/hls.c | 59 +++++++++++++++++++++++++++++++++++++++++------
diff --git a/patches/ffmpeg-release-5.1/0006-fix-ffmpeg-constructed-wrong-avcc-for-vi.patch b/patches/ffmpeg-release-5.1/0006-fix-ffmpeg-constructed-wrong-avcc-for-vi.patch
@@ -1,7 +1,7 @@
 From 742d238b20c760356ece1e23522e740fcfd8737f Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Mon, 16 May 2022 16:15:10 +0800
-Subject: [PATCH 06/16] fix ffmpeg constructed wrong avcc for
+Subject: [PATCH 06] fix ffmpeg constructed wrong avcc for
  videotoolbox hwaccel.
 
 ---
diff --git a/patches/ffmpeg-release-5.1/0007-fix-lrcdec-read-line-bug-on-osx.patch b/patches/ffmpeg-release-5.1/0007-fix-lrcdec-read-line-bug-on-osx.patch
@@ -1,7 +1,7 @@
 From e9742509d17c2c08b6d6d5eca8da5fe886d5cb66 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Mon, 22 May 2023 18:20:51 +0800
-Subject: [PATCH 07/16] fix lrcdec read line bug on osx.
+Subject: [PATCH 07] fix lrcdec read line bug on osx.
 
 ---
  libavformat/lrcdec.c | 20 +++++++++++---------
diff --git a/patches/ffmpeg-release-5.1/0008-Correct-the-wrong-codecpar-codec_id-whic.patch b/patches/ffmpeg-release-5.1/0008-Correct-the-wrong-codecpar-codec_id-whic.patch
@@ -1,7 +1,7 @@
 From de06913f5f86b1293afe5975d5e32fb5e0dceaf3 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Mon, 22 May 2023 18:19:11 +0800
-Subject: [PATCH 08/16] Correct the wrong codecpar->codec_id which read
+Subject: [PATCH 08] Correct the wrong codecpar->codec_id which read
  from MIME of ID3tags, but the real data was encoded in PNG/JPEG/TIFF
 
 ---
diff --git a/patches/ffmpeg-release-5.1/0009-mov-support-heic-demuxer-https-git.patch b/patches/ffmpeg-release-5.1/0009-mov-support-heic-demuxer-https-git.patch
@@ -1,7 +1,7 @@
 From 13ac53d7cea87c6cf1fb5eaf2344a6cd16c254e8 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Mon, 12 Jun 2023 18:18:05 +0800
-Subject: [PATCH 09/16] mov support heic demuxer
+Subject: [PATCH 09] mov support heic demuxer
  (https://github.com/bluez-sh/FFmpeg/commit/9a885cddb3550ab863a60d02c5fb78e4ae206cf1)
 
 ---
diff --git a/patches/ffmpeg-release-5.1/0010-avformat-mov-fix-to-detect-if-stream-pos.patch b/patches/ffmpeg-release-5.1/0010-avformat-mov-fix-to-detect-if-stream-pos.patch
@@ -1,7 +1,7 @@
 From f6f27781ff29d6b6d9f812d0a01d990fc91ce3e0 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Tue, 23 Jan 2024 14:16:01 +0800
-Subject: [PATCH 10/16] avformat mov fix to detect if stream position
+Subject: [PATCH 10] avformat mov fix to detect if stream position
  has been reset
  (https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200424152042.29383-3-hello.vectronic@gmail.com/)
 
diff --git a/patches/ffmpeg-release-5.1/0011-avformat-mpegts-index-only-keyframes-to-ensure-accur.patch b/patches/ffmpeg-release-5.1/0011-avformat-mpegts-index-only-keyframes-to-ensure-accur.patch
@@ -1,7 +1,7 @@
 From d1114e0ab218b333bffe322361d8b46033e18fa9 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Fri, 24 May 2024 10:30:36 +0800
-Subject: [PATCH 11/16] avformat/mpegts: index only keyframes to ensure accurate
+Subject: [PATCH 11] avformat/mpegts: index only keyframes to ensure accurate
  seeks by default
 
 ---
diff --git a/patches/ffmpeg-release-5.1/0012-convenience-wrapper-for-av_dict_get.patch b/patches/ffmpeg-release-5.1/0012-convenience-wrapper-for-av_dict_get.patch
@@ -1,7 +1,7 @@
 From 70ab998115da224b4dfbe7649f18954848a275ef Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Sat, 11 May 2024 15:11:42 +0800
-Subject: [PATCH 12/16] convenience wrapper for av_dict_get
+Subject: [PATCH 12] convenience wrapper for av_dict_get
 
 ---
  libavutil/dict.c | 39 ++++++++++++++++++++++++++++++++++++++-
diff --git a/patches/ffmpeg-release-5.1/0013-avutil-add-application.patch b/patches/ffmpeg-release-5.1/0013-avutil-add-application.patch
@@ -1,7 +1,7 @@
 From 50054730f19cddd4f2b4eb537296ddca6b9d7fcc Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Sat, 11 May 2024 15:12:38 +0800
-Subject: [PATCH 13/16] avutil add application
+Subject: [PATCH 13] avutil add application
 
 ---
  libavutil/Makefile      |   2 +
diff --git a/patches/ffmpeg-release-5.1/0014-restore-ijk-http-event-hooks.patch b/patches/ffmpeg-release-5.1/0014-restore-ijk-http-event-hooks.patch
@@ -1,7 +1,7 @@
 From 5574ee1b3c2b12697438a6012a45689ba5f812a3 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Sat, 11 May 2024 15:12:54 +0800
-Subject: [PATCH 14/16] restore ijk http event hooks
+Subject: [PATCH 14] restore ijk http event hooks
 
 ---
  libavformat/http.c | 35 +++++++++++++++++++++++++--
diff --git a/patches/ffmpeg-release-5.1/0015-restore-ijk-dns-cache.patch b/patches/ffmpeg-release-5.1/0015-restore-ijk-dns-cache.patch
@@ -1,7 +1,7 @@
 From 5ce4f79fc1860da59233d6a1b6ff7e563d244466 Mon Sep 17 00:00:00 2001
 From: qianlongxu <qianlongxu@gmail.com>
 Date: Tue, 23 Jan 2024 15:45:28 +0800
-Subject: [PATCH 15/16] restore ijk dns cache
+Subject: [PATCH 15] restore ijk dns cache
 
 ---
  libavformat/hls.c     |  46 +++++-
diff --git a/patches/ffmpeg-release-5.1/0016-Adds-DVD-protocol-https-ffmpeg.org-piper.patch b/patches/ffmpeg-release-5.1/0016-Adds-DVD-protocol-https-ffmpeg.org-piper.patch
diff --git a/patches/ffmpeg-release-5.1/0017-URLProtocol-add-url_parse_priv-function-pointer.patch b/patches/ffmpeg-release-5.1/0017-URLProtocol-add-url_parse_priv-function-pointer.patch
diff --git a/patches/ffmpeg-release-5.1/0018-bluray-open-and-find-the-right-m2ts-then-read-seek-i.patch b/patches/ffmpeg-release-5.1/0018-bluray-open-and-find-the-right-m2ts-then-read-seek-i.patch
