update ijk to FFMPEG 4.0

windyer39 · Nov 27, 2020 · a1abe4a · a1abe4a
1 parent 6bd68b5
commit a1abe4a
Show file tree

Hide file tree

Showing 34 changed files with 39 additions and 20 deletions.
diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java
@@ -91,14 +91,28 @@ protected void onCreate(Bundle savedInstanceState) {
 
         //GSYVideoManager.instance().setTimeOut(4000, true);
 
-//        VideoOptionModel videoOptionModel =
-//                new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_clear", 1);
-//        List<VideoOptionModel> list = new ArrayList<>();
-//        list.add(videoOptionModel);
-//        VideoOptionModel videoOptionModel2 = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_timeout", -1);
-//        list.add(videoOptionModel2);
-//        GSYVideoManager.instance().setOptionModelList(list);
 
+        /***************rtsp 配置****************/
+        /*VideoOptionModel videoOptionModel =
+                new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_clear", 1);
+        List<VideoOptionModel> list = new ArrayList<>();
+        list.add(videoOptionModel);
+        VideoOptionModel videoOptionModel2 = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_timeout", -1);
+        VideoOptionModel videoOptionModel3 = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "rtsp_transport", "tcp");
+        VideoOptionModel videoOptionModel4 = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "rtsp_flags", "prefer_tcp");
+        VideoOptionModel videoOptionMode04 = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "packet-buffering", 0);//是否开启缓冲
+        VideoOptionModel videoOptionMode14 = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "infbuf", 1);//是否限制输入缓存数
+        VideoOptionModel videoOptionMode15 = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "fflags", "nobuffer");
+        VideoOptionModel videoOptionMode17 = new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "analyzedmaxduration", 100);//分析码流时长:默认1024*1000
+        list.add(videoOptionModel2);
+        list.add(videoOptionModel3);
+        list.add(videoOptionModel4);
+        list.add(videoOptionMode04);
+        list.add(videoOptionMode14);
+        list.add(videoOptionMode15);
+        list.add(videoOptionMode17);
+        GSYVideoManager.instance().setOptionModelList(list);*/
+        /***************rtsp 配置****************/
 
         /// ijk rtmp
        /*VideoOptionModel videoOptionModel =
@@ -326,16 +340,17 @@ private String getUrl() {
         //String url = "http://yongtaizx.xyz/20191230/t2Axgh3k/index.m3u8";
         //String url = "http://123.56.109.212:8035/users/bfe52074fba74247853caa764b522731/films/orig/aa4c3451-0468-452a-a189-bd064a1963e5-鹿鼎记下.mp4";
         //String url = "http://static.hnyequ.cn/yequ_iOS/4940735da1227890e6a261937223e0d2_828x1472.mp4";
-        String url = "http://39.104.119.42/elevator-1.0/api/downFile?path=demo.ogv";
+        //String url = "http://39.104.119.42/elevator-1.0/api/downFile?path=demo.ogv";
         //String url = "http://pointshow.oss-cn-hangzhou.aliyuncs.com/transcode/ORIGINAL/Mnbc61586842828593.mp4";
         //ssl error
-        //String url =  "https://file.shftz.cn:8443/filesystem/download/10/2019/3/26/ce2c7c66-e9eb-42be-adf6-f9008385ea8c.mov/play";
+        String url =  "https://file.shftz.cn:8443/filesystem/download/10/2019/3/26/ce2c7c66-e9eb-42be-adf6-f9008385ea8c.mov/play";
         //String url =  "https://us-4.wl-cdn.com/hls/20200225/fde4f8ef394731f38d68fe6d601cfd56/index.m3u8";
         //String url =  "https://cdn61.ytbbs.tv/cn/tv/55550/55550-1/play.m3u8?md5=v4sI4lWlo4XojzeAjgBGaQ&expires=1521204012&token=55550";
         //String url =  "http://1253492636.vod2.myqcloud.com/2e5fc148vodgzp1253492636/d08af82d4564972819086152830/plHZZoSkje0A.mp4";
 
         //String url = "rtsp://ajj:12345678@218.21.217.122:65523/h264/ch40/sub/av_stream";
-        //String url = "rtsp://ajj:ajj12345678@218.21.217.122:65522/h264/ch15/sub/av_stream";//String url =  "rtsp://cloud.easydarwin.org:554/stream0.sdp";
+        //String url = "rtsp://ajj:ajj12345678@218.21.217.122:65522/h264/ch15/sub/av_stream";
+        //String url = "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov";
         //String url = "http://s.swao.cn/o_1c4gm8o1nniu1had13bk1t0l1rq64m.mov";
         //String url = "http://api.ciguang.tv/avideo/play?num=02-041-0491&type=flv&v=1&client=android";
         //String url = "http://video.7k.cn/app_video/20171213/276d8195/v.m3u8.mp4";

diff --git a/gsyVideoPlayer-armv5/libs/armeabi/libijkffmpeg.so b/gsyVideoPlayer-armv5/libs/armeabi/libijkffmpeg.so
diff --git a/gsyVideoPlayer-armv5/libs/armeabi/libijkplayer.so b/gsyVideoPlayer-armv5/libs/armeabi/libijkplayer.so
diff --git a/gsyVideoPlayer-armv5/libs/armeabi/libijksdl.so b/gsyVideoPlayer-armv5/libs/armeabi/libijksdl.so
diff --git a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkffmpeg.so b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkffmpeg.so
diff --git a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkplayer.so b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkplayer.so
diff --git a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijksdl.so b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijksdl.so
diff --git a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkffmpeg.so b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkffmpeg.so
diff --git a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkplayer.so b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkplayer.so
diff --git a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijksdl.so b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijksdl.so
diff --git a/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijksdl.so b/gsyVideoPlayer-ex_so/libs/arm64-v8a/libijksdl.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijksdl.so b/gsyVideoPlayer-ex_so/libs/armeabi-v7a/libijksdl.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/armeabi/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/armeabi/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/armeabi/libijksdl.so b/gsyVideoPlayer-ex_so/libs/armeabi/libijksdl.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/x86/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/x86/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86/libijksdl.so b/gsyVideoPlayer-ex_so/libs/x86/libijksdl.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86_64/libijkffmpeg.so b/gsyVideoPlayer-ex_so/libs/x86_64/libijkffmpeg.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86_64/libijkplayer.so b/gsyVideoPlayer-ex_so/libs/x86_64/libijkplayer.so
diff --git a/gsyVideoPlayer-ex_so/libs/x86_64/libijksdl.so b/gsyVideoPlayer-ex_so/libs/x86_64/libijksdl.so
diff --git a/gsyVideoPlayer-x86/libs/x86/libijkffmpeg.so b/gsyVideoPlayer-x86/libs/x86/libijkffmpeg.so
diff --git a/gsyVideoPlayer-x86/libs/x86/libijkplayer.so b/gsyVideoPlayer-x86/libs/x86/libijkplayer.so
diff --git a/gsyVideoPlayer-x86/libs/x86/libijksdl.so b/gsyVideoPlayer-x86/libs/x86/libijksdl.so
diff --git a/gsyVideoPlayer-x86_64/libs/x86_64/libijkffmpeg.so b/gsyVideoPlayer-x86_64/libs/x86_64/libijkffmpeg.so
diff --git a/gsyVideoPlayer-x86_64/libs/x86_64/libijkplayer.so b/gsyVideoPlayer-x86_64/libs/x86_64/libijkplayer.so
diff --git a/gsyVideoPlayer-x86_64/libs/x86_64/libijksdl.so b/gsyVideoPlayer-x86_64/libs/x86_64/libijksdl.so
diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle
@@ -44,17 +44,17 @@ dependencies {
     //api project(':gsyVideoPlayer-x86_64')
 
     //更多配置版so，增加了concat,rtsp,mpeg，crypto
-    //api project(':gsyVideoPlayer-ex_so')
+    api project(':gsyVideoPlayer-ex_so')
 
     //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion"
 
     //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
     api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion"
-    api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"
-    api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"
-    api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion"
-    api "com.shuyu:gsyVideoPlayer-x64:$gsyVideoVersion"
-    api "com.shuyu:gsyVideoPlayer-x86:$gsyVideoVersion"
+    //api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"
+    //api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"
+    //api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion"
+    //api "com.shuyu:gsyVideoPlayer-x64:$gsyVideoVersion"
+    //api "com.shuyu:gsyVideoPlayer-x86:$gsyVideoVersion"
 
     //更多配置版so，增加了concat,rtsp,mpeg，crypto
     //api "com.shuyu:gsyVideoPlayer-ex_so:$gsyVideoVersion"

diff --git a/module-lite-more.sh b/module-lite-more.sh
@@ -23,7 +23,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-programs"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffmpeg"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffplay"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffprobe"
-export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffserver"
+#export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffserver"
 
 # Documentation options:
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-doc"
@@ -58,7 +58,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-network"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-d3d11va"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-dxva2"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vaapi"
-export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vda"
+#export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vda"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vdpau"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-videotoolbox"
 
@@ -84,6 +84,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=h263i"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=h263p"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=mpeg4"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=mjpeg"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=ijk*"
 
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-hwaccels"
 
@@ -141,6 +142,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=noise"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=remove_extradata"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=text2movsub"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=vp9_superframe"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=eac3_core"
 
 # ./configure --list-protocols
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-protocols"

diff --git a/module-lite.sh b/module-lite.sh
@@ -23,7 +23,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-programs"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffmpeg"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffplay"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffprobe"
-export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffserver"
+#export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-ffserver"
 
 # Documentation options:
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-doc"
@@ -58,7 +58,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-network"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-d3d11va"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-dxva2"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vaapi"
-export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vda"
+#export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vda"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-vdpau"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-videotoolbox"
 
@@ -79,6 +79,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=flac"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=hevc"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=vp8"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-decoder=vp9"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-demuxer=ijk*"
 
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-hwaccels"
 
@@ -127,6 +128,7 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=noise"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=remove_extradata"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=text2movsub"
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=vp9_superframe"
+export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bsf=eac3_core"
 
 # ./configure --list-protocols
 export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-protocols"