diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java index 04372b188..2790fb07a 100644 --- 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 index 40bb7a27c..8d2c68174 100644 --- 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 index 8b083de91..dda2749fe 100644 Binary files a/gsyVideoPlayer-armv5/libs/armeabi/libijkffmpeg.so and b/gsyVideoPlayer-armv5/libs/armeabi/libijkffmpeg.so differ diff --git a/gsyVideoPlayer-armv5/libs/armeabi/libijkplayer.so b/gsyVideoPlayer-armv5/libs/armeabi/libijkplayer.so index a9a9238ce..edab14198 100644 Binary files a/gsyVideoPlayer-armv5/libs/armeabi/libijkplayer.so and b/gsyVideoPlayer-armv5/libs/armeabi/libijkplayer.so differ diff --git a/gsyVideoPlayer-armv5/libs/armeabi/libijksdl.so b/gsyVideoPlayer-armv5/libs/armeabi/libijksdl.so index 5d50b7a19..a3f42f0dc 100644 Binary files a/gsyVideoPlayer-armv5/libs/armeabi/libijksdl.so and b/gsyVideoPlayer-armv5/libs/armeabi/libijksdl.so differ diff --git a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkffmpeg.so b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkffmpeg.so index dab860ccc..252f22e6e 100644 Binary files a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkffmpeg.so and b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkffmpeg.so differ diff --git a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkplayer.so b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkplayer.so index 7aa021146..c8e31c075 100644 Binary files a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkplayer.so and b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijkplayer.so differ diff --git a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijksdl.so b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijksdl.so index 169c34296..7dcb3128f 100644 Binary files a/gsyVideoPlayer-armv64/libs/arm64-v8a/libijksdl.so and b/gsyVideoPlayer-armv64/libs/arm64-v8a/libijksdl.so differ diff --git a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkffmpeg.so b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkffmpeg.so index 5ceac8396..7a5a88ec1 100644 Binary files a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkffmpeg.so and b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkffmpeg.so differ diff --git a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkplayer.so b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkplayer.so index c0bd76b20..2d1cd7394 100644 Binary files a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkplayer.so and b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijkplayer.so differ diff --git a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijksdl.so b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijksdl.so index 2ff4abe3b..07c783640 100644 Binary files a/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijksdl.so and b/gsyVideoPlayer-armv7a/libs/armeabi-v7a/libijksdl.so differ diff --git a/gsyVideoPlayer-x86/libs/x86/libijkffmpeg.so b/gsyVideoPlayer-x86/libs/x86/libijkffmpeg.so index cb4c97b4e..bf3f58403 100644 Binary files a/gsyVideoPlayer-x86/libs/x86/libijkffmpeg.so and b/gsyVideoPlayer-x86/libs/x86/libijkffmpeg.so differ diff --git a/gsyVideoPlayer-x86/libs/x86/libijkplayer.so b/gsyVideoPlayer-x86/libs/x86/libijkplayer.so index 2a9715b82..ad82d8256 100644 Binary files a/gsyVideoPlayer-x86/libs/x86/libijkplayer.so and b/gsyVideoPlayer-x86/libs/x86/libijkplayer.so differ diff --git a/gsyVideoPlayer-x86/libs/x86/libijksdl.so b/gsyVideoPlayer-x86/libs/x86/libijksdl.so index c5d7b226a..d62316ae3 100644 Binary files a/gsyVideoPlayer-x86/libs/x86/libijksdl.so and b/gsyVideoPlayer-x86/libs/x86/libijksdl.so differ diff --git a/gsyVideoPlayer-x86_64/libs/x86_64/libijkffmpeg.so b/gsyVideoPlayer-x86_64/libs/x86_64/libijkffmpeg.so index 611cc5555..38f693370 100644 Binary files a/gsyVideoPlayer-x86_64/libs/x86_64/libijkffmpeg.so and b/gsyVideoPlayer-x86_64/libs/x86_64/libijkffmpeg.so differ diff --git a/gsyVideoPlayer-x86_64/libs/x86_64/libijkplayer.so b/gsyVideoPlayer-x86_64/libs/x86_64/libijkplayer.so index 41d6575a1..6f92334bf 100644 Binary files a/gsyVideoPlayer-x86_64/libs/x86_64/libijkplayer.so and b/gsyVideoPlayer-x86_64/libs/x86_64/libijkplayer.so differ diff --git a/gsyVideoPlayer-x86_64/libs/x86_64/libijksdl.so b/gsyVideoPlayer-x86_64/libs/x86_64/libijksdl.so index 40d6040ed..51f377c72 100644 Binary files a/gsyVideoPlayer-x86_64/libs/x86_64/libijksdl.so and b/gsyVideoPlayer-x86_64/libs/x86_64/libijksdl.so differ diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle index 7568b8fbd..57687627f 100644 --- 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"