feat(ffmpeg): enable dash demuxer

Signed-off-by: pingkai <[email protected]>
alibaba · May 20, 2020 · 9a7c5a6 · 9a7c5a6
1 parent 0df4fdf
commit 9a7c5a6
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 0 deletions.
diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt
@@ -64,6 +64,7 @@ target_link_libraries(cicadaPlayer PRIVATE
         avcodec
         swresample
         avutil
+        xml2
         curl
         ${FRAMEWORK_LIBS})
 if (ENABLE_SDL)

diff --git a/cmdline/example/CMakeLists.txt b/cmdline/example/CMakeLists.txt
@@ -55,6 +55,7 @@ target_link_libraries(syncPlayer PRIVATE
         avcodec
         swresample
         avutil
+        xml2
         curl
         ${FRAMEWORK_LIBS})
 if (ENABLE_SDL)

diff --git a/external/build_external.sh b/external/build_external.sh
@@ -25,6 +25,7 @@ function patch_ffmpeg() {
     git_am_patch ../../contribute/ffmpeg/0006-flv-add-extensions-for-H.265-HEVC.patch
     git_am_patch ../../contribute/ffmpeg/0007-build-libavformat-compile-avc.c-and-hevc.c-default.patch
     git_am_patch ../../contribute/ffmpeg/0008-avformat-flvdec-add-aliyun-extend-auio-codec-id.patch
+    git_am_patch ../../contribute/ffmpeg/0009-chore-configure-xml2-use-check-lib.patch
 }
 
 function git_apply_patch() {

diff --git a/external/contribute/ffmpeg/0009-chore-configure-xml2-use-check-lib.patch b/external/contribute/ffmpeg/0009-chore-configure-xml2-use-check-lib.patch
@@ -0,0 +1,27 @@
+From 58290af15a04984899b977e3bbffd84041e2ad11 Mon Sep 17 00:00:00 2001
+From: pingkai <[email protected]>
+Date: Wed, 20 May 2020 10:49:15 +0800
+Subject: [PATCH 9/9] chore(configure): xml2 use check lib
+
+Signed-off-by: pingkai <[email protected]>
+---
+ configure | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index d01c86d3fe..099f09de55 100755
+--- a/configure
++++ b/configure
+@@ -6318,7 +6318,8 @@ enabled libzmq            && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new
+ enabled libzvbi           && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new &&
+                              { test_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" ||
+                                enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; }
+-enabled libxml2           && require_pkg_config libxml2 libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion
++enabled libxml2           && { check_lib xml2 libxml/xmlversion.h xmlCheckVersion -lxml2 -lm||
++                               die "ERROR: libxml2 not found";}
+ enabled mbedtls           && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt.h mbedtls_x509_crt_init ||
+                                check_pkg_config mbedtls mbedtls mbedtls/ssl.h mbedtls_ssl_init ||
+                                check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto ||
+-- 
+2.26.0
+
diff --git a/external/player_ffmpeg_config.sh b/external/player_ffmpeg_config.sh
@@ -20,6 +20,10 @@ ffmpeg_config_add_bsfs aac_adtstoasc h264_mp4toannexb hevc_mp4toannexb extract_e
 ffmpeg_config_add_protocols file crypto rtmp
 ffmpeg_config_add_filters atempo aresample aformat volume
 
+
+ffmpeg_config_add_user "--enable-libxml2"
+ffmpeg_config_add_demuxers dash
+
 #for ffmpeg concat demuxer
 ffmpeg_config_add_demuxers concat
 

diff --git a/external/player_git_source_list.sh b/external/player_git_source_list.sh
@@ -37,6 +37,12 @@ fi
 CURL_BRANCH="curl-7_63_0"
 clone_git $CURL_GIT "$CURL_BRANCH"
 
+if [[ -z "${LIBXML2_GIT}" ]];then
+    LIBXML2_GIT="https://github.com/GNOME/libxml2.git"
+fi
+LIBXML2_BRANCH="v2.9.9"
+clone_git ${LIBXML2_GIT} "$LIBXML2_BRANCH"
+
 if [[ -z "${DAV1D_EXTERNAL_DIR}" ]];then
     if [[ -n "${DAV1D_SOURCE_DIR}" ]];then
         echo "check out dav1d"

diff --git a/external/user_env.sh b/external/user_env.sh
@@ -7,11 +7,13 @@ FDK_AAC_SOURCE_DIR=$TOP_DIR/external/fdk-aac/
 X264_SOURCE_DIR=$TOP_DIR/external/x264/
 OPEN_SSL_SOURCE_DIR=$TOP_DIR/external/openssl/
 CURL_SOURCE_DIR=$TOP_DIR/external/curl
+LIBXML2_SOURCE_DIR=$TOP_DIR/external/libxml2
 #DAV1D_SOURCE_DIR=$TOP_DIR/external/dav1d
 #ARES_SOURCE_DIR=$TOP_DIR/external/cares
 #RTMPDUMP_SOURCE_DIR=$TOP_DIR/external/rtmpdump/
 #ANDROID_NDK=$ANDROID_NDK_HOME
 export LIB_NAME=alivcffmpeg
 OPENSSL_VERSION_111="True"
 SSL_USE_NATIVE="TRUE"
+XML_USE_NATIVE="TRUE"
 
diff --git a/framework/tests/communication/CMakeLists.txt b/framework/tests/communication/CMakeLists.txt
@@ -18,6 +18,7 @@ target_link_libraries(communicationTest PRIVATE
         avformat
         avcodec
         avutil
+        xml2
         )
 target_include_directories(communicationTest PRIVATE
         ../../

diff --git a/framework/tests/dataSource/CMakeLists.txt b/framework/tests/dataSource/CMakeLists.txt
@@ -39,6 +39,7 @@ target_link_libraries(dataSourceTest PRIVATE
         swresample
         avutil
         swscale
+        xml2
         z
         curl
         gtest_main)

diff --git a/framework/tests/decoder/CMakeLists.txt b/framework/tests/decoder/CMakeLists.txt
@@ -36,6 +36,7 @@ target_link_libraries(
         swresample
         avutil
         swscale
+        xml2
         z
         curl
         gtest_main

diff --git a/framework/tests/demuxer/CMakeLists.txt b/framework/tests/demuxer/CMakeLists.txt
@@ -39,6 +39,7 @@ target_link_libraries(
         swresample
         avutil
         swscale
+        xml2
         z
         curl
         gtest_main)

diff --git a/framework/tests/render/CMakeLists.txt b/framework/tests/render/CMakeLists.txt
@@ -38,6 +38,7 @@ target_link_libraries(renderTest PRIVATE
         swresample
         avutil
         swscale
+        xml2
         z
         curl
         ssl

diff --git a/mediaPlayer/tests/apiTest/CMakeLists.txt b/mediaPlayer/tests/apiTest/CMakeLists.txt
@@ -40,6 +40,7 @@ target_link_libraries(mediaPlayerApiTest PRIVATE
         avcodec
         swresample
         avutil
+        xml2
         curl
         ${FRAMEWORK_LIBS}
         gtest_main)

diff --git a/mediaPlayer/tests/cache/CMakeLists.txt b/mediaPlayer/tests/cache/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries(mediaPlayerCacheTest PRIVATE
         avcodec
         swresample
         avutil
+        xml2
         curl
         ${FRAMEWORK_LIBS}
         gtest_main)

diff --git a/mediaPlayer/tests/formatTest/CMakeLists.txt b/mediaPlayer/tests/formatTest/CMakeLists.txt
@@ -40,6 +40,7 @@ target_link_libraries(mediaPlayerFormatTest PRIVATE
         avcodec
         swresample
         avutil
+        xml2
         curl
         ${FRAMEWORK_LIBS}
         gtest_main)

diff --git a/mediaPlayer/tests/seekTest/CMakeLists.txt b/mediaPlayer/tests/seekTest/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries(mediaPlayerSeekTest PRIVATE
         avcodec
         swresample
         avutil
+        xml2
         curl
         ${FRAMEWORK_LIBS}
         gtest_main)

diff --git a/mediaPlayer/tests/switch_stream/CMakeLists.txt b/mediaPlayer/tests/switch_stream/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries(mediaPlayerSwitchStreamTest PRIVATE
         avcodec
         swresample
         avutil
+        xml2
         curl
         ${FRAMEWORK_LIBS}
         gtest_main)
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,6 +64,7 @@ target_link_libraries(cicadaPlayer PRIVATE @@
             avcodec
             swresample
             avutil
+            xml2
             curl
             ${FRAMEWORK_LIBS})
     if (ENABLE_SDL)
@@ Expand Down @@