Merge pull request #4 from abeluck/sox

Simple sox support (w/ crossfader)

Author: n8fr8

res/raw/sox.mp3

@@ -0,0 +1 @@
+../../external/android-ffmpeg/data/data/info.guardianproject.ffmpeg/app_opt/bin/sox

src/net/sourceforge/sox/CrossfadeCat.java

@@ -0,0 +1,117 @@
+package net.sourceforge.sox;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import android.util.Log;
+
+/**
+ * Concatenates two files together with a crossfade of user
+ * defined length.
+ *
+ * It is a Java port of the scripts/crossfade_cat.sh script
+ * in the sox source tree.
+ *
+ * Original script by Kester Clegg, with modifications by Chris
+ * Bagwell.
+ *
+ * @author Abel Luck
+ *
+ */
+// TODO make runnable?
+public class CrossfadeCat {
+	private final static String TAG = "SOX-XFADE";
+	private	SoxController mController;
+	private String mFirstFile;
+	private String mSecondFile;
+	private double mFadeLength;
+	private String mFinalMix;
+	private ArrayList<String> mTemporaryFiles = new ArrayList<String>();;
+
+	public CrossfadeCat(SoxController controller, String firstFile, String secondFile, double fadeLength, String outFile) {
+		mController = controller;
+		mFirstFile = firstFile;
+		mSecondFile = secondFile;
+		mFadeLength = fadeLength;
+		mFinalMix = outFile;
+	}
+
+	public boolean start() {
+		// find length of first file
+		double length = mController.getLength(mFirstFile);
+
+		double trimLength = length - mFadeLength;
+		String trimLengthStr = mController.formatTimePeriod(trimLength);
+		String fadeLengthStr = mController.formatTimePeriod(mFadeLength);
+
+		// Obtain trimLength seconds of fade out position from the first File
+		String trimmedOne = mController.trimAudio(mFirstFile, trimLengthStr, null);
+		if( trimmedOne == null )
+			return abort();
+		mTemporaryFiles.add(trimmedOne);
+
+		// We assume a fade out is needed (i.e., firstFile doesn't already fade out)
+
+		String fadedOne = mController.fadeAudio(trimmedOne, "t", "0", fadeLengthStr, fadeLengthStr);
+		if( fadedOne == null )
+			return abort();
+		mTemporaryFiles.add(fadedOne);
+
+		// Get crossfade section from the second file
+		String trimmedTwo = mController.trimAudio(mSecondFile, "0", fadeLengthStr);
+		if( trimmedTwo == null )
+			return abort();
+		mTemporaryFiles.add(trimmedTwo);
+
+		String fadedTwo = mController.fadeAudio(trimmedTwo, "t", fadeLengthStr, null, null);
+		if( fadedTwo == null )
+			return abort();
+		mTemporaryFiles.add(fadedTwo);
+
+		// Mix crossfaded files together at full volume
+		ArrayList<String> files = new ArrayList<String>();
+		files.add(fadedOne);
+		files.add(fadedTwo);
+
+		String crossfaded = new File(mFirstFile).getAbsolutePath() + "-x-" + new File(mSecondFile).getName() +".wav";
+		crossfaded = mController.combineMix(files, crossfaded);
+		if( crossfaded == null )
+			return abort();
+		mTemporaryFiles.add(crossfaded);
+
+		// Trim off crossfade sections from originals
+		String trimmedThree = mController.trimAudio(mFirstFile, "0", trimLengthStr);
+		if( trimmedThree == null )
+			return abort();
+		mTemporaryFiles.add(trimmedThree);
+		String trimmedFour = mController.trimAudio(mSecondFile, fadeLengthStr, null);
+		if( trimmedFour == null )
+			return abort();
+		mTemporaryFiles.add(trimmedFour);
+
+		// Combine into final mix
+		files.clear();
+		files.add(trimmedThree);
+		files.add(crossfaded);
+		files.add(trimmedFour);
+		mFinalMix = mController.combine(files, mFinalMix);
+		cleanup();
+		return true;
+	}
+
+	private void cleanup() {
+		for(String file : mTemporaryFiles) {
+			File f = new File(file);
+			boolean result = f.delete();
+			if( !result )
+				Log.e(TAG, "Error, could not delete: " + file);
+		}
+	}
+
+	private boolean abort() {
+		cleanup();
+		return false;
+	}
+
+
+}