update demo bugs

jianjunxiao · Aug 3, 2017 · 87904d3 · 87904d3
1 parent 72f3819
commit 87904d3
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 18 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ allprojects {
 }
 
 dependencies {
-    compile 'com.github.xiaoyanger0825:NiceVieoPlayer:v1.9'
+    compile 'com.github.xiaoyanger0825:NiceVieoPlayer:v2.0'
 }
 ```
 **在对应视频界面所在的Activity的Manifest.xml中需要添加如下配置：**

diff --git a/config.gradle b/config.gradle
@@ -5,8 +5,8 @@ ext {
             buildToolsVersion: "25.0.2",
             minSdkVersion    : 16,
             targetSdkVersion : 25,
-            versionCode      : 19,
-            versionName      : "1.9"
+            versionCode      : 20,
+            versionName      : "2.0"
     ]
 
     dependVersion = [

diff --git a/nicevideoplayer/build.gradle b/nicevideoplayer/build.gradle
@@ -12,7 +12,9 @@ android {
         versionName rootProject.ext.android.versionName
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
+        ndk {
+            abiFilters 'armeabi', 'armeabi-v7a', 'x86'
+        }
     }
 
     buildTypes {
@@ -22,6 +24,12 @@ android {
         }
     }
 
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
+
     lintOptions {
         abortOnError false
     }
@@ -38,15 +46,15 @@ dependencies {
     compile rootProject.ext.dependencies.appcompatV7
     compile rootProject.ext.dependencies.junit
     //  required, enough for most devices.
-    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.0'
-    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.0'
-    //  Other ABIs: optional
-    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.8.0'
-    //  compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.0'
-    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.0'
-    //  compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.0'
-    //  ExoPlayer as IMediaPlayer: optional, experimental
-    //  compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.1'
+//    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.1'
+//    Other ABIs: optional
+//    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.8.1'
+//    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.1'
+//    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.1'
+//    compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.1'
+//    ExoPlayer as IMediaPlayer: optional, experimental
+//    compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.1'
 }
 
 //apply plugin: 'com.github.dcendents.android-maven'

diff --git a/nicevideoplayer/libs/arm64-v8a/libijkffmpeg.so b/nicevideoplayer/libs/arm64-v8a/libijkffmpeg.so
diff --git a/nicevideoplayer/libs/arm64-v8a/libijkplayer.so b/nicevideoplayer/libs/arm64-v8a/libijkplayer.so
diff --git a/nicevideoplayer/libs/arm64-v8a/libijksdl.so b/nicevideoplayer/libs/arm64-v8a/libijksdl.so
diff --git a/nicevideoplayer/libs/armeabi-v7a/libijkffmpeg.so b/nicevideoplayer/libs/armeabi-v7a/libijkffmpeg.so
diff --git a/nicevideoplayer/libs/armeabi-v7a/libijkplayer.so b/nicevideoplayer/libs/armeabi-v7a/libijkplayer.so
diff --git a/nicevideoplayer/libs/armeabi-v7a/libijksdl.so b/nicevideoplayer/libs/armeabi-v7a/libijksdl.so
diff --git a/nicevideoplayer/libs/armeabi/libijkffmpeg.so b/nicevideoplayer/libs/armeabi/libijkffmpeg.so
diff --git a/nicevideoplayer/libs/armeabi/libijkplayer.so b/nicevideoplayer/libs/armeabi/libijkplayer.so
diff --git a/nicevideoplayer/libs/armeabi/libijksdl.so b/nicevideoplayer/libs/armeabi/libijksdl.so
diff --git a/nicevideoplayer/libs/x86/libijkffmpeg.so b/nicevideoplayer/libs/x86/libijkffmpeg.so
diff --git a/nicevideoplayer/libs/x86/libijkplayer.so b/nicevideoplayer/libs/x86/libijkplayer.so
diff --git a/nicevideoplayer/libs/x86/libijksdl.so b/nicevideoplayer/libs/x86/libijksdl.so
diff --git a/nicevideoplayer/libs/x86_64/libijkffmpeg.so b/nicevideoplayer/libs/x86_64/libijkffmpeg.so
diff --git a/nicevideoplayer/libs/x86_64/libijkplayer.so b/nicevideoplayer/libs/x86_64/libijkplayer.so
diff --git a/nicevideoplayer/libs/x86_64/libijksdl.so b/nicevideoplayer/libs/x86_64/libijksdl.so
diff --git a/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/NiceVideoPlayer.java b/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/NiceVideoPlayer.java
@@ -477,10 +477,13 @@ public void onCompletion(IMediaPlayer mp) {
             = new IMediaPlayer.OnErrorListener() {
         @Override
         public boolean onError(IMediaPlayer mp, int what, int extra) {
-            mCurrentState = STATE_ERROR;
-            mController.onPlayStateChanged(mCurrentState);
-            LogUtil.d("onError ——> STATE_ERROR ———— what：" + what);
-            return false;
+            // 直播流播放时去调用mediaPlayer.getDuration会导致-38和-2147483648错误，忽略该错误
+            if (what != -38 && what != -2147483648 && extra != -38 && extra != -2147483648) {
+                mCurrentState = STATE_ERROR;
+                mController.onPlayStateChanged(mCurrentState);
+                LogUtil.d("onError ——> STATE_ERROR ———— what：" + what + ", extra: " + extra);
+            }
+            return true;
         }
     };
 
@@ -521,6 +524,8 @@ public boolean onInfo(IMediaPlayer mp, int what, int extra) {
                     mTextureView.setRotation(extra);
                     LogUtil.d("视频旋转角度：" + extra);
                 }
+            } else if (what == IMediaPlayer.MEDIA_INFO_NOT_SEEKABLE) {
+                LogUtil.d("视频不能seekTo，为直播视频");
             } else {
                 LogUtil.d("onInfo ——> what：" + what);
             }