Merge pull request #3 from sahaRatul/24bit-support

24bit support

Author: sahaRatul

src/main/java/org/sela/App.java

@@ -39,7 +39,12 @@ private static void parseCommandLineArgs(final String[] args)
         } else if (args[0].equals("-p") && args.length == 2) {
             final File inputFile = new File(args[1]);
             System.out.println("Playing: " + inputFile.getAbsolutePath());
-            playFile(inputFile);
+            playSelaFile(inputFile);
+            System.out.println("");
+        } else if(args[0].equals("-w") && args.length == 2) {
+            final File inputFile = new File(args[1]);
+            System.out.println("Playing: " + inputFile.getAbsolutePath());
+            playWavFile(inputFile);
             System.out.println("");
         } else {
             System.out.println("Invalid arguments...");
@@ -61,11 +66,16 @@ private static void decodeFile(final File inputFile, final File outputFile) thro
         wavFile.writeToStream();
     }
 
-    private static void playFile(final File inputFile) throws IOException, FileException, LineUnavailableException, InterruptedException {
+    private static void playSelaFile(final File inputFile) throws IOException, FileException, LineUnavailableException, InterruptedException {
         final Player selaPlayer = new Player(inputFile);
         selaPlayer.play();
     }
 
+    private static void playWavFile(final File inputFile) throws IOException, FileException, LineUnavailableException, InterruptedException {
+        final WavPlayer wavPlayer = new WavPlayer(inputFile);
+        wavPlayer.play();
+    }
+
     private static void printUsage() {
         System.out.println("");
         System.out.println("Usage:");
@@ -76,8 +86,11 @@ private static void printUsage() {
         System.out.println("Decoding a file:");
         System.out.println("java -jar sela.jar -d path/to/input.sela path/to/output.wav");
         System.out.println("");
-        System.out.println("Playing a file:");
+        System.out.println("Playing a sela file:");
         System.out.println("java -jar sela.jar -p path/to/input.sela");
         System.out.println("");
+        System.out.println("Playing a sela file:");
+        System.out.println("java -jar sela.jar -w path/to/input.wav");
+        System.out.println("");
     }
 }

src/main/java/org/sela/Encoder.java

@@ -32,7 +32,7 @@ private void readSamples() {
         for (int i = 0; i < frameCount; i++) {
             final int[][] samples = new int[wavFile.getNumChannels()][samplePerSubFrame];
             wavFile.readFrames(samples, samplePerSubFrame);
-            wavFrames.add(new WavFrame(i, samples));
+            wavFrames.add(new WavFrame(i, samples, (byte)wavFile.getBitsPerSample()));
         }
     }
 

src/main/java/org/sela/Player.java

@@ -41,8 +41,9 @@ public void play() throws LineUnavailableException, InterruptedException {
         printThread.start();
 
         // Output wave form repeatedly
+        byte bytesPerSample = (byte) ((byte) decoder.selaFile.getBitsPerSample() / 8);
         for (int i = 0; i < wavFrames.size(); i++) {
-            final byte[] bytes = wavFrames.get(i).getDemuxedShortSamplesInByteArray();
+            final byte[] bytes = wavFrames.get(i).getDemuxedSamplesInByteArray(bytesPerSample);
             line.write(bytes, 0, bytes.length);
             progress.current++;
         }

src/main/java/org/sela/WavPlayer.java

@@ -0,0 +1,72 @@
+package org.sela;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.DataLine;
+import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.SourceDataLine;
+
+import org.sela.data.Progress;
+import org.sela.data.WavFile;
+import org.sela.data.WavFrame;
+import org.sela.exception.FileException;
+import org.sela.utils.ProgressPrinter;
+
+public class WavPlayer {
+    private final WavFile wavFile;
+    private List<WavFrame> wavFrames;
+    private int frameCount;
+    private final int samplePerSubFrame = 2048;
+
+    public WavPlayer(final File inputFile) throws IOException, FileException {
+        wavFile = new WavFile(inputFile);
+    }
+
+    private void readSamples() {
+        final long sampleCount = wavFile.getSampleCount();
+        frameCount = (int) Math.ceil((double) sampleCount / (samplePerSubFrame * wavFile.getNumChannels()));
+        wavFrames = new ArrayList<>(frameCount);
+
+        for (int i = 0; i < frameCount; i++) {
+            final int[][] samples = new int[wavFile.getNumChannels()][samplePerSubFrame];
+            wavFile.readFrames(samples, samplePerSubFrame);
+            wavFrames.add(new WavFrame(i, samples, (byte) wavFile.getBitsPerSample()));
+        }
+    }
+
+    public void play() throws LineUnavailableException, InterruptedException, FileException, IOException {
+        readSamples();
+
+        // Select audio format parameters
+        final AudioFormat af = new AudioFormat(wavFile.getSampleRate(), wavFile.getBitsPerSample(),
+                wavFile.getNumChannels(), true, false);
+        final DataLine.Info info = new DataLine.Info(SourceDataLine.class, af);
+        final SourceDataLine line = (SourceDataLine) AudioSystem.getLine(info);
+
+        // Prepare audio output
+        line.open(af, 2048 * wavFile.getNumChannels());
+        line.start();
+
+        // Prepare print thread
+        final Progress progress = new Progress(wavFrames.size());
+        final Thread printThread = new Thread(new ProgressPrinter(progress));
+        printThread.start();
+
+        // Output wave form repeatedly
+        byte bytesPerSample = (byte) ((byte) wavFile.getBitsPerSample() / 8);
+        for (int i = 0; i < wavFrames.size(); i++) {
+            final byte[] bytes = wavFrames.get(i).getDemuxedSamplesInByteArray(bytesPerSample);
+            line.write(bytes, 0, bytes.length);
+            progress.current++;
+        }
+        printThread.join();
+        line.drain();
+        line.stop();
+        line.close();
+    }
+}

src/main/java/org/sela/data/DataSubChunk.java

@@ -4,12 +4,17 @@
 
 public class DataSubChunk extends SubChunk {
     public int[] samples;
+    private final byte bitsPerSample;
+
+    public DataSubChunk(final byte bitsPerSample) {
+        this.bitsPerSample = bitsPerSample;
+    }
 
     public void validate() throws FileException {
         if(!super.subChunkId.equals("data")) {
             throw new FileException("Invalid subChunkId for data");
         }
-        if(super.subChunkSize != (samples.length * 2)) {
+        if(super.subChunkSize != (samples.length * (bitsPerSample / 8))) {
             throw new FileException("Invalid subChunkSize for data");
         }
     }

src/main/java/org/sela/data/FormatSubChunk.java

@@ -14,14 +14,8 @@ public void validate() throws FileException {
         if(!super.subChunkId.equals("fmt ")) {
             throw new FileException("Invalid subChunkId for fmt");
         }
-        else if(super.subChunkSize != 16) {
-            throw new FileException("Invalid subChunk size");
-        }
-        else if(audioFormat != 1) {
-            throw new FileException("Invalid audioFormat");
-        }
         else if(bitsPerSample != 16) {
-            throw new FileException("Only 16bit PCM supported");
+            throw new FileException("Only 16bit LE PCM supported");
         }
     }
 }

src/main/java/org/sela/data/Frame.java

@@ -6,21 +6,28 @@
 public final class Frame implements Comparable<Frame> {
     public final int syncWord = 0xAA55FF00;
     public ArrayList<SubFrame> subFrames;
+    private final byte bitsPerSample; //For internal reference, not to be written on output
     private final int index; // For internal sorting, not to be written to output
 
-    public Frame(final ArrayList<SubFrame> subFrames, final int index) {
+    public Frame(final ArrayList<SubFrame> subFrames, final byte bitsPerSample, final int index) {
         this.subFrames = subFrames;
+        this.bitsPerSample = bitsPerSample;
         this.index = index;
     }
 
-    public Frame(final int index) {
+    public Frame(final int index, final byte bitsPerSample) {
         this.index = index;
+        this.bitsPerSample = bitsPerSample;
     }
 
     public int getIndex() {
         return index;
     }
 
+    public byte getBitsPerSample() {
+        return bitsPerSample;
+    }
+
     @Override
     public int compareTo(final Frame frame) {
         return this.index - frame.index;

src/main/java/org/sela/data/LpcDecodedData.java

@@ -1,9 +1,11 @@
 package org.sela.data;
 
 public final class LpcDecodedData {
-    public int[] samples;
+    public final int[] samples;
+    public final byte bitsPerSample;
 
-    public LpcDecodedData(final int[] samples) {
+    public LpcDecodedData(final int[] samples, final byte bitsPerSample) {
         this.samples = samples;
+        this.bitsPerSample = bitsPerSample;
     }
 }

src/main/java/org/sela/data/LpcEncodedData.java

@@ -1,13 +1,15 @@
 package org.sela.data;
 
 public final class LpcEncodedData {
-    public byte optimalLpcOrder;
-    public int[] quantizedReflectionCoefficients;
-    public int[] residues;
+    public final byte optimalLpcOrder;
+    public final byte bitsPerSample;
+    public final int[] quantizedReflectionCoefficients;
+    public final int[] residues;
 
-    public LpcEncodedData(final byte optimalLpcOrder, final int[] quantizedReflectionCoefficients,
+    public LpcEncodedData(final byte optimalLpcOrder, final byte bitsPerSample, final int[] quantizedReflectionCoefficients,
             final int[] residues) {
         this.optimalLpcOrder = optimalLpcOrder;
+        this.bitsPerSample = bitsPerSample;
         this.quantizedReflectionCoefficients = quantizedReflectionCoefficients;
         this.residues = residues;
     }

src/main/java/org/sela/data/SelaFile.java

@@ -71,7 +71,7 @@ private void read(final ByteBuffer buffer) throws FileException {
             if (sync != 0xAA55FF00) {
                 break;
             }
-            final Frame frame = new Frame(i);
+            final Frame frame = new Frame(i, (byte)bitsPerSample);
             frame.subFrames = new ArrayList<>(2);
 
             // Read subframes