Fix Trim initialization

Author: natario1

demo/src/main/java/com/otaliastudios/transcoder/demo/TranscoderActivity.java

@@ -6,6 +6,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.widget.EditText;
@@ -20,8 +21,6 @@
 import com.otaliastudios.transcoder.common.TrackStatus;
 import com.otaliastudios.transcoder.common.TrackType;
 import com.otaliastudios.transcoder.internal.utils.Logger;
-import com.otaliastudios.transcoder.sink.DataSink;
-import com.otaliastudios.transcoder.sink.DefaultDataSink;
 import com.otaliastudios.transcoder.source.DataSource;
 import com.otaliastudios.transcoder.source.TrimDataSource;
 import com.otaliastudios.transcoder.source.UriDataSource;
@@ -108,9 +107,10 @@ protected void onCreate(Bundle savedInstanceState) {
         mButtonView = findViewById(R.id.button);
         mButtonView.setOnClickListener(v -> {
             if (!mIsTranscoding) {
-                startActivityForResult(new Intent(Intent.ACTION_GET_CONTENT)
-                        .setType("video/*")
-                        .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true), REQUEST_CODE_PICK);
+                Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Video.Media.EXTERNAL_CONTENT_URI)
+                        .setDataAndType(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "video/*")
+                        .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+                startActivityForResult(intent, REQUEST_CODE_PICK);
             } else {
                 mTranscodeFuture.cancel(true);
             }
@@ -239,17 +239,17 @@ protected void onActivityResult(int requestCode, int resultCode, final Intent da
         if (requestCode == REQUEST_CODE_PICK
                 && resultCode == RESULT_OK
                 && data != null) {
-            if (data.getData() != null) {
-                mTranscodeInputUri1 = data.getData();
-                mTranscodeInputUri2 = null;
-                mTranscodeInputUri3 = null;
-                transcode();
-            } else if (data.getClipData() != null) {
+            if (data.getClipData() != null) {
                 ClipData clipData = data.getClipData();
                 mTranscodeInputUri1 = clipData.getItemAt(0).getUri();
                 mTranscodeInputUri2 = clipData.getItemCount() >= 2 ? clipData.getItemAt(1).getUri() : null;
                 mTranscodeInputUri3 = clipData.getItemCount() >= 3 ? clipData.getItemAt(2).getUri() : null;
                 transcode();
+            } else if (data.getData() != null) {
+                mTranscodeInputUri1 = data.getData();
+                mTranscodeInputUri2 = null;
+                mTranscodeInputUri3 = null;
+                transcode();
             }
         }
         if (requestCode == REQUEST_CODE_PICK_AUDIO
@@ -294,9 +294,8 @@ private void transcode() {
         // Launch the transcoding operation.
         mTranscodeStartTime = SystemClock.uptimeMillis();
         setIsTranscoding(true);
-        DataSink sink = new DefaultDataSink(mTranscodeOutputFile.getAbsolutePath());
         LOG.e("Building transcoding options...");
-        TranscoderOptions.Builder builder = Transcoder.into(sink);
+        TranscoderOptions.Builder builder = Transcoder.into(mTranscodeOutputFile.getAbsolutePath());
         if (mAudioReplacementUri == null) {
             if (mTranscodeInputUri1 != null) {
                 DataSource source = new UriDataSource(this, mTranscodeInputUri1);

lib/src/main/java/com/otaliastudios/transcoder/internal/codec/Encoder.kt

@@ -82,6 +82,7 @@ internal class Encoder(
                 State.Wait
             }
             INFO_OUTPUT_FORMAT_CHANGED -> {
+                log.i("INFO_OUTPUT_FORMAT_CHANGED! format=${codec.outputFormat}")
                 next.handleFormat(codec.outputFormat)
                 State.Retry
             }

lib/src/main/java/com/otaliastudios/transcoder/internal/data/Bridge.kt

@@ -4,12 +4,14 @@ import android.media.MediaCodec
 import android.media.MediaFormat
 import com.otaliastudios.transcoder.internal.pipeline.State
 import com.otaliastudios.transcoder.internal.pipeline.Step
+import com.otaliastudios.transcoder.internal.utils.Logger
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 
 internal class Bridge(private val format: MediaFormat)
     : Step<ReaderData, ReaderChannel, WriterData, WriterChannel>, ReaderChannel {
 
+    private val log = Logger("Bridge")
     private val bufferSize = format.getInteger(MediaFormat.KEY_MAX_INPUT_SIZE)
     private val buffer = ByteBuffer.allocateDirect(bufferSize).order(ByteOrder.nativeOrder())
     override val channel = this
@@ -20,6 +22,7 @@ internal class Bridge(private val format: MediaFormat)
     }
 
     override fun initialize(next: WriterChannel) {
+        log.i("initialize(): format=$format")
         next.handleFormat(format)
     }
 

lib/src/main/java/com/otaliastudios/transcoder/internal/data/Writer.kt

@@ -6,6 +6,7 @@ import com.otaliastudios.transcoder.common.TrackType
 import com.otaliastudios.transcoder.internal.pipeline.Channel
 import com.otaliastudios.transcoder.internal.pipeline.State
 import com.otaliastudios.transcoder.internal.pipeline.Step
+import com.otaliastudios.transcoder.internal.utils.Logger
 import com.otaliastudios.transcoder.sink.DataSink
 import java.nio.ByteBuffer
 
@@ -27,9 +28,11 @@ internal class Writer(
 
     override val channel = this
 
+    private val log = Logger("Writer")
     private val info = MediaCodec.BufferInfo()
 
     override fun handleFormat(format: MediaFormat) {
+        log.i("handleFormat($format)")
         sink.setTrackFormat(track, format)
     }
 

lib/src/main/java/com/otaliastudios/transcoder/sink/DefaultDataSink.java

@@ -111,6 +111,7 @@ public void setTrackStatus(@NonNull TrackType type, @NonNull TrackStatus status)
 
     @Override
     public void setTrackFormat(@NonNull TrackType type, @NonNull MediaFormat format) {
+        LOG.i("setTrackFormat(" + type + ") format=" + format);
         boolean shouldValidate = mStatus.get(type) == TrackStatus.COMPRESSING;
         if (shouldValidate) {
             mMuxerChecks.checkOutputFormat(type, format);

lib/src/main/java/com/otaliastudios/transcoder/source/DataSourceWrapper.java

@@ -10,7 +10,8 @@
 
 /**
  * A {@link DataSource} wrapper that simply delegates all methods to the
- * wrapped source.
+ * wrapped source. It is the implementor responsibility to care about the case where
+ * the wrapped source is already initialized, in case they are overriding initialize.
  */
 public class DataSourceWrapper implements DataSource {
 
@@ -90,7 +91,10 @@ public boolean isInitialized() {
 
     @Override
     public void initialize() {
-        mSource.initialize();
+        // Make it easier for subclasses to put their logic in initialize safely.
+        if (!mSource.isInitialized()) {
+            mSource.initialize();
+        }
     }
 
     @Override

lib/src/main/java/com/otaliastudios/transcoder/source/TrimDataSource.java

@@ -15,8 +15,8 @@ public class TrimDataSource extends DataSourceWrapper {
     private final long trimStartUs;
     private final long trimEndUs;
 
-    private long extraDurationUs;
-    private long trimDurationUs;
+    private long extraDurationUs = 0;
+    private long trimDurationUs = Long.MIN_VALUE;
     private boolean trimDone = false;
 
     @SuppressWarnings("WeakerAccess")
@@ -34,6 +34,18 @@ public TrimDataSource(@NonNull DataSource source, long trimStartUs, long trimEnd
         this.trimEndUs = trimEndUs;
     }
 
+    @Override
+    public boolean isInitialized() {
+        return super.isInitialized() && trimDurationUs != Long.MIN_VALUE;
+    }
+
+    @Override
+    public void deinitialize() {
+        super.deinitialize();
+        trimDurationUs = Long.MIN_VALUE;
+        trimDone = false;
+    }
+
     @Override
     public void initialize() {
         super.initialize();
@@ -80,10 +92,4 @@ public long seekTo(long desiredPositionUs) {
         long superReceivedUs = getSource().seekTo(superDesiredUs);
         return superReceivedUs - trimStartUs;
     }
-
-    @Override
-    public void deinitialize() {
-        super.deinitialize();
-        trimDone = false;
-    }
 }