Reassign TrackStatus in some conditions

natario1 · natario1 · commit b63d010b03d5 · 2021-03-17T20:26:52.000+01:00
diff --git a/lib/src/main/java/com/otaliastudios/transcoder/internal/DefaultEngine.kt b/lib/src/main/java/com/otaliastudios/transcoder/internal/DefaultEngine.kt
@@ -31,7 +31,7 @@ internal class DefaultEngine(
 
     private val log = Logger("DefaultEngine")
 
-    private val tracks = Tracks(strategies, dataSources)
+    private val tracks = Tracks(strategies, dataSources, videoRotation)
 
     private val segments = Segments(dataSources, tracks, ::createPipeline)
 
@@ -78,11 +78,7 @@ internal class DefaultEngine(
     }
 
     override fun validate(): Boolean {
-        // If we have to apply some rotation, and the video should be transcoded,
-        // ignore any Validator trying to abort the operation. The operation must happen
-        // because we must apply the rotation.
-        val ignoreValidatorResult = tracks.active.hasVideo && videoRotation != 0
-        if (!validator.validate(tracks.all.video, tracks.all.audio) && !ignoreValidatorResult) {
+        if (!validator.validate(tracks.all.video, tracks.all.audio)) {
             LOG.i("Validator has decided that the input is fine and transcoding is not necessary.")
             return false
         }
diff --git a/lib/src/main/java/com/otaliastudios/transcoder/internal/Tracks.kt b/lib/src/main/java/com/otaliastudios/transcoder/internal/Tracks.kt
@@ -12,7 +12,8 @@ import com.otaliastudios.transcoder.strategy.TrackStrategy
 
 internal class Tracks(
         strategies: TrackMap<TrackStrategy>,
-        sources: DataSources
+        sources: DataSources,
+        videoRotation: Int
 ) {
 
     private val log = Logger("Tracks")
@@ -26,7 +27,10 @@ internal class Tracks(
         val (videoFormat, videoStatus) = resolveTrack(TrackType.VIDEO, strategies.video, sources.videoOrNull())
         log.i("init: videoStatus=$videoStatus, videoFormat=$videoFormat")
         log.i("init: audioStatus=$audioStatus, audioFormat=$audioFormat")
-        all = trackMapOf(video = videoStatus, audio = audioStatus)
+        all = trackMapOf(
+                video = resolveVideoStatus(videoStatus, videoRotation),
+                audio = audioStatus
+        )
         outputFormats = trackMapOf(video = videoFormat, audio = audioFormat)
     }
 
@@ -35,6 +39,12 @@ internal class Tracks(
             audio = all.audio.takeIf { it.isTranscoding }
     )
 
+    private fun resolveVideoStatus(status: TrackStatus, rotation: Int): TrackStatus {
+        return if (status == TrackStatus.PASS_THROUGH && rotation != 0) {
+            TrackStatus.COMPRESSING
+        } else status
+    }
+
     private fun resolveTrack(
             type: TrackType,
             strategy: TrackStrategy,
