Allow SpeedTimeInterpolator reuse (#199)

* Allow SpeedTimeInterpolator reuse * Minor fixes
deepmedia · Aug 11, 2024 · 0a415ba · 0a415ba
1 parent 4ea35f4
commit 0a415ba
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 28 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/lib/src/androidTest/java/com/otaliastudios/transcoder/integration/IssuesTests.kt b/lib/src/androidTest/java/com/otaliastudios/transcoder/integration/IssuesTests.kt
@@ -69,21 +69,21 @@ class IssuesTests {
         transcode {
             addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
             addDataSource(input("0.amr"))
-            addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
+            addDataSource(ClipDataSource(input("main.mp3"), 2000_000L, 3000_000L))
             addDataSource(input("1.amr"))
-            addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
+            addDataSource(ClipDataSource(input("main.mp3"), 4000_000L, 5000_000L))
             addDataSource(input("2.amr"))
-            addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
+            addDataSource(ClipDataSource(input("main.mp3"), 6000_000L, 7000_000L))
             addDataSource(input("3.amr"))
-            addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
+            addDataSource(ClipDataSource(input("main.mp3"), 8000_000L, 9000_000L))
             addDataSource(input("4.amr"))
-            addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
+            addDataSource(ClipDataSource(input("main.mp3"), 10000_000L, 11000_000L))
             addDataSource(input("5.amr"))
-            addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
+            addDataSource(ClipDataSource(input("main.mp3"), 12000_000L, 13000_000L))
             addDataSource(input("6.amr"))
-            addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
+            addDataSource(ClipDataSource(input("main.mp3"), 14000_000L, 15000_000L))
             addDataSource(input("7.amr"))
-            addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
+            addDataSource(ClipDataSource(input("main.mp3"), 16000_000L, 17000_000L))
             addDataSource(input("8.amr"))
         }
         Unit

diff --git a/lib/src/main/java/com/otaliastudios/transcoder/internal/audio/remix/AudioRemixer.kt b/lib/src/main/java/com/otaliastudios/transcoder/internal/audio/remix/AudioRemixer.kt
@@ -24,7 +24,7 @@ internal interface AudioRemixer {
     companion object {
         internal operator fun get(inputChannels: Int, outputChannels: Int): AudioRemixer = when {
             inputChannels !in setOf(1, 2) -> error("Input channel count not supported: $inputChannels")
-            outputChannels !in setOf(1, 2) -> error("Input channel count not supported: $inputChannels")
+            outputChannels !in setOf(1, 2) -> error("Output channel count not supported: $inputChannels")
             inputChannels < outputChannels -> UpMixAudioRemixer()
             inputChannels > outputChannels -> DownMixAudioRemixer()
             else -> PassThroughAudioRemixer()

diff --git a/lib/src/main/java/com/otaliastudios/transcoder/internal/transcode/DefaultTranscodeEngine.kt b/lib/src/main/java/com/otaliastudios/transcoder/internal/transcode/DefaultTranscodeEngine.kt
@@ -61,10 +61,10 @@ internal class DefaultTranscodeEngine(
     }
 
     private fun createPipeline(
-            type: TrackType,
-            index: Int,
-            status: TrackStatus,
-            outputFormat: MediaFormat
+        type: TrackType,
+        index: Int,
+        status: TrackStatus,
+        outputFormat: MediaFormat
     ): Pipeline {
         log.w("createPipeline($type, $index, $status), format=$outputFormat")
         val interpolator = timer.interpolator(type, index)

diff --git a/lib/src/main/java/com/otaliastudios/transcoder/sink/DefaultDataSink.java b/lib/src/main/java/com/otaliastudios/transcoder/sink/DefaultDataSink.java
@@ -100,9 +100,7 @@ public void setOrientation(int rotation) {
 
     @Override
     public void setLocation(double latitude, double longitude) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            mMuxer.setLocation((float) latitude, (float) longitude);
-        }
+        mMuxer.setLocation((float) latitude, (float) longitude);
     }
 
     @Override

diff --git a/lib/src/main/java/com/otaliastudios/transcoder/time/SpeedTimeInterpolator.java b/lib/src/main/java/com/otaliastudios/transcoder/time/SpeedTimeInterpolator.java
@@ -38,7 +38,7 @@ public SpeedTimeInterpolator(float factor) {
      * @return the factor
      */
     @SuppressWarnings("unused")
-    public float getFactor() {
+    public float getFactor(@NonNull TrackType type, long time) {
         return (float) mFactor;
     }
 
@@ -50,7 +50,7 @@ public long interpolate(@NonNull TrackType type, long time) {
             data.lastCorrectedTime = time;
         } else {
             long realDelta = time - data.lastRealTime;
-            long correctedDelta = (long) ((double) realDelta / mFactor);
+            long correctedDelta = (long) ((double) realDelta / getFactor(type, time));
             data.lastRealTime = time;
             data.lastCorrectedTime += correctedDelta;
         }