Merge pull request #1286 from AstaTus/master

Release 2.4.1
pili-engineering · Jun 23, 2022 · c8e2365 · c8e2365
2 parents 0a27668 + d621b58
commit c8e2365
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 9 deletions.
diff --git a/NiuDroidPlayer/app/build.gradle b/NiuDroidPlayer/app/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     if (!useJar) {
         implementation project(path: ':PLDroidPlayer')
     } else {
-        implementation files('../../releases/pldroid-player-2.4.0.jar')
+        implementation files('../../releases/pldroid-player-2.4.1.jar')
     }
 
     implementation 'com.android.support:appcompat-v7:27.1.1'

diff --git a/NiuDroidPlayer/app/src/main/java/com/qiniu/droid/niuplayer/utils/Utils.java b/NiuDroidPlayer/app/src/main/java/com/qiniu/droid/niuplayer/utils/Utils.java
@@ -136,7 +136,7 @@ public static AVOptions createAVOptions() {
         options.setInteger(AVOptions.KEY_CACHE_BUFFER_DURATION, 200);
         options.setInteger(AVOptions.KEY_CACHE_BUFFER_DURATION_SPEED_ADJUST, 0);
         HashMap headers = new HashMap<String,String>();
-        headers.put("Referer","http://video.eebbk.net");
+//        headers.put("Referer","http://video.eebbk.net");
         options.setHashMap(AVOptions.KEY_HTTP_HEAD_REFER, headers);
         options.setInteger(AVOptions.KEY_LIVE_STREAMING, 0);
 //        options.setString(AVOptions.KEY_COMP_DRM_KEY, "test123");
@@ -147,7 +147,7 @@ public static AVOptions createAVOptions() {
 //        options.setInteger(AVOptions.KEY_VIDEO_DATA_CALLBACK, 1);
 //        options.setInteger(AVOptions.KEY_VIDEO_RENDER_EXTERNAL, 1);
 //        options.setInteger(AVOptions.KEY_START_POSITION, 10 * 1000);
-//        options.setString(AVOptions.KEY_CACHE_DIR, Config.DEFAULT_CACHE_DIR);
+        options.setString(AVOptions.KEY_CACHE_DIR, Config.DEFAULT_CACHE_DIR);
 
 
         boolean disableLog = false;

diff --git a/PLDroidPlayerDemo/app/build.gradle b/PLDroidPlayerDemo/app/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     if (!useJar) {
         implementation project(path: ':PLDroidPlayer')
     } else {
-        implementation files('../../releases/pldroid-player-2.4.0.jar')
+        implementation files('../../releases/pldroid-player-2.4.1.jar')
     }
 
     if (!useSo) {

diff --git a/PLDroidPlayerDemo/app/src/main/java/com/pili/pldroid/playerdemo/MainActivity.java b/PLDroidPlayerDemo/app/src/main/java/com/pili/pldroid/playerdemo/MainActivity.java
@@ -31,10 +31,12 @@ public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "MainActivity";
 
-//    private static final String DEFAULT_TEST_URL = "http://demo-videos.qnsdk.com/movies/qiniu.mp4";
-    private static final String DEFAULT_TEST_URL = "rtmp://pili-publish.qnsdk.com/sdk-live/6666";
-
-
+    private static final String DEFAULT_TEST_URL = "http://demo-videos.qnsdk.com/movies/qiniu.mp4";
+//private static final String DEFAULT_TEST_URL = "https://sdk-release.qnsdk.com/10037108_065355-hd%20%281%29.mp4";
+//        private static final String DEFAULT_TEST_URL = "rtmp://pili-publish.qnsdk.com/sdk-live/6666";
+//    private static final String DEFAULT_TEST_URL = "https://playback-vpaas.cloudlinks.cn/vas/playback/m3u8?ownerid=9223372043327116262&deviceid=4689236446&startTime=1648088707&endTime=1648088968&sign=5bb74cbbecc053f3c954ecf75c4ed2df7cf7d3a2&port=39849";
+//    private static final String DEFAULT_TEST_URL = "http://cdn.qiniushawn.top/timeshift3.m3u8";
+    //private static final String DEFAULT_TEST_URL = "http://ojpjb7lbl.bkt.clouddn.com/h265/2000k/265_test.m3u8";
     private Spinner mActivitySpinner;
     private EditText mEditText;
     private RadioGroup mStreamingTypeRadioGroup;

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
@@ -274,7 +274,7 @@ public void onVideoSizeChanged(int width, int height) {
     private PLOnVideoFrameListener mOnVideoFrameListener = new PLOnVideoFrameListener() {
         @Override
         public void onVideoFrameAvailable(byte[] data, int size, int width, int height, int format, long ts) {
-//            Log.i(TAG, "onVideoFrameAvailable: format=" + format + ", size=" + size + ", data-length="+ data.length + ", " + width + " x " + height + ", time=" + ts + " ,data=" + Arrays.toString(data));
+            Log.i(TAG, "onVideoFrameAvailable: format=" + format + ", size=" + size + ", data-length="+ data.length + ", " + width + " x " + height + ", time=" + ts + " ,data=" + Arrays.toString(data));
             if (format == PLOnVideoFrameListener.VIDEO_FORMAT_SEI && size > 0) {
                 // If the RTMP stream is from Qiniu
                 // Add &addtssei=true to the end of URL to enable SEI timestamp.

diff --git a/ReleaseNotes/release-notes-2.4.1.md b/ReleaseNotes/release-notes-2.4.1.md
@@ -0,0 +1,18 @@
+# PLDroidPlayer Release Notes for 2.4.1
+
+本次更新:
+
+
+## 版本
+
+- 发布 pldroid-player-2.4.1.jar。
+- 更新 libQPlayer.so。
+- 更新 libqcOpenSSL.so。
+
+## 功能
+- 新增https在请求时 带上请求的SNI
+- 由于某些原因，暂时禁用apm上报
+
+## 缺陷
+
+- 修复硬解情况下用PLTextureView作为渲染view 在停止播放时崩溃。
diff --git a/releases/openssl/arm64-v8a/libqcOpenSSL.so b/releases/openssl/arm64-v8a/libqcOpenSSL.so
diff --git a/releases/openssl/armeabi-v7a/libqcOpenSSL.so b/releases/openssl/armeabi-v7a/libqcOpenSSL.so
diff --git a/releases/openssl/x86/libqcOpenSSL.so b/releases/openssl/x86/libqcOpenSSL.so
diff --git a/releases/pldroid-player-2.4.0.jar b/releases/pldroid-player-2.4.0.jar
diff --git a/releases/pldroid-player-2.4.1.jar b/releases/pldroid-player-2.4.1.jar
diff --git a/releases/qplayer/arm64-v8a/libQPlayer.so b/releases/qplayer/arm64-v8a/libQPlayer.so
diff --git a/releases/qplayer/armeabi-v7a/libQPlayer.so b/releases/qplayer/armeabi-v7a/libQPlayer.so
diff --git a/releases/qplayer/x86/libQPlayer.so b/releases/qplayer/x86/libQPlayer.so