wip

Author: nift4

app/src/main/java/org/akanework/gramophone/logic/utils/exoplayer/NativeTrackAudioOutput.java

@@ -43,7 +43,7 @@
 import androidx.media3.exoplayer.analytics.PlayerId;
 import androidx.media3.exoplayer.audio.AudioOutput;
 import androidx.media3.exoplayer.audio.AudioOutputProvider.OutputConfig;
-import androidx.media3.exoplayer.audio.DefaultAudioSink;
+import androidx.media3.extractor.ExtractorUtil;
 
 import org.nift4.gramophone.hificore.NativeTrack;
 
@@ -234,7 +234,7 @@ public boolean write(ByteBuffer buffer, int encodedAccessUnitCount, long present
       throws WriteException {
     if (!isOutputPcm && framesPerEncodedSample == 0) {
       // If this is the first encoded sample, calculate the sample size in frames.
-      framesPerEncodedSample = DefaultAudioSink.getFramesPerEncodedSample(config.encoding, buffer);
+      framesPerEncodedSample = ExtractorUtil.getFramesPerEncodedSample(config.encoding, buffer);
     }
     maybeReportUnderrun();
     int bytesRemaining = buffer.remaining();

hificore/src/main/cpp/libusb/usb_device.c

@@ -376,69 +376,6 @@ Java_com_jwoolston_libusb_UsbDevice_nativeSetConfiguration(JNIEnv *env, jobject
     return libusb_set_configuration(deviceHandle, configurationID);
 }
 
-JNIEXPORT jint JNICALL
-Java_com_jwoolston_libusb_UsbDevice_nativeControlRequest(JNIEnv *env, jobject instance,
-                                                                   jlong device, jint requestType,
-                                                                   jint request, jint value, jint index,
-                                                                   jbyteArray buffer_, jint offset, jint length,
-                                                                   jint timeout) {
-    struct libusb_device_handle *deviceHandle = (struct libusb_device_handle *) device;
-    jbyte *buffer = NULL;
-    if (buffer_) {
-        // We have to use this over GetPrimitiveArrayCritical due to the need to call other JNI functions
-        buffer = (*env)->GetByteArrayElements(env, buffer_, NULL);
-    }
-    jint result = libusb_control_transfer(deviceHandle, (uint8_t) (0xFF & requestType), (uint8_t) (0xFF & request),
-                                          (uint16_t) (0xFFFF & value), (uint16_t) (0xFFFF & index),
-                                          (unsigned char *) (buffer + offset), (uint16_t) (0xFFFF & length),
-                                          (unsigned int) timeout);
-    if (buffer) {
-        (*env)->ReleaseByteArrayElements(env, buffer_, buffer, 0);
-    }
-
-    return result;
-}
-
-JNIEXPORT jint JNICALL
-Java_com_jwoolston_libusb_UsbDevice_nativeBulkRequest(JNIEnv *env, jobject instance, jlong device,
-                                                                jint endpoint, jbyteArray buffer_, jint offset,
-                                                                jint length, jint timeout) {
-    struct libusb_device_handle *deviceHandle = (struct libusb_device_handle *) device;
-    jbyte *buffer = NULL;
-    if (buffer_) {
-        // We have to use this over GetPrimitiveArrayCritical due to the need to call other JNI functions
-        buffer = (*env)->GetByteArrayElements(env, buffer_, NULL);
-    }
-
-    int transferred;
-    jint result = libusb_bulk_transfer(deviceHandle, (unsigned char) (0xFF & endpoint),
-                                       (unsigned char*)buffer + offset, length, &transferred, (unsigned int) timeout);
-
-    if (buffer) {
-        (*env)->ReleaseByteArrayElements(env, buffer_, buffer, 0);
-    }
-    return ((result == 0) ? transferred : result);
-}
-
-JNIEXPORT jint JNICALL
-Java_com_jwoolston_libusb_UsbDevice_nativeInterruptRequest(JNIEnv *env, jobject instance,
-                                                                     jlong device, jint endpoint,
-                                                                     jbyteArray buffer_, jint offset,
-                                                                     jint length, jint timeout) {
-    struct libusb_device_handle *deviceHandle = (struct libusb_device_handle *) device;
-    jbyte *buffer = NULL;
-    if (buffer_) {
-        // We have to use this over GetPrimitiveArrayCritical due to the need to call other JNI functions
-        buffer = (*env)->GetByteArrayElements(env, buffer_, NULL);
-    }
-    jint transfered;
-    jint result = libusb_interrupt_transfer(deviceHandle, endpoint, buffer + offset, length, &transfered, timeout);
-    if (buffer) {
-        (*env)->ReleaseByteArrayElements(env, buffer_, buffer, 0);
-    }
-    return ((result == 0) ? transfered : result);
-}
-
 JNIEXPORT jint JNICALL
 Java_com_jwoolston_libusb_UsbDevice_nativeRequestAsync(JNIEnv *env, jobject instance,
                                                        jlong device, jobject transfer,

hificore/src/main/java/com/jwoolston/libusb/AsyncUSBThread.java

@@ -16,8 +16,6 @@
 
 package com.jwoolston.libusb;
 
-import androidx.media3.common.util.Log;
-
 import org.jetbrains.annotations.NotNull;
 
 /**

hificore/src/main/java/com/jwoolston/libusb/LibUsbDeviceDescriptor.java

@@ -23,7 +23,7 @@
 /**
  * @author Jared Woolston (Jared.Woolston@gmail.com)
  */
-public class LibUsbDeviceDescriptor {
+class LibUsbDeviceDescriptor {
 
     private final long nativeObject;
 

hificore/src/main/java/com/jwoolston/libusb/UsbDevice.java

@@ -41,7 +41,7 @@
  */
 public class UsbDevice {
 
-    private final UsbManager manager;
+    public final UsbManager manager;
     final @NotNull String name;
     final @Nullable String manufacturerName;
     final @Nullable String productName;
@@ -717,8 +717,9 @@ public int controlTransfer(int requestType, int request, int value, int index, b
     public int controlTransfer(int requestType, int request, int value, int index, byte[] buffer, int offset,
                                int length, int timeout) {
         checkBounds(buffer, offset, length);
-        return nativeControlRequest(getNativeObject(), requestType, request, value, index, buffer, offset,
-                length, timeout);
+        // TODO: safely reimplement blocking transfer based on async transfer, in a real-time safe
+        //  way. most likely blocking on condition variable in native and setting it from callback.
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -755,7 +756,9 @@ public int bulkTransfer(UsbEndpoint endpoint, byte[] buffer, int length, int tim
      */
     public int bulkTransfer(UsbEndpoint endpoint, byte[] buffer, int offset, int length, int timeout) {
         checkBounds(buffer, offset, length);
-        return nativeBulkRequest(getNativeObject(), endpoint.getAddress(), buffer, offset, length, timeout);
+        // TODO: safely reimplement blocking transfer based on async transfer, in a real-time safe
+        //  way. most likely blocking on condition variable in native and setting it from callback.
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -792,7 +795,9 @@ public int interruptTransfer(UsbEndpoint endpoint, byte[] buffer, int length, in
      */
     public int interruptTransfer(UsbEndpoint endpoint, byte[] buffer, int offset, int length, int timeout) {
         checkBounds(buffer, offset, length);
-        return nativeInterruptRequest(getNativeObject(), endpoint.getAddress(), buffer, offset, length, timeout);
+        // TODO: safely reimplement blocking transfer based on async transfer, in a real-time safe
+        //  way. most likely blocking on condition variable in native and setting it from callback.
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -822,6 +827,9 @@ public LibusbError asyncTransfer(@NotNull AsyncTransfer transfer) {
             throw new IllegalArgumentException("Transfer callback should be set");
         }
         @NonNull ByteBuffer buffer = transfer.getBuffer();
+        manager.onTransferAdded(transfer.getNativeObject());
+        // TODO: add dispatch to handler in real-time-safe way (if no dispatch and not blocking, it
+        //  may use real-time-unsafe in place callback)
         return LibusbError.fromNative(nativeRequestAsync(getNativeObject(), transfer,
                 buffer, buffer.position(), buffer.remaining()));
     }
@@ -872,20 +880,11 @@ private static void checkBounds(byte[] buffer, int start, int length) {
 
     private native int nativeSetConfiguration(long device, int configurationID);
 
-    private native int nativeControlRequest(long device, int requestType, int request, int value,
-                                            int index, byte[] buffer, int offset, int length, int timeout);
-
     private native int nativeRequestAsync(long device, @NotNull AsyncTransfer transfer,
                                           @NotNull ByteBuffer buffer, int offset, int length);
 
     private native int nativeCancelAsync(long transfer);
 
-    private native int nativeBulkRequest(long device, int endpoint, byte[] buffer, int offset,
-                                         int length, int timeout);
-
-    private native int nativeInterruptRequest(long device, int endpoint, byte[] buffer, int offset,
-                                              int length, int timeout);
-
     private native int nativeResetDevice(long device);
 
 }

hificore/src/main/java/com/jwoolston/libusb/UsbManager.java

@@ -25,6 +25,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.nift4.gramophone.hificore.AdaptiveDynamicRangeCompression;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * This class allows you to access the state of USB and communicate with USB devices.
  * Currently only host mode is supported in the public API.
@@ -46,6 +49,8 @@ public class UsbManager {
     private int refCount;
     @GuardedBy("#lock")
     private long nativeObject;
+    @GuardedBy("#transfers")
+    private final Set<Long> transfers = new HashSet<>();
 
     final Object lock = new Object();
     private volatile AsyncUSBThread asyncUsbThread;
@@ -90,13 +95,20 @@ public void setNativeLogLevel(@NotNull LoggingLevel level) {
     }
 
     public void destroy() {
+        // both of these throw clauses shouldn't be reachable from finalizer. if everything is
+        // leaked, GC will close it in the right order at least :)
         synchronized (lock) {
             if (refCount != 0) {
-                throw new IllegalStateException("Can't close UsbManager if some device is still open!");
+                throw new IllegalStateException("Can't destroy UsbManager if some device is still open!");
             }
-            if (nativeObject != 0) {
-                nativeDestroy(getNativeObject());
-                nativeObject = 0;
+            synchronized (transfers) {
+                if (!transfers.isEmpty()) {
+                    throw new IllegalStateException("Can't destroy UsbManager if some transfer is still not released!");
+                }
+                if (nativeObject != 0) {
+                    nativeDestroy(nativeObject);
+                    nativeObject = 0;
+                }
             }
         }
     }
@@ -107,13 +119,12 @@ protected void finalize() throws Throwable {
         super.finalize();
     }
 
+    @GuardedBy("#lock") // except AsyncUSBThread :)
     public long getNativeObject() {
-        synchronized (lock) {
-            if (nativeObject == 0) {
-                throw new IllegalStateException("This UsbManager was already destroyed");
-            }
-            return nativeObject;
+        if (nativeObject == 0) {
+            throw new IllegalStateException("This UsbManager was already destroyed");
         }
+        return nativeObject;
     }
 
     @GuardedBy("#lock")
@@ -145,6 +156,19 @@ void startAsyncIfNeeded() {
         }
     }
 
+    void onTransferAdded(long transfer) {
+        synchronized (transfers) {
+            transfers.add(transfer);
+        }
+    }
+
+    // Do NOT call this manually, AsyncTransfer will call it.
+    public void onTransferReleased(long transfer) {
+        synchronized (transfers) {
+            transfers.remove(transfer);
+        }
+    }
+
     public enum LoggingLevel {
         NONE,
         ERROR,

hificore/src/main/java/com/jwoolston/libusb/async/AsyncTransfer.java

@@ -395,6 +395,7 @@ public void release() {
         if (isInFlight())
             throw new IllegalStateException("Can't release in-progress transfer");
         nativeDestroy(getNativeObject());
+        device.manager.onTransferReleased(nativeObject);
         nativeObject = 0;
     }