Cleanup - removed synchronized blocks since the buffer processor thread is the only thread managing recorders.

This commit is contained in:
Denny
2017-03-03 10:04:21 -05:00
parent a877afcceb
commit ef172a04c6

View File

@@ -60,9 +60,6 @@ public class RecorderManager implements Listener<AudioPacket>
*/ */
public RecorderManager() public RecorderManager()
{ {
mBufferProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(new BufferProcessor(), 0,
1, TimeUnit.SECONDS);
mAudioPacketQueue.setOverflowListener(new IOverflowListener() mAudioPacketQueue.setOverflowListener(new IOverflowListener()
{ {
@Override @Override
@@ -78,6 +75,9 @@ public class RecorderManager implements Listener<AudioPacket>
} }
} }
}); });
mBufferProcessorFuture = ThreadPool.SCHEDULED.scheduleAtFixedRate(new BufferProcessor(), 0,
1, TimeUnit.SECONDS);
} }
/** /**
@@ -119,50 +119,47 @@ public class RecorderManager implements Listener<AudioPacket>
{ {
String identifier = audioPacket.getMetadata().getUniqueIdentifier(); String identifier = audioPacket.getMetadata().getUniqueIdentifier();
synchronized(mRecorders) if(mRecorders.containsKey(identifier))
{ {
if(mRecorders.containsKey(identifier)) RealBufferWaveRecorder recorder = mRecorders.get(identifier);
{
RealBufferWaveRecorder recorder = mRecorders.get(identifier);
if(audioPacket.getType() == AudioPacket.Type.AUDIO) if(audioPacket.getType() == AudioPacket.Type.AUDIO)
{ {
recorder.receive(audioPacket.getAudioBuffer()); recorder.receive(audioPacket.getAudioBuffer());
}
else if(audioPacket.getType() == AudioPacket.Type.END)
{
RealBufferWaveRecorder finished = mRecorders.remove(identifier);
finished.stop();
}
} }
else if(audioPacket.getType() == AudioPacket.Type.AUDIO) else if(audioPacket.getType() == AudioPacket.Type.END)
{ {
if(mCanStartNewRecorders) RealBufferWaveRecorder finished = mRecorders.remove(identifier);
finished.stop();
}
}
else if(audioPacket.getType() == AudioPacket.Type.AUDIO)
{
if(mCanStartNewRecorders)
{
String filePrefix = getFilePrefix(audioPacket);
RealBufferWaveRecorder recorder = null;
try
{ {
String filePrefix = getFilePrefix(audioPacket); recorder = new RealBufferWaveRecorder(AUDIO_SAMPLE_RATE, filePrefix);
RealBufferWaveRecorder recorder = null; recorder.start(ThreadPool.SCHEDULED);
try recorder.receive(audioPacket.getAudioBuffer());
mRecorders.put(identifier, recorder);
}
catch(Exception ioe)
{
mCanStartNewRecorders = false;
mLog.error("Error attempting to start new audio wave recorder. All (future) audio recording " +
"is disabled", ioe);
if(recorder != null)
{ {
recorder = new RealBufferWaveRecorder(AUDIO_SAMPLE_RATE, filePrefix); recorder.stop();
recorder.start(ThreadPool.SCHEDULED);
recorder.receive(audioPacket.getAudioBuffer());
mRecorders.put(identifier, recorder);
}
catch(Exception ioe)
{
mCanStartNewRecorders = false;
mLog.error("Error attempting to start new audio wave recorder. All (future) audio recording " +
"is disabled", ioe);
if(recorder != null)
{
recorder.stop();
}
} }
} }
} }
@@ -245,11 +242,8 @@ public class RecorderManager implements Listener<AudioPacket>
@Override @Override
public void run() public void run()
{ {
synchronized(mRecorders) processBuffers();
{ removeIdleRecorders();
processBuffers();
removeIdleRecorders();
}
} }
} }
} }