Commit cf15da5

committed

Change namespace and structure of remixer

1 parent 8a30338 commit cf15da5Copy full SHA for cf15da5

File tree

+10

-14

lines changed

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

+10

-14

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`import android.media.MediaFormat;`
`5`	`5`
`6`	`6`	`import net.ypresto.androidtranscoder.compat.MediaCodecBufferCompatWrapper;`
`7`		`-import net.ypresto.androidtranscoder.utils.AudioConversionUtils;`
`8`	`7`
`9`	`8`	`import java.nio.ByteBuffer;`
`10`	`9`	`import java.nio.ByteOrder;`
`@@ -43,7 +42,7 @@ private static class AudioBuffer {`
`43`	`42`	`private int mInputChannelCount;`
`44`	`43`	`private int mOutputChannelCount;`
`45`	`44`
`46`		`- private AudioConversionUtils.Remixer mRemixer;`
	`45`	`+ private AudioRemixer mRemixer;`
`47`	`46`
`48`	`47`	`private final MediaCodecBufferCompatWrapper mDecoderBuffers;`
`49`	`48`	`private final MediaCodecBufferCompatWrapper mEncoderBuffers;`
`@@ -83,11 +82,11 @@ public void setActualDecodedFormat(final MediaFormat decodedFormat) {`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`if (mInputChannelCount > mOutputChannelCount) {`
`86`		`- mRemixer = AudioConversionUtils.REMIXER_DOWNMIX;`
	`85`	`+ mRemixer = AudioRemixer.DOWNMIX;`
`87`	`86`	`} else if (mInputChannelCount < mOutputChannelCount) {`
`88`		`- mRemixer = AudioConversionUtils.REMIXER_UPMIX;`
	`87`	`+ mRemixer = AudioRemixer.UPMIX;`
`89`	`88`	`} else {`
`90`		`- mRemixer = AudioConversionUtils.REMIXER_PASSTHROUGH;`
	`89`	`+ mRemixer = AudioRemixer.PASSTHROUGH;`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`mOverflowBuffer.presentationTimeUs = 0;`

Lines changed: 6 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,11 @@`
`1`		`-package net.ypresto.androidtranscoder.utils;`
	`1`	`+package net.ypresto.androidtranscoder.engine;`
`2`	`2`
`3`	`3`	`import java.nio.ShortBuffer;`
`4`	`4`
`5`		`-public class AudioConversionUtils {`
	`5`	`+public interface AudioRemixer {`
	`6`	`+ void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff);`
`6`	`7`
`7`		`- public interface Remixer {`
`8`		`- void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff);`
`9`		`- }`
`10`		`-`
`11`		`- public static final Remixer REMIXER_DOWNMIX = new Remixer() {`
	`8`	`+ AudioRemixer DOWNMIX = new AudioRemixer() {`
`12`	`9`	`private static final int SIGNED_SHORT_LIMIT = 32768;`
`13`	`10`	`private static final int UNSIGNED_SHORT_MAX = 65535;`
`14`	`11`
`@@ -43,7 +40,7 @@ public void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff) {`
`43`	`40`	`}`
`44`	`41`	`};`
`45`	`42`
`46`		`- publicstaticfinalRemixerREMIXER_UPMIX= new Remixer() {`
	`43`	`+ AudioRemixerUPMIX= new AudioRemixer() {`
`47`	`44`	`@Override`
`48`	`45`	`public void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff) {`
`49`	`46`	`// Up-mix mono to stereo`
`@@ -59,7 +56,7 @@ public void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff) {`
`59`	`56`	`}`
`60`	`57`	`};`
`61`	`58`
`62`		`- publicstaticfinalRemixerREMIXER_PASSTHROUGH= new Remixer() {`
	`59`	`+ AudioRemixerPASSTHROUGH= new AudioRemixer() {`
`63`	`60`	`@Override`
`64`	`61`	`public void remix(final ShortBuffer inSBuff, final ShortBuffer outSBuff) {`
`65`	`62`	`// Passthrough`

Comments

(0)