add setExtractor method

pedroSG94 · Oct 22, 2024 · f73fb36 · f73fb36
1 parent 287313e
commit f73fb36
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/encoder/src/main/java/com/pedro/encoder/input/decoder/BaseDecoder.java b/encoder/src/main/java/com/pedro/encoder/input/decoder/BaseDecoder.java
@@ -47,7 +47,7 @@ public abstract class BaseDecoder {
   protected AtomicBoolean pause = new AtomicBoolean(false);
   protected volatile boolean looped = false;
   private final DecoderInterface decoderInterface;
-  private final Extractor extractor = new AndroidExtractor();
+  private Extractor extractor = new AndroidExtractor();
 
   public BaseDecoder(DecoderInterface decoderInterface) {
     this.decoderInterface = decoderInterface;
@@ -264,4 +264,12 @@ private boolean sleep(long sleepTime) {
       return false;
     }
   }
+
+  public void setExtractor(Extractor extractor) {
+    this.extractor = extractor;
+  }
+
+  public Extractor getExtractor() {
+    return extractor;
+  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/sources/audio/AudioFileSource.kt b/encoder/src/main/java/com/pedro/encoder/input/sources/audio/AudioFileSource.kt
@@ -25,6 +25,7 @@ import com.pedro.encoder.Frame
 import com.pedro.encoder.input.audio.GetMicrophoneData
 import com.pedro.encoder.input.decoder.AudioDecoder
 import com.pedro.encoder.input.decoder.DecoderInterface
+import com.pedro.encoder.input.decoder.Extractor
 import java.io.IOException
 
 /**
@@ -125,6 +126,7 @@ class AudioFileSource(
     val isStereo = audioDecoder.isStereo
     val wasRunning = audioDecoder.isRunning
     val audioDecoder = AudioDecoder(getMicrophoneData, audioDecoderInterface, decoderInterface)
+    audioDecoder.extractor = this.audioDecoder.extractor
     if (!audioDecoder.initExtractor(context, uri)) throw IOException("Extraction failed")
     if (sampleRate != audioDecoder.sampleRate) throw IOException("SampleRate must be the same that the previous file")
     if (isStereo != audioDecoder.isStereo) throw IOException("Channels must be the same that the previous file")
@@ -161,4 +163,8 @@ class AudioFileSource(
   }
 
   fun isAudioDeviceEnabled(): Boolean = audioTrackPlayer?.playState == AudioTrack.PLAYSTATE_PLAYING
+
+  fun setExtractor(extractor: Extractor) {
+    audioDecoder.extractor = extractor
+  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/sources/video/VideoFileSource.kt b/encoder/src/main/java/com/pedro/encoder/input/sources/video/VideoFileSource.kt
@@ -21,6 +21,7 @@ import android.graphics.SurfaceTexture
 import android.net.Uri
 import android.view.Surface
 import com.pedro.encoder.input.decoder.DecoderInterface
+import com.pedro.encoder.input.decoder.Extractor
 import com.pedro.encoder.input.decoder.VideoDecoder
 import com.pedro.encoder.input.sources.OrientationForced
 import java.io.IOException
@@ -96,6 +97,7 @@ class VideoFileSource(
     val height = videoDecoder.height
     val wasRunning = videoDecoder.isRunning
     val videoDecoder = VideoDecoder(videoDecoderInterface, decoderInterface)
+    videoDecoder.extractor = this.videoDecoder.extractor
     if (!videoDecoder.initExtractor(context, uri)) throw IOException("Extraction failed")
     if (width != videoDecoder.width || height != videoDecoder.height) throw IOException("Resolution must be the same that the previous file")
     this.videoDecoder.stop()
@@ -104,5 +106,9 @@ class VideoFileSource(
       videoDecoder.prepareVideo(Surface(surfaceTexture))
       videoDecoder.start()
     }
+
+    fun setExtractor(extractor: Extractor) {
+      videoDecoder.extractor = extractor
+    }
   }
 }
diff --git a/library/src/main/java/com/pedro/library/base/FromFileBase.java b/library/src/main/java/com/pedro/library/base/FromFileBase.java
@@ -40,6 +40,7 @@
 import com.pedro.encoder.input.decoder.AudioDecoderInterface;
 import com.pedro.encoder.input.decoder.BaseDecoder;
 import com.pedro.encoder.input.decoder.DecoderInterface;
+import com.pedro.encoder.input.decoder.Extractor;
 import com.pedro.encoder.input.decoder.VideoDecoder;
 import com.pedro.encoder.input.decoder.VideoDecoderInterface;
 import com.pedro.encoder.utils.CodecUtil;
@@ -673,6 +674,7 @@ private void resetVideoDecoder(IORunnable runnable) throws IOException {
     int height = videoDecoder.getHeight();
     boolean wasRunning = videoDecoder.isRunning();
     VideoDecoder videoDecoder = new VideoDecoder(videoDecoderInterface, decoderInterface);
+    videoDecoder.setExtractor(this.videoDecoder.getExtractor());
     runnable.run(videoDecoder);
     if (width != videoDecoder.getWidth() || height != videoDecoder.getHeight()) throw new IOException("Resolution must be the same that the previous file");
     this.videoDecoder.stop();
@@ -686,6 +688,7 @@ private void resetAudioDecoder(IORunnable runnable) throws IOException {
     boolean isStereo = audioDecoder.isStereo();
     boolean wasRunning = audioDecoder.isRunning();
     AudioDecoder audioDecoder = new AudioDecoder(getMicrophoneData, audioDecoderInterface, decoderInterface);
+    audioDecoder.setExtractor(this.audioDecoder.getExtractor());
     runnable.run(audioDecoder);
     if (sampleRate != audioDecoder.getSampleRate()) throw new IOException("SampleRate must be the same that the previous file");
     if (isStereo != audioDecoder.isStereo()) throw new IOException("Channels must be the same that the previous file");
@@ -705,6 +708,14 @@ public void moveTo(double time) {
     if (audioEnabled) audioDecoder.moveTo(time);
   }
 
+  public void setVideoExtractor(Extractor extractor) {
+    videoDecoder.setExtractor(extractor);
+  }
+
+  public void setAudioExtractor(Extractor extractor) {
+    audioDecoder.setExtractor(extractor);
+  }
+
   protected abstract void onVideoInfoImp(ByteBuffer sps, ByteBuffer pps, ByteBuffer vps);
 
   protected abstract void getVideoDataImp(ByteBuffer videoBuffer, MediaCodec.BufferInfo info);