mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 11:07:35 -05:00
Issue #59 - more changes to improve handling of transfer buffers between
tuner start/stop iterations.
This commit is contained in:
@@ -1340,6 +1340,8 @@ public abstract class RTL2832TunerController extends TunerController
|
|||||||
* not currently running, starts it running in a new thread.
|
* not currently running, starts it running in a new thread.
|
||||||
*/
|
*/
|
||||||
public void addListener( Listener<ComplexBuffer> listener )
|
public void addListener( Listener<ComplexBuffer> listener )
|
||||||
|
{
|
||||||
|
synchronized( mComplexBufferBroadcaster )
|
||||||
{
|
{
|
||||||
mComplexBufferBroadcaster.addListener( listener );
|
mComplexBufferBroadcaster.addListener( listener );
|
||||||
|
|
||||||
@@ -1357,12 +1359,15 @@ public abstract class RTL2832TunerController extends TunerController
|
|||||||
thread.start();
|
thread.start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Removes the sample listener. If this is the last registered listener,
|
* Removes the sample listener. If this is the last registered listener,
|
||||||
* shuts down the buffer processing thread.
|
* shuts down the buffer processing thread.
|
||||||
*/
|
*/
|
||||||
public void removeListener( Listener<ComplexBuffer> listener )
|
public void removeListener( Listener<ComplexBuffer> listener )
|
||||||
|
{
|
||||||
|
synchronized( mComplexBufferBroadcaster )
|
||||||
{
|
{
|
||||||
mComplexBufferBroadcaster.removeListener( listener );
|
mComplexBufferBroadcaster.removeListener( listener );
|
||||||
|
|
||||||
@@ -1371,6 +1376,7 @@ public abstract class RTL2832TunerController extends TunerController
|
|||||||
mBufferProcessor.stop();
|
mBufferProcessor.stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Buffer processing thread. Fetches samples from the RTL2832 Tuner and
|
* Buffer processing thread. Fetches samples from the RTL2832 Tuner and
|
||||||
@@ -1479,6 +1485,10 @@ public abstract class RTL2832TunerController extends TunerController
|
|||||||
mLibUsbHandlerStatus.rewind();
|
mLibUsbHandlerStatus.rewind();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mLog.error( "Couldn't start buffer processor - already running!" );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1531,30 +1541,8 @@ public abstract class RTL2832TunerController extends TunerController
|
|||||||
mFilledBuffers.add( data );
|
mFilledBuffers.add( data );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean error = false;
|
|
||||||
|
|
||||||
if( isRunning() )
|
|
||||||
{
|
|
||||||
int result = LibUsb.submitTransfer( transfer );
|
|
||||||
|
|
||||||
if( result != LibUsb.SUCCESS )
|
|
||||||
{
|
|
||||||
error = true;
|
|
||||||
mLog.error( "couldn't resubmit buffer transfer to tuner" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( error )
|
|
||||||
{
|
|
||||||
LibUsb.freeTransfer( transfer );
|
|
||||||
mTransfers.remove( transfer );
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case LibUsb.TRANSFER_CANCELLED:
|
case LibUsb.TRANSFER_CANCELLED:
|
||||||
/* free the transfer and remove it */
|
|
||||||
LibUsb.freeTransfer( transfer );
|
|
||||||
mTransfers.remove( transfer );
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/* unexpected error */
|
/* unexpected error */
|
||||||
@@ -1562,37 +1550,8 @@ public abstract class RTL2832TunerController extends TunerController
|
|||||||
getTransferStatus( transfer.status() ) +
|
getTransferStatus( transfer.status() ) +
|
||||||
"] transferred actual: " + transfer.actualLength() );
|
"] transferred actual: " + transfer.actualLength() );
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private void cancel()
|
mAvailableTransfers.add( transfer );
|
||||||
{
|
|
||||||
for( Transfer transfer: mTransfers )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
LibUsb.cancelTransfer( transfer );
|
|
||||||
}
|
|
||||||
catch( IllegalStateException ise )
|
|
||||||
{
|
|
||||||
//Do nothing. We get this exception if the transfer is not
|
|
||||||
//currently submitted for transfer and is likely being
|
|
||||||
//handled as a completed transfer. We'll rely on the mRunning
|
|
||||||
//variable to prevent this transfer from being resubmitted.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer completed = ByteBuffer.allocateDirect( 4 );
|
|
||||||
|
|
||||||
int result = LibUsb.handleEventsTimeoutCompleted(
|
|
||||||
null, TIMEOUT_US, completed.asIntBuffer() );
|
|
||||||
|
|
||||||
if( result != LibUsb.SUCCESS )
|
|
||||||
{
|
|
||||||
mLog.error( "error handling usb events during cancel [" +
|
|
||||||
LibUsb.errorName( result ) + "]" );
|
|
||||||
}
|
|
||||||
|
|
||||||
mLog.debug( "RTL2832 Stopped" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1615,17 +1574,14 @@ public abstract class RTL2832TunerController extends TunerController
|
|||||||
LibUsb.ERROR_NO_MEM );
|
LibUsb.ERROR_NO_MEM );
|
||||||
}
|
}
|
||||||
|
|
||||||
mAvailableTransfers.add( transfer );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for( Transfer transfer: mAvailableTransfers )
|
|
||||||
{
|
|
||||||
final ByteBuffer buffer =
|
final ByteBuffer buffer =
|
||||||
ByteBuffer.allocateDirect( mBufferSize );
|
ByteBuffer.allocateDirect( mBufferSize );
|
||||||
|
|
||||||
LibUsb.fillBulkTransfer( transfer, mDeviceHandle, BULK_ENDPOINT_IN,
|
LibUsb.fillBulkTransfer( transfer, mDeviceHandle, BULK_ENDPOINT_IN,
|
||||||
buffer, BufferProcessor.this, "Buffer", TIMEOUT_US );
|
buffer, BufferProcessor.this, "Buffer", TIMEOUT_US );
|
||||||
|
|
||||||
|
mAvailableTransfers.add( transfer );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user