Merge pull request #89 from DSheirer/#65_audio_recorder_exception_on_startup

#65 resolves issue where on audio recorder startup an IO exception is…
This commit is contained in:
Denny Sheirer
2017-01-07 10:59:57 -05:00
committed by GitHub

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * SDR Trunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -17,165 +17,159 @@
******************************************************************************/ ******************************************************************************/
package record; package record;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import record.wave.ComplexBufferWaveRecorder;
import record.wave.RealBufferWaveRecorder;
import sample.Listener;
import audio.AudioPacket; import audio.AudioPacket;
import audio.metadata.Metadata; import audio.metadata.Metadata;
import audio.metadata.MetadataType; import audio.metadata.MetadataType;
import controller.ThreadPoolManager; import controller.ThreadPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import record.wave.ComplexBufferWaveRecorder;
import record.wave.RealBufferWaveRecorder;
import sample.Listener;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
public class RecorderManager implements Listener<AudioPacket> public class RecorderManager implements Listener<AudioPacket>
{ {
private static final Logger mLog = LoggerFactory.getLogger( RecorderManager.class ); private static final Logger mLog = LoggerFactory.getLogger(RecorderManager.class);
public static final int AUDIO_SAMPLE_RATE = 8000; public static final int AUDIO_SAMPLE_RATE = 8000;
private Map<String,RealBufferWaveRecorder> mRecorders = new HashMap<>(); private Map<String, RealBufferWaveRecorder> mRecorders = new HashMap<>();
private ThreadPoolManager mThreadPoolManager; private ThreadPoolManager mThreadPoolManager;
private boolean mCanStartNewRecorders = true; private boolean mCanStartNewRecorders = true;
public RecorderManager( ThreadPoolManager threadPoolManager ) /**
{ * Manages starting and stopping all system recorders and distributes channel audio to each of the recorders.
mThreadPoolManager = threadPoolManager; */
} public RecorderManager(ThreadPoolManager threadPoolManager)
{
mThreadPoolManager = threadPoolManager;
}
public void dispose() public void dispose()
{ {
mThreadPoolManager = null; mThreadPoolManager = null;
} }
@Override @Override
public void receive( AudioPacket audioPacket ) public void receive(AudioPacket audioPacket)
{ {
if( audioPacket.hasAudioMetadata() && if(audioPacket.hasAudioMetadata() &&
audioPacket.getAudioMetadata().isRecordable() ) audioPacket.getAudioMetadata().isRecordable())
{ {
String identifier = audioPacket.getAudioMetadata().getIdentifier(); String identifier = audioPacket.getAudioMetadata().getIdentifier();
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 ) else if(audioPacket.getType() == AudioPacket.Type.END)
{ {
RealBufferWaveRecorder finished = mRecorders.remove( identifier ); RealBufferWaveRecorder finished = mRecorders.remove(identifier);
finished.stop(); finished.stop();
} }
} }
else if( audioPacket.getType() == AudioPacket.Type.AUDIO ) else if(audioPacket.getType() == AudioPacket.Type.AUDIO)
{ {
if( mCanStartNewRecorders ) if(mCanStartNewRecorders)
{ {
String filePrefix = getFilePrefix( audioPacket ); String filePrefix = getFilePrefix(audioPacket);
try RealBufferWaveRecorder recorder = null;
{
RealBufferWaveRecorder recorder =
new RealBufferWaveRecorder( AUDIO_SAMPLE_RATE, filePrefix );
recorder.start( mThreadPoolManager.getScheduledExecutorService() ); try
{
recorder = new RealBufferWaveRecorder(AUDIO_SAMPLE_RATE, filePrefix);
recorder.receive( audioPacket.getAudioBuffer() ); recorder.start(mThreadPoolManager.getScheduledExecutorService());
mRecorders.put( identifier, recorder );
}
catch( Exception ioe )
{
mCanStartNewRecorders = false;
mLog.error( "Error attempting to start new audio wave recorder." recorder.receive(audioPacket.getAudioBuffer());
+ " All (future) audio recording is disabled", ioe ); mRecorders.put(identifier, recorder);
} }
} catch(Exception ioe)
} {
} mCanStartNewRecorders = false;
}
/** mLog.error("Error attempting to start new audio wave recorder. All (future) audio recording " +
* Constructs a file name and path for an audio recording "is disabled", ioe);
*/
private String getFilePrefix( AudioPacket packet )
{
StringBuilder sb = new StringBuilder();
sb.append( SystemProperties.getInstance() if(recorder != null)
.getApplicationFolder( "recordings" ) ); {
recorder.stop();
}
}
}
}
}
}
sb.append( File.separator ); /**
* Constructs a file name and path for an audio recording
*/
private String getFilePrefix(AudioPacket packet)
{
StringBuilder sb = new StringBuilder();
Metadata systemMetadata = packet.getAudioMetadata() sb.append(SystemProperties.getInstance().getApplicationFolder("recordings"));
.getMetadata( MetadataType.SYSTEM );
sb.append( systemMetadata != null ? sb.append(File.separator);
systemMetadata.getValue() : "UNKNOWN_SYSTEM" );
Metadata toMetadata = packet.getAudioMetadata() Metadata systemMetadata = packet.getAudioMetadata().getMetadata(MetadataType.SYSTEM);
.getMetadata( MetadataType.TO );
if( toMetadata != null ) sb.append(systemMetadata != null ? systemMetadata.getValue() : "UNKNOWN_SYSTEM");
{
sb.append( "_TO_" );
sb.append( toMetadata.getValue() );
Metadata fromMetadata = packet.getAudioMetadata() Metadata toMetadata = packet.getAudioMetadata().getMetadata(MetadataType.TO);
.getMetadata( MetadataType.FROM );
if( fromMetadata != null ) if(toMetadata != null)
{ {
sb.append( "_FROM_" ); sb.append("_TO_").append(toMetadata.getValue());
sb.append( fromMetadata.getValue() );
}
}
else
{
Metadata siteMetadata = packet.getAudioMetadata()
.getMetadata( MetadataType.SITE_ID );
if( siteMetadata != null ) Metadata fromMetadata = packet.getAudioMetadata().getMetadata(MetadataType.FROM);
{
sb.append( "_" );
sb.append( siteMetadata.getValue() );
}
Metadata channelMetadata = packet.getAudioMetadata() if(fromMetadata != null)
.getMetadata( MetadataType.CHANNEL_NAME ); {
sb.append("_FROM_").append(fromMetadata.getValue());
}
}
else
{
Metadata siteMetadata = packet.getAudioMetadata().getMetadata(MetadataType.SITE_ID);
if( channelMetadata != null ) if(siteMetadata != null)
{ {
sb.append( "_" ); sb.append("_").append(siteMetadata.getValue());
sb.append( channelMetadata.getValue() ); }
}
}
return sb.toString(); Metadata channelMetadata = packet.getAudioMetadata().getMetadata(MetadataType.CHANNEL_NAME);
}
/** if(channelMetadata != null)
* Constructs a baseband recorder for use in a processing chain. {
*/ sb.append("_").append(channelMetadata.getValue());
public ComplexBufferWaveRecorder getBasebandRecorder( String channelName ) }
{ }
StringBuilder sb = new StringBuilder();
sb.append( SystemProperties.getInstance()
.getApplicationFolder( "recordings" ) );
sb.append( File.separator );
sb.append( channelName );
sb.append( "_baseband" );
return new ComplexBufferWaveRecorder( AUDIO_SAMPLE_RATE, sb.toString() ); return sb.toString();
} }
/**
* Constructs a baseband recorder for use in a processing chain.
*/
public ComplexBufferWaveRecorder getBasebandRecorder(String channelName)
{
StringBuilder sb = new StringBuilder();
sb.append(SystemProperties.getInstance().getApplicationFolder("recordings"));
sb.append(File.separator).append(channelName).append("_baseband");
return new ComplexBufferWaveRecorder(AUDIO_SAMPLE_RATE, sb.toString());
}
} }