Merge branch '3.0.13'

README.md

@@ -17,7 +17,7 @@ and add the following in the dependent module:
 
 ```gradle
 dependencies {
-    implementation 'com.github.masterwok:libvlc-android-sdk:3.0.11'
+    implementation 'com.github.masterwok:libvlc-android-sdk:3.0.13'
 }
 ```
 unless you're a fan of large APKs, you'll probably want to add the following to the build.gradle of your app so an APK is generated per ABI:

buildlibvlc.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-tag='3.0.11'
+tag='3.0.13'
 
 rootdir=`dirname $0`
 

libvlc/src/main/java/org/videolan/libvlc/MediaPlayer.java

@@ -1193,6 +1193,7 @@ protected synchronized Event onEventNative(int eventType, long arg1, long arg2,
 
     @Override
     protected void onReleaseNative() {
+        mWindow.detachViews();
         registerAudioPlug(false);
 
         if (mMedia != null)

libvlc/src/main/java/org/videolan/libvlc/RendererDiscoverer.java

@@ -78,6 +78,7 @@ public void stop() {
         if (isReleased()) throw new IllegalStateException("MediaDiscoverer is released");
         setEventListener(null);
         nativeStop();
+        release();
     }
 
     public void setEventListener(EventListener listener) {
@@ -111,7 +112,7 @@ protected Event onEventNative(int eventType, long arg1, long arg2, float argf1)
 
     private final LongSparseArray<RendererItem> index = new LongSparseArray<>();
     private synchronized RendererItem insertItemFromEvent(long arg1) {
-        final RendererItem item = new RendererItem(this, arg1);
+        final RendererItem item = nativeNewItem(arg1);
         index.put(arg1, item);
         return item;
     }
@@ -138,4 +139,5 @@ private static Description createDescriptionFromNative(String name, String longN
     private native boolean nativeStart();
     private native void nativeStop();
     private static native Description[] nativeList(LibVLC libVLC);
+    private native RendererItem nativeNewItem(long ref);
 }

libvlc/src/main/java/org/videolan/libvlc/RendererItem.java

@@ -15,17 +15,6 @@ public class RendererItem extends VLCObject<RendererItem.Event> {
     final int flags;
     private final long ref;
 
-    RendererItem (RendererDiscoverer rd, long ref) {
-        super(rd);
-        final RendererItem item = nativeNewItem(rd, ref);
-        name = item == null ? null : item.name;
-        displayName = item == null ? null : item.displayName;
-        this.type = item == null ? null : item.type;
-        this.iconUrl = item == null ? null : item.iconUrl;
-        this.flags = item == null ? 0 : item.flags;
-        this.ref = item == null ? ref : item.ref;
-    }
-
     RendererItem(String name, String type, String iconUrl, int flags, long ref) {
         final int index = name.lastIndexOf('-');
         this.name = name;
@@ -57,6 +46,5 @@ protected Event(int type) {
         }
     }
 
-    private native RendererItem nativeNewItem(RendererDiscoverer rd, long ref);
     private native void nativeReleaseItem();
 }

libvlc/src/main/java/org/videolan/libvlc/VLCObject.java

@@ -91,6 +91,12 @@ public final void release() {
         }
     }
 
+    @Override
+    protected synchronized void finalize() {
+        if (!isReleased())
+            throw new AssertionError("VLCObject (" + getClass().getName() + ") finalized but not natively released (" + mNativeRefCount + " refs)");
+    }
+
     /**
      * Set an event listener.
      * Events are sent via the android main thread.

libvlc/src/main/java/org/videolan/libvlc/util/AndroidUtil.java

@@ -27,18 +27,19 @@
 
 public class AndroidUtil {
 
-    public static final boolean isOOrLater = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    public static final boolean isNougatOrLater = isOOrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
-    public static final boolean isMarshMallowOrLater = isNougatOrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
-    public static final boolean isLolliPopOrLater = isMarshMallowOrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
-    public static final boolean isKitKatOrLater = isLolliPopOrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-    public static final boolean isJellyBeanMR2OrLater = isKitKatOrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2;
-    public static final boolean isJellyBeanMR1OrLater = isJellyBeanMR2OrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1;
-    public static final boolean isJellyBeanOrLater = isJellyBeanMR1OrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
-    public static final boolean isICSOrLater = isJellyBeanOrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH;
-    public static final boolean isHoneycombMr2OrLater = isICSOrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2;
-    public static final boolean isHoneycombMr1OrLater = isHoneycombMr2OrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1;
-    public static final boolean isHoneycombOrLater = isHoneycombMr1OrLater || Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB;
+    public static final boolean isPOrLater = android.os.Build.VERSION.SDK_INT > 27;
+    public static final boolean isOOrLater = isPOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+    public static final boolean isNougatOrLater = isOOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
+    public static final boolean isMarshMallowOrLater = isNougatOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
+    public static final boolean isLolliPopOrLater = isMarshMallowOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+    public static final boolean isKitKatOrLater = isLolliPopOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+    public static final boolean isJellyBeanMR2OrLater = isKitKatOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2;
+    public static final boolean isJellyBeanMR1OrLater = isJellyBeanMR2OrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1;
+    public static final boolean isJellyBeanOrLater = isJellyBeanMR1OrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
+    public static final boolean isICSOrLater = isJellyBeanOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH;
+    public static final boolean isHoneycombMr2OrLater = isICSOrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2;
+    public static final boolean isHoneycombMr1OrLater = isHoneycombMr2OrLater || android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1;
+    public static final boolean isHoneycombOrLater = isHoneycombMr1OrLater || android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB;
 
     public static File UriToFile(Uri uri) {
         return new File(uri.getPath().replaceFirst("file://", ""));

libvlc/src/main/java/org/videolan/libvlc/util/VLCUtil.java

@@ -63,8 +63,8 @@ public static String[] getABIList21() {
     @SuppressWarnings("deprecation")
     public static String[] getABIList() {
         final String[] abis = new String[2];
-        abis[0] = Build.CPU_ABI;
-        abis[1] = Build.CPU_ABI2;
+        abis[0] = android.os.Build.CPU_ABI;
+        abis[1] = android.os.Build.CPU_ABI2;
         return abis;
     }