normal 0.8.8 ijkplayer

Astorli · Feb 23, 2018 · 14b906b · 14b906b
1 parent 955c95f
commit 14b906b
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 10 deletions.
diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java
@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //String url = "http://7xjmzj.com1.z0.glb.clouddn.com/20171026175005_JObCxCE2.mp4";
 
         //String url =  "http://video.7k.cn/app_video/20171202/6c8cf3ea/v.m3u8.mp4";
-        String url =  "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8";
+        //String url =  "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8";
         //String url =  "rtsp://cloud.easydarwin.org:554/stream0.sdp";
         //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";
@@ -71,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //String url = "http://vr.tudou.com/v2proxy/v?sid=95001&id=496378919&st=3&pw=";
         //String url = "http://pl-ali.youku.com/playlist/m3u8?type=mp4&ts=1490185963&keyframe=0&vid=XMjYxOTQ1Mzg2MA==&ep=ciadGkiFU8cF4SvajD8bYyuwJiYHXJZ3rHbN%2FrYDAcZuH%2BrC6DPcqJ21TPs%3D&sid=04901859548541247bba8&token=0524&ctype=12&ev=1&oip=976319194";
         //String url = "http://hls.ciguang.tv/hdtv/video.m3u8";
-        //String url = "https://res.exexm.com/cw_145225549855002";
+        String url = "https://res.exexm.com/cw_145225549855002";
         //String url = "http://storage.gzstv.net/uploads/media/huangmeiyan/jr05-09.mp4";//mepg
 
         //detailPlayer.setUp(url, false, null, "测试视频");

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -16,7 +16,7 @@ ext {
     //ViewLibraries
     butterKnifeVersion = '8.2.1'
 
-    ijkplayer = '0.8.4'
+    ijkplayer = '0.8.8'
     DanmakuFlameMaster = '0.6.4'
 
     transitionseverywhere = '1.7.0'

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-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
@@ -31,17 +31,17 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    //api project(':gsyVideoPlayer-java')
-    //api project(':gsyVideoPlayer-armv5')
-    //api project(':gsyVideoPlayer-armv7a')
-    //api project(':gsyVideoPlayer-armv64')
-    //api project(':gsyVideoPlayer-x86')
-    //api project(':gsyVideoPlayer-x86_64')
+    api project(':gsyVideoPlayer-java')
+    api project(':gsyVideoPlayer-armv5')
+    api project(':gsyVideoPlayer-armv7a')
+    api project(':gsyVideoPlayer-armv64')
+    api project(':gsyVideoPlayer-x86')
+    api project(':gsyVideoPlayer-x86_64')
 
     //更多配置版so，增加了concat,rtsp,mpeg，crypto
     //api project(':gsyVideoPlayer-ex_so')
 
-    api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion"
+    //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion"
 
     //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
     //api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"