fix some bugs

jianjunxiao · Sep 19, 2017 · 883d8dd · 883d8dd
1 parent c70d273
commit 883d8dd
Show file tree

Hide file tree

Showing 23 changed files with 254 additions and 18 deletions.
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/dictionaries/PC.xml b/.idea/dictionaries/PC.xml
diff --git a/app/src/main/java/com/xiao/nicevieoplayer/example/TinyWindowPlayActivity.java b/app/src/main/java/com/xiao/nicevieoplayer/example/TinyWindowPlayActivity.java
@@ -1,6 +1,7 @@
 package com.xiao.nicevieoplayer.example;
 
 import android.os.Bundle;
+import android.os.Environment;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
@@ -24,8 +25,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private void init() {
         mNiceVideoPlayer = (NiceVideoPlayer) findViewById(R.id.nice_video_player);
-        mNiceVideoPlayer.setPlayerType(NiceVideoPlayer.TYPE_IJK); // IjkPlayer or MediaPlayer
-        mNiceVideoPlayer.setUp("http://tanzi27niu.cdsb.mobi/wps/wp-content/uploads/2017/05/2017-05-17_17-33-30.mp4", null);
+        mNiceVideoPlayer.setPlayerType(NiceVideoPlayer.TYPE_NATIVE); // IjkPlayer or MediaPlayer
+        String videoUrl = Environment.getExternalStorageDirectory().getPath().concat("/办公室小野.mp4");
+        mNiceVideoPlayer.setUp(videoUrl, null);
         TxVideoPlayerController controller = new TxVideoPlayerController(this);
         controller.setTitle("办公室小野开番外了，居然在办公室开澡堂！老板还点赞？");
         controller.setLenght(98000);

diff --git a/config.gradle b/config.gradle
@@ -5,8 +5,8 @@ ext {
             buildToolsVersion: "25.0.2",
             minSdkVersion    : 16,
             targetSdkVersion : 25,
-            versionCode      : 21,
-            versionName      : "2.1"
+            versionCode      : 22,
+            versionName      : "2.2"
     ]
 
     dependVersion = [

diff --git a/nicevideoplayer/build.gradle b/nicevideoplayer/build.gradle
@@ -12,6 +12,7 @@ android {
         versionName rootProject.ext.android.versionName
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
         ndk {
             abiFilters 'armeabi', 'armeabi-v7a', 'x86'
         }
@@ -45,16 +46,13 @@ 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.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'
+    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.3'
+    compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.3'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.3'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.8.3'
+//    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.3'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.3'
+//    compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.3'
 }
 
 //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/INiceVideoPlayer.java b/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/INiceVideoPlayer.java
@@ -80,7 +80,7 @@ public interface INiceVideoPlayer {
     boolean isCompleted();
 
     /*********************************
-     * 以下93个方法是播放器的模式
+     * 以下3个方法是播放器的模式
      **********************************/
     boolean isFullScreen();
     boolean isTinyWindow();

diff --git a/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/NiceVideoPlayer.java b/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/NiceVideoPlayer.java
@@ -360,6 +360,11 @@ private void initMediaPlayer() {
                 case TYPE_IJK:
                 default:
                     mMediaPlayer = new IjkMediaPlayer();
+                    ((IjkMediaPlayer)mMediaPlayer).setOption(1, "analyzemaxduration", 100L);
+                    ((IjkMediaPlayer)mMediaPlayer).setOption(1, "probesize", 10240L);
+                    ((IjkMediaPlayer)mMediaPlayer).setOption(1, "flush_packets", 1L);
+                    ((IjkMediaPlayer)mMediaPlayer).setOption(4, "packet-buffering", 0L);
+                    ((IjkMediaPlayer)mMediaPlayer).setOption(4, "framedrop", 1L);
                     break;
             }
             mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
@@ -393,7 +398,7 @@ public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width,
     }
 
     private void openMediaPlayer() {
-        // 屏幕常量
+        // 屏幕常亮
         mContainer.setKeepScreenOn(true);
         // 设置监听
         mMediaPlayer.setOnPreparedListener(mOnPreparedListener);
@@ -468,7 +473,7 @@ public void onCompletion(IMediaPlayer mp) {
             mCurrentState = STATE_COMPLETED;
             mController.onPlayStateChanged(mCurrentState);
             LogUtil.d("onCompletion ——> STATE_COMPLETED");
-            // 清除屏幕常量
+            // 清除屏幕常亮
             mContainer.setKeepScreenOn(false);
         }
     };

diff --git a/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/NiceVideoPlayerController.java b/nicevideoplayer/src/main/java/com/xiao/nicevideoplayer/NiceVideoPlayerController.java
@@ -127,7 +127,7 @@ public void run() {
                 }
             };
         }
-        mUpdateProgressTimer.schedule(mUpdateProgressTimerTask, 0, 300);
+        mUpdateProgressTimer.schedule(mUpdateProgressTimerTask, 0, 1000);
     }
 
     /**