Change namespace and structure of remixer

Author: ypresto

lib/src/main/java/net/ypresto/androidtranscoder/engine/AudioChannel.java

@@ -4,7 +4,6 @@
 import android.media.MediaFormat;
 
 import net.ypresto.androidtranscoder.compat.MediaCodecBufferCompatWrapper;
-import net.ypresto.androidtranscoder.utils.AudioConversionUtils;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -43,7 +42,7 @@ private static class AudioBuffer {
     private int mInputChannelCount;
     private int mOutputChannelCount;
 
-    private AudioConversionUtils.Remixer mRemixer;
+    private AudioRemixer mRemixer;
 
     private final MediaCodecBufferCompatWrapper mDecoderBuffers;
     private final MediaCodecBufferCompatWrapper mEncoderBuffers;
@@ -83,11 +82,11 @@ public void setActualDecodedFormat(final MediaFormat decodedFormat) {
         }
 
         if (mInputChannelCount > mOutputChannelCount) {
-            mRemixer = AudioConversionUtils.REMIXER_DOWNMIX;
+            mRemixer = AudioRemixer.DOWNMIX;
         } else if (mInputChannelCount < mOutputChannelCount) {
-            mRemixer = AudioConversionUtils.REMIXER_UPMIX;
+            mRemixer = AudioRemixer.UPMIX;
         } else {
-            mRemixer = AudioConversionUtils.REMIXER_PASSTHROUGH;
+            mRemixer = AudioRemixer.PASSTHROUGH;
         }
 
         mOverflowBuffer.presentationTimeUs = 0;

lib/src/main/java/net/ypresto/androidtranscoder/utils/AudioConversionUtils.java renamed to lib/src/main/java/net/ypresto/androidtranscoder/engine/AudioRemixer.java

@@ -1,14 +1,11 @@
-package net.ypresto.androidtranscoder.utils;
+package net.ypresto.androidtranscoder.engine;
 
 import java.nio.ShortBuffer;
 
-public class AudioConversionUtils {
+public interface AudioRemixer {
+    void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff);
 
-    public interface Remixer {
-        void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff);
-    }
-
-    public static final Remixer REMIXER_DOWNMIX = new Remixer() {
+    AudioRemixer DOWNMIX = new AudioRemixer() {
         private static final int SIGNED_SHORT_LIMIT = 32768;
         private static final int UNSIGNED_SHORT_MAX = 65535;
 
@@ -43,7 +40,7 @@ public void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff) {
         }
     };
 
-    public static final Remixer REMIXER_UPMIX = new Remixer() {
+    AudioRemixer UPMIX = new AudioRemixer() {
         @Override
         public void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff) {
             // Up-mix mono to stereo
@@ -59,7 +56,7 @@ public void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff) {
         }
     };
 
-    public static final Remixer REMIXER_PASSTHROUGH = new Remixer() {
+    AudioRemixer PASSTHROUGH = new AudioRemixer() {
         @Override
         public void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff) {
             // Passthrough