diff --git a/PLDroidPlayerDemo/app/build.gradle b/PLDroidPlayerDemo/app/build.gradle index 0f512e2..1eee76e 100644 --- a/PLDroidPlayerDemo/app/build.gradle +++ b/PLDroidPlayerDemo/app/build.gradle @@ -9,7 +9,7 @@ android { minSdkVersion 14 targetSdkVersion 27 versionCode 12 - versionName "2.1.6" + versionName "2.1.7" buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L" } buildTypes { @@ -27,10 +27,13 @@ android { } dependencies { - implementation files('libs/pldroid-player-2.1.6.jar') + implementation files('libs/pldroid-player-2.1.7.jar') implementation 'com.android.support:appcompat-v7:27.1.0' implementation 'com.android.support:recyclerview-v7:27.1.0' implementation 'com.journeyapps:zxing-android-embedded:3.0.2@aar' implementation 'com.google.zxing:core:3.2.0' implementation 'com.bugsnag:bugsnag-android-ndk:1.1.2' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.4' + releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.4' + testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.4' } diff --git a/PLDroidPlayerDemo/app/libs/pldroid-player-2.1.6.jar b/PLDroidPlayerDemo/app/libs/pldroid-player-2.1.6.jar deleted file mode 100644 index 9d40208..0000000 Binary files a/PLDroidPlayerDemo/app/libs/pldroid-player-2.1.6.jar and /dev/null differ diff --git a/PLDroidPlayerDemo/app/libs/pldroid-player-2.1.7.jar b/PLDroidPlayerDemo/app/libs/pldroid-player-2.1.7.jar new file mode 100644 index 0000000..bc317ac Binary files /dev/null and b/PLDroidPlayerDemo/app/libs/pldroid-player-2.1.7.jar differ diff --git a/PLDroidPlayerDemo/app/src/main/java/com/pili/pldroid/playerdemo/PLVideoViewActivity.java b/PLDroidPlayerDemo/app/src/main/java/com/pili/pldroid/playerdemo/PLVideoViewActivity.java index 517dee0..cec9c26 100644 --- a/PLDroidPlayerDemo/app/src/main/java/com/pili/pldroid/playerdemo/PLVideoViewActivity.java +++ b/PLDroidPlayerDemo/app/src/main/java/com/pili/pldroid/playerdemo/PLVideoViewActivity.java @@ -62,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) { options.setInteger(AVOptions.KEY_MEDIACODEC, codec); options.setInteger(AVOptions.KEY_LIVE_STREAMING, mIsLiveStreaming ? 1 : 0); boolean disableLog = getIntent().getBooleanExtra("disable-log", false); -// options.setString(AVOptions.KEY_DNS_SERVER, "127.0.0.1"); + // options.setString(AVOptions.KEY_DNS_SERVER, "127.0.0.1"); options.setInteger(AVOptions.KEY_LOG_LEVEL, disableLog ? 5 : 0); boolean cache = getIntent().getBooleanExtra("cache", false); if (!mIsLiveStreaming && cache) { @@ -80,6 +80,7 @@ protected void onCreate(Bundle savedInstanceState) { int startPos = getIntent().getIntExtra("start-pos", 0); options.setInteger(AVOptions.KEY_START_POSITION, startPos * 1000); } + // options.setString(AVOptions.KEY_COMP_DRM_KEY,"cWoosgRk"); mVideoView.setAVOptions(options); // Set some listeners @@ -189,6 +190,12 @@ public void onInfo(int what, int extra) { case PLOnInfoListener.MEDIA_INFO_CACHE_DOWN: Log.i(TAG, "Cache done"); break; + case PLOnInfoListener.MEDIA_INFO_STATE_CHANGED_PAUSED: + Log.i(TAG, "State paused"); + break; + case PLOnInfoListener.MEDIA_INFO_STATE_CHANGED_RELEASED: + Log.i(TAG, "State released"); + break; default: break; } @@ -318,4 +325,4 @@ public void run() { } }); } -} \ No newline at end of file +} diff --git a/PLDroidPlayerDemo/app/src/main/jniLibs/arm64-v8a/libQPlayer.so b/PLDroidPlayerDemo/app/src/main/jniLibs/arm64-v8a/libQPlayer.so index 0b3dc91..a852410 100755 Binary files a/PLDroidPlayerDemo/app/src/main/jniLibs/arm64-v8a/libQPlayer.so and b/PLDroidPlayerDemo/app/src/main/jniLibs/arm64-v8a/libQPlayer.so differ diff --git a/PLDroidPlayerDemo/app/src/main/jniLibs/arm64-v8a/libqcOpenSSL.so b/PLDroidPlayerDemo/app/src/main/jniLibs/arm64-v8a/libqcOpenSSL.so old mode 100644 new mode 100755 index 706a507..1813fbe Binary files a/PLDroidPlayerDemo/app/src/main/jniLibs/arm64-v8a/libqcOpenSSL.so and b/PLDroidPlayerDemo/app/src/main/jniLibs/arm64-v8a/libqcOpenSSL.so differ diff --git a/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi-v7a/libQPlayer.so b/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi-v7a/libQPlayer.so index 0a26762..547fa28 100755 Binary files a/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi-v7a/libQPlayer.so and b/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi-v7a/libQPlayer.so differ diff --git a/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi-v7a/libqcOpenSSL.so b/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi-v7a/libqcOpenSSL.so index 88ab3a3..a073ab6 100755 Binary files a/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi-v7a/libqcOpenSSL.so and b/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi-v7a/libqcOpenSSL.so differ diff --git a/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi/libQPlayer.so b/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi/libQPlayer.so index 0e16f03..f78f1ba 100755 Binary files a/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi/libQPlayer.so and b/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi/libQPlayer.so differ diff --git a/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi/libqcOpenSSL.so b/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi/libqcOpenSSL.so old mode 100644 new mode 100755 index 6a93a22..924a7af Binary files a/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi/libqcOpenSSL.so and b/PLDroidPlayerDemo/app/src/main/jniLibs/armeabi/libqcOpenSSL.so differ diff --git a/PLDroidPlayerDemo/app/src/main/jniLibs/x86/libQPlayer.so b/PLDroidPlayerDemo/app/src/main/jniLibs/x86/libQPlayer.so index cc247b4..cf08100 100755 Binary files a/PLDroidPlayerDemo/app/src/main/jniLibs/x86/libQPlayer.so and b/PLDroidPlayerDemo/app/src/main/jniLibs/x86/libQPlayer.so differ diff --git a/PLDroidPlayerDemo/app/src/main/jniLibs/x86/libqcOpenSSL.so b/PLDroidPlayerDemo/app/src/main/jniLibs/x86/libqcOpenSSL.so index 3775b71..36a95a0 100755 Binary files a/PLDroidPlayerDemo/app/src/main/jniLibs/x86/libqcOpenSSL.so and b/PLDroidPlayerDemo/app/src/main/jniLibs/x86/libqcOpenSSL.so differ diff --git a/ReleaseNotes/release-notes-2.1.7.md b/ReleaseNotes/release-notes-2.1.7.md new file mode 100644 index 0000000..98fb19e --- /dev/null +++ b/ReleaseNotes/release-notes-2.1.7.md @@ -0,0 +1,31 @@ +# PLDroidPlayer Release Notes for 2.1.7 + +本次更新: + +## 说明 + +- 从 v2.0.0 版本开始，全面升级为七牛自研的播放器内核，拥有更优异的性能 + +## 版本 + +- 发布 pldroid-player-2.1.7.jar +- 更新 libQPlayer.so + +## 优化 + +- 优化了配置缓存时的播放流畅性 +- 优化了 HTTPS 连接速度 +- 优化了 RMTP 重连速度 +- 优化了切换 URL 时停止操作的耗时 + +## 新增 + +- 新增了对七牛私有 MP4 DRM 解密播放 +- 新增了对 G711 格式支持 +- 新增了在暂停时截图特性 + +## 缺陷 + +- 修复了播放纯视频 HLS 循环、速度不均匀异常 +- 修复部分弱网、重连时 ANR +- 修复了播放部分 FMP4 的异常 \ No newline at end of file diff --git a/releases/arm64-v8a/libQPlayer.so b/releases/arm64-v8a/libQPlayer.so index 0b3dc91..a852410 100755 Binary files a/releases/arm64-v8a/libQPlayer.so and b/releases/arm64-v8a/libQPlayer.so differ diff --git a/releases/arm64-v8a/libqcOpenSSL.so b/releases/arm64-v8a/libqcOpenSSL.so old mode 100644 new mode 100755 index 706a507..1813fbe Binary files a/releases/arm64-v8a/libqcOpenSSL.so and b/releases/arm64-v8a/libqcOpenSSL.so differ diff --git a/releases/armeabi-v7a/libQPlayer.so b/releases/armeabi-v7a/libQPlayer.so index 0a26762..547fa28 100755 Binary files a/releases/armeabi-v7a/libQPlayer.so and b/releases/armeabi-v7a/libQPlayer.so differ diff --git a/releases/armeabi-v7a/libqcOpenSSL.so b/releases/armeabi-v7a/libqcOpenSSL.so index 88ab3a3..a073ab6 100755 Binary files a/releases/armeabi-v7a/libqcOpenSSL.so and b/releases/armeabi-v7a/libqcOpenSSL.so differ diff --git a/releases/armeabi/libQPlayer.so b/releases/armeabi/libQPlayer.so index 0e16f03..f78f1ba 100755 Binary files a/releases/armeabi/libQPlayer.so and b/releases/armeabi/libQPlayer.so differ diff --git a/releases/armeabi/libqcOpenSSL.so b/releases/armeabi/libqcOpenSSL.so old mode 100644 new mode 100755 index 6a93a22..924a7af Binary files a/releases/armeabi/libqcOpenSSL.so and b/releases/armeabi/libqcOpenSSL.so differ diff --git a/releases/pldroid-player-2.1.6.jar b/releases/pldroid-player-2.1.6.jar deleted file mode 100644 index 9d40208..0000000 Binary files a/releases/pldroid-player-2.1.6.jar and /dev/null differ diff --git a/releases/pldroid-player-2.1.7.jar b/releases/pldroid-player-2.1.7.jar new file mode 100644 index 0000000..bc317ac Binary files /dev/null and b/releases/pldroid-player-2.1.7.jar differ diff --git a/releases/x86/libQPlayer.so b/releases/x86/libQPlayer.so index cc247b4..cf08100 100755 Binary files a/releases/x86/libQPlayer.so and b/releases/x86/libQPlayer.so differ diff --git a/releases/x86/libqcOpenSSL.so b/releases/x86/libqcOpenSSL.so index 3775b71..36a95a0 100755 Binary files a/releases/x86/libqcOpenSSL.so and b/releases/x86/libqcOpenSSL.so differ