#1506 Resolves issue of tuner freezing due to cancelled USB transfer …

…buffers not being resubmitted.
DSheirer · Apr 10, 2023 · f23db3c · f23db3c
1 parent fa0b047
commit f23db3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/main/java/io/github/dsheirer/audio/playback/AudioOutput.java b/src/main/java/io/github/dsheirer/audio/playback/AudioOutput.java
@@ -289,10 +289,6 @@ private void playAudio(ByteBuffer buffer)
                 mOutputLastTimestamp = System.currentTimeMillis();
             }
         }
-        else
-        {
-            mLog.error("Audio buffer was null ... couldn't play it");
-        }
     }
 
     /**
@@ -655,7 +651,7 @@ public void run()
             {
                 try
                 {
-                    //Debug hooks
+                    //TODO: Debug hooks - remove after testing
                     if(mMixerChannel.name().equals("LEFT"))
                     {
                         int a = 0;

diff --git a/src/main/java/io/github/dsheirer/source/tuner/usb/USBTunerController.java b/src/main/java/io/github/dsheirer/source/tuner/usb/USBTunerController.java
@@ -699,23 +699,21 @@ public void processTransfer(Transfer transfer)
                 case LibUsb.TRANSFER_STALL:
                 case LibUsb.TRANSFER_TIMED_OUT:
                 case LibUsb.TRANSFER_ERROR:
+                case LibUsb.TRANSFER_CANCELLED:
                     int transferLength = transfer.actualLength();
 
                     if(transferLength > 0)
                     {
                         dispatchTransfer(transfer);
-                        transfer.buffer().rewind();
                     }
 
+                    transfer.buffer().rewind();
+
                     if(mAutoResubmitTransfers)
                     {
                         submitTransfer(transfer);
                     }
                     break;
-                case LibUsb.TRANSFER_CANCELLED:
-                    //Reset the transfer but don't do anything else since we're shutting down
-                    transfer.buffer().rewind();
-                    break;
                 default:
                     //Unexpected transfer error - shutdown the tuner
                     transfer.buffer().rewind();