#660 Updates audio processing subsystem to use audio segments. Updates audio playback, recording and streaming to use audio segments. Adds support to UserPreferences for sound card selection and audio tone insertion during playback. Adds record preference for WAVE or MP3. Resolves issues with metadata in recordings. (#675)

src/main/java/io/github/dsheirer/audio/convert/IAudioConverter.java

@@ -18,8 +18,6 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.convert;
 
-import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
-
 import java.util.List;
 
 public interface IAudioConverter
@@ -27,7 +25,7 @@ public interface IAudioConverter
     /**
      * Converts the PCM audio packets to converted audio format.  May produce partial audio frame data.
      */
-    public byte[] convert(List<ReusableAudioPacket> audioPackets);
+    public byte[] convert(List<float[]> audioBuffers);
 
     /**
      * Finalizes audio conversion by fully converting any partial frames left in the buffer and returning the

src/main/java/io/github/dsheirer/audio/convert/MP3AudioConverter.java

@@ -20,7 +20,6 @@ package io.github.dsheirer.audio.convert;
 
 import io.github.dsheirer.audio.AudioFormats;
 import io.github.dsheirer.audio.AudioUtils;
-import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
 import net.sourceforge.lame.lowlevel.LameEncoder;
 import net.sourceforge.lame.mp3.Lame;
 import net.sourceforge.lame.mp3.MPEGMode;
@@ -54,7 +53,7 @@ public class MP3AudioConverter implements IAudioConverter
     }
 
     @Override
-    public byte[] convert(List<ReusableAudioPacket> audioPackets)
+    public byte[] convert(List<float[]> audioPackets)
     {
         mMP3Stream.reset();
 
@@ -84,6 +83,36 @@ public class MP3AudioConverter implements IAudioConverter
         }
     }
 
+    public byte[] convertAudio(List<float[]> audioBuffers)
+    {
+        mMP3Stream.reset();
+
+        byte[] pcmBytes = AudioUtils.convert(audioBuffers);
+
+        int pcmBufferSize = Math.min(mMP3Buffer.length, pcmBytes.length);
+
+        int mp3BufferSize = 0;
+
+        int pcmBytesPosition = 0;
+
+        try
+        {
+            while (0 < (mp3BufferSize = mEncoder.encodeBuffer(pcmBytes, pcmBytesPosition, pcmBufferSize, mMP3Buffer)))
+            {
+                pcmBytesPosition += pcmBufferSize;
+                pcmBufferSize = Math.min(mMP3Buffer.length, pcmBytes.length - pcmBytesPosition);
+                mMP3Stream.write(mMP3Buffer, 0, mp3BufferSize);
+            }
+
+            return mMP3Stream.toByteArray();
+        }
+        catch(Exception e)
+        {
+            mLog.error("There was an error converting audio to MP3: " + e.getMessage());
+            return new byte[0];
+        }
+    }
+
     @Override
     public byte[] flush()
     {

src/main/java/io/github/dsheirer/audio/convert/MP3SilenceGenerator.java

@@ -18,9 +18,6 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.convert;
 
-import io.github.dsheirer.record.mp3.MP3Recorder;
-import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
-import io.github.dsheirer.sample.buffer.ReusableAudioPacketQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,10 +28,11 @@ import java.util.List;
 public class MP3SilenceGenerator implements ISilenceGenerator
 {
     private final static Logger mLog = LoggerFactory.getLogger(MP3SilenceGenerator.class);
+    public static final int MP3_BIT_RATE = 16;
+    public static final boolean CONSTANT_BIT_RATE = false;
 
-    private MP3AudioConverter mGenerator = new MP3AudioConverter(MP3Recorder.MP3_BIT_RATE, MP3Recorder.CONSTANT_BIT_RATE);
+    private MP3AudioConverter mGenerator = new MP3AudioConverter(MP3_BIT_RATE, CONSTANT_BIT_RATE);
     private byte[] mPreviousPartialFrameData;
-    private ReusableAudioPacketQueue mAudioPacketQueue = new ReusableAudioPacketQueue("MP3 Silence Generator");
 
     /**
      * Generates MP3 audio silence frames
@@ -46,13 +44,10 @@ public class MP3SilenceGenerator implements ISilenceGenerator
     public byte[] generate(long duration)
     {
         int length = (int)(duration * 8);   //8000 Hz sample rate
-        ReusableAudioPacket silencePacket = mAudioPacketQueue.getBuffer(length);
-        Arrays.fill(silencePacket.getAudioSamples(), 0.0f);
 
-        List<ReusableAudioPacket> silencePackets = new ArrayList<>();
-        silencePackets.add(silencePacket);
-
-        byte[] frameData = mGenerator.convert(silencePackets);
+        List<float[]> silenceBuffers = new ArrayList<>();
+        silenceBuffers.add(new float[length]);
+        byte[] frameData = mGenerator.convert(silenceBuffers);
 
         frameData = merge(mPreviousPartialFrameData, frameData);
 

src/main/java/io/github/dsheirer/audio/convert/thumbdv/ThumbDv.java

@@ -36,8 +36,8 @@ import io.github.dsheirer.audio.convert.thumbdv.message.response.DecodeSpeechRes
 import io.github.dsheirer.audio.convert.thumbdv.message.response.ReadyResponse;
 import io.github.dsheirer.audio.convert.thumbdv.message.response.SetVocoderParameterResponse;
 import io.github.dsheirer.sample.Listener;
-import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
-import io.github.dsheirer.sample.buffer.ReusableAudioPacketQueue;
+import io.github.dsheirer.sample.buffer.ReusableBufferQueue;
+import io.github.dsheirer.sample.buffer.ReusableFloatBuffer;
 import io.github.dsheirer.util.ThreadPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,14 +82,14 @@ public class ThumbDv implements AutoCloseable
     private ScheduledFuture mAudioDecodeProcessorHandle;
     private LinkedTransferQueue<DecodeSpeechRequest> mDecodeSpeechRequests = new LinkedTransferQueue<>();
     private AudioProtocol mAudioProtocol;
-    private Listener<ReusableAudioPacket> mAudioPacketListener;
-    private ReusableAudioPacketQueue mReusableAudioPacketQueue = new ReusableAudioPacketQueue("ThumbDv");
+    private Listener<ReusableFloatBuffer> mAudioBufferListener;
+    private ReusableBufferQueue mReusableBufferQueue = new ReusableBufferQueue("ThumbDv");
     private boolean mStarted;
 
-    public ThumbDv(AudioProtocol audioProtocol, Listener<ReusableAudioPacket> listener)
+    public ThumbDv(AudioProtocol audioProtocol, Listener<ReusableFloatBuffer> listener)
     {
         mAudioProtocol = audioProtocol;
-        mAudioPacketListener = listener;
+        mAudioBufferListener = listener;
     }
 
     /**
@@ -206,12 +206,11 @@ public class ThumbDv implements AutoCloseable
     {
         AmbeMessage message = AmbeMessageFactory.getMessage(bytes);
 
-        if(message instanceof DecodeSpeechResponse && mAudioPacketListener != null)
+        if(message instanceof DecodeSpeechResponse && mAudioBufferListener != null)
         {
             float[] samples = ((DecodeSpeechResponse)message).getSamples();
-            ReusableAudioPacket audioPacket = mReusableAudioPacketQueue.getBuffer(samples.length);
-            audioPacket.loadAudioFrom(samples);
-            mAudioPacketListener.receive(audioPacket);
+            ReusableFloatBuffer audioBuffer = mReusableBufferQueue.getBuffer(samples, System.currentTimeMillis());
+            mAudioBufferListener.receive(audioBuffer);
         }
         else if(message instanceof ReadyResponse && mAudioDecodeProcessorHandle == null)
         {
@@ -457,7 +456,7 @@ public class ThumbDv implements AutoCloseable
 
         mLog.debug("Starting thumb dv thread(s)");
 
-        final Listener<ReusableAudioPacket> listener = reusableAudioPacket -> {
+        final Listener<ReusableFloatBuffer> listener = reusableAudioPacket -> {
             mLog.info("Got an audio packet!");
             reusableAudioPacket.decrementUserCount();
         };