Merge pull request #1230 from chenqian-dev/master

Release 2.2.0

Author: KevinHuo

PLDroidPlayerDemo/app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.pili.pldroid.playerdemo"
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 12
-        versionName "2.1.9"
+        versionCode 13
+        versionName "2.2.0"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
     }
     buildTypes {
@@ -21,16 +21,27 @@ android {
 
     sourceSets {
         main {
-            jniLibs.srcDirs = ['src/main/jniLibs']
+            if (!useLibrary) {
+                jniLibs.srcDirs = ['src/main/jniLibs']
+            }
         }
     }
 }
 
 dependencies {
-    implementation files('libs/pldroid-player-2.1.9.jar')
+
+    if (useLibrary) {
+        implementation project(path: ':library')
+    } else {
+        implementation files('libs/pldroid-player-2.2.0.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'
 }

…erDemo/app/libs/pldroid-player-2.1.9.jar …erDemo/app/libs/pldroid-player-2.2.0.jarPLDroidPlayerDemo/app/libs/pldroid-player-2.1.9.jar renamed to PLDroidPlayerDemo/app/libs/pldroid-player-2.2.0.jar PLDroidPlayerDemo/app/libs/pldroid-player-2.1.9.jar renamed to PLDroidPlayerDemo/app/libs/pldroid-player-2.2.0.jar

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.CAMERA"/>
 
     <supports-screens
         android:anyDensity="true"

PLDroidPlayerDemo/app/src/main/AndroidManifest.xml

@@ -124,6 +124,9 @@ public boolean isPermissionOK() {
     }
 
     public void onClickLocalFile(View v) {
+        if(!isPermissionOK()){
+            return;
+        }
         Intent intent = new Intent();
         if (Build.VERSION.SDK_INT < 19) {
             intent.setAction(Intent.ACTION_GET_CONTENT);
@@ -137,6 +140,9 @@ public void onClickLocalFile(View v) {
     }
 
     public void onClickScanQrcode(View v) {
+        if(!isPermissionOK()){
+            return;
+        }
         IntentIntegrator integrator = new IntentIntegrator(this);
         integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES);
         integrator.setOrientationLocked(true);

PLDroidPlayerDemo/app/src/main/java/com/pili/pldroid/playerdemo/MainActivity.java

@@ -261,7 +261,7 @@ public void onVideoSizeChanged(int width, int height) {
         @Override
         public void onVideoFrameAvailable(byte[] data, int size, int width, int height, int format, long ts) {
             Log.i(TAG, "onVideoFrameAvailable: " + size + ", " + width + " x " + height + ", " + format + ", " + ts);
-            if (format == PLOnVideoFrameListener.VIDEO_FORMAT_SEI && bytesToHex(Arrays.copyOfRange(data, 19, 23)).equals("74733634")) {
+            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.
                 // Format of the byte array:
@@ -272,7 +272,15 @@ public void onVideoFrameAvailable(byte[] data, int size, int width, int height,
                 // 19-22:   ts64                        Magic string to mark this stream is from Qiniu
                 // 23-30:   timestamp                   The timestamp
                 // 31:      0x80                        Magic hex in ffmpeg
-                Log.i(TAG, " timestamp: " + Long.valueOf(bytesToHex(Arrays.copyOfRange(data, 23, 31)), 16));
+                int index = 2;
+                int payloadSize = 0;
+                do {
+                    payloadSize += data[index] & 0xFF;
+                } while (data[index++] == (byte) 0xFF);
+                String uuid = bytesToHex(Arrays.copyOfRange(data, index, index + 16));
+                int length = payloadSize - 16;
+                String content = new String(data, index + 16, length);
+                Log.i(TAG, " SEI data size:" + data.length + " content: " + content + " length = " + length);
             }
         }
     };

PLDroidPlayerDemo/app/src/main/java/com/pili/pldroid/playerdemo/PLVideoViewActivity.java

@@ -51,6 +51,9 @@ public boolean checkPermission() {
         if (!addPermission(permissionsList, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
             permissionsNeeded.add("Write external storage");
         }
+        if (!addPermission(permissionsList, Manifest.permission.CAMERA)) {
+            permissionsNeeded.add("Camera");
+        }
 
         if (permissionsNeeded.size() > 0) {
             // Need Rationale