change getOrientationConfig in VideoSources

Author: pedroSG94

app/src/main/java/com/pedro/streamer/screen/ScreenService.kt

@@ -68,7 +68,7 @@ class ScreenService: Service(), ConnectChecker {
   private val width = 640
   private val height = 480
   private val vBitrate = 1200 * 1000
-  private var rotation = 0 //0 for landscape or 90 for portrait
+  private var rotation = 90 //0 for landscape or 90 for portrait
   private val sampleRate = 32000
   private val isStereo = true
   private val aBitrate = 128 * 1000
@@ -162,13 +162,6 @@ class ScreenService: Service(), ConnectChecker {
     val screenSource = ScreenSource(applicationContext, mediaProjection)
     return try {
       genericStream.changeVideoSource(screenSource)
-      //ScreenSource need use always setCameraOrientation(0) because the MediaProjection handle orientation.
-      //You also need remove autoHandleOrientation if you are using it.
-      //You need to call it after prepareVideo to override the default value.
-      //Remember call is after changeVideoSource because that method call to setCameraOrientation and produce problems
-      val isPortrait = rotation == 90 || rotation == 270
-      genericStream.getGlInterface().setIsPortrait(isPortrait)
-      genericStream.getGlInterface().setCameraOrientation(0)
       toggleAudioSource(selectedAudioSource)
       true
     } catch (ignored: IllegalArgumentException) {

encoder/src/main/java/com/pedro/encoder/input/sources/OrientationConfig.kt

@@ -0,0 +1,7 @@
+package com.pedro.encoder.input.sources
+
+data class OrientationConfig(
+    val cameraOrientation: Int? = null,
+    val isPortrait: Boolean? = null,
+    val forced: OrientationForced = OrientationForced.NONE
+)

encoder/src/main/java/com/pedro/encoder/input/sources/video/ScreenSource.kt

@@ -27,6 +27,8 @@ import android.os.HandlerThread
 import android.view.Surface
 import androidx.annotation.RequiresApi
 import com.pedro.encoder.input.sources.MediaProjectionHandler
+import com.pedro.encoder.input.sources.OrientationConfig
+import com.pedro.encoder.input.sources.OrientationForced
 
 /**
  * Created by pedro on 11/1/24.
@@ -92,6 +94,15 @@ class ScreenSource @JvmOverloads constructor(
 
   override fun isRunning(): Boolean = virtualDisplay != null
 
+  override fun getOrientationConfig(): OrientationConfig {
+    val isPortrait = rotation == 90 || rotation == 270
+    return OrientationConfig(
+      cameraOrientation = 0,
+      isPortrait = isPortrait,
+      forced = OrientationForced.NONE
+    )
+  }
+
   private fun checkResolutionSupported(width: Int, height: Int): Boolean {
     if (width % 2 != 0 || height % 2 != 0) {
       throw IllegalArgumentException("width and height values must be divisible by 2")

encoder/src/main/java/com/pedro/encoder/input/sources/video/VideoFileSource.kt

@@ -24,6 +24,7 @@ import com.pedro.encoder.CodecErrorCallback
 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.OrientationConfig
 import com.pedro.encoder.input.sources.OrientationForced
 import java.io.IOException
 
@@ -78,7 +79,7 @@ class VideoFileSource(
 
   override fun isRunning(): Boolean = running
 
-  override fun getOrientationConfig(): OrientationForced = OrientationForced.LANDSCAPE
+  override fun getOrientationConfig() = OrientationConfig(forced = OrientationForced.LANDSCAPE)
 
   fun moveTo(time: Double) {
     videoDecoder.moveTo(time)

encoder/src/main/java/com/pedro/encoder/input/sources/video/VideoSource.kt

@@ -17,6 +17,7 @@
 package com.pedro.encoder.input.sources.video
 
 import android.graphics.SurfaceTexture
+import com.pedro.encoder.input.sources.OrientationConfig
 import com.pedro.encoder.input.sources.OrientationForced
 
 /**
@@ -45,5 +46,5 @@ abstract class VideoSource {
   abstract fun stop()
   abstract fun release()
   abstract fun isRunning(): Boolean
-  open fun getOrientationConfig() = OrientationForced.NONE
+  open fun getOrientationConfig() = OrientationConfig()
 }

extra-sources/src/main/java/com/pedro/extrasources/CameraUvcSource.kt

@@ -23,6 +23,7 @@ import android.hardware.usb.UsbDevice
 import android.view.Surface
 import com.herohan.uvcapp.CameraHelper
 import com.herohan.uvcapp.ICameraHelper
+import com.pedro.encoder.input.sources.OrientationConfig
 import com.pedro.encoder.input.sources.OrientationForced
 import com.pedro.encoder.input.sources.video.VideoSource
 import com.pedro.encoder.input.video.Camera2ResolutionCalculator
@@ -65,7 +66,7 @@ class CameraUvcSource: VideoSource() {
 
   override fun isRunning(): Boolean = running
 
-  override fun getOrientationConfig(): OrientationForced = OrientationForced.LANDSCAPE
+  override fun getOrientationConfig() = OrientationConfig(forced = OrientationForced.LANDSCAPE)
 
   private val stateCallback: ICameraHelper.StateCallback = object : ICameraHelper.StateCallback {
     override fun onAttach(device: UsbDevice) {

extra-sources/src/main/java/com/pedro/extrasources/Media3VideoSource.kt

@@ -10,6 +10,7 @@ import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import com.pedro.common.frame.MediaFrame
+import com.pedro.encoder.input.sources.OrientationConfig
 import com.pedro.encoder.input.sources.OrientationForced
 import com.pedro.encoder.input.sources.video.VideoSource
 import com.pedro.extrasources.extractor.Media3Extractor
@@ -60,7 +61,7 @@ class Media3VideoSource(
 
     override fun isRunning(): Boolean = player?.isPlaying == true
 
-    override fun getOrientationConfig(): OrientationForced = OrientationForced.LANDSCAPE
+    override fun getOrientationConfig() = OrientationConfig(forced = OrientationForced.LANDSCAPE)
 
     fun getPlayer() = player
 }

library/src/main/java/com/pedro/library/base/StreamBase.kt

@@ -140,7 +140,7 @@ abstract class StreamBase(
       val isPortrait = rotation == 90 || rotation == 270
       glInterface.setIsPortrait(isPortrait)
       glInterface.setCameraOrientation(if (rotation == 0) 270 else rotation - 90)
-      glInterface.forceOrientation(videoSource.getOrientationConfig())
+      glInterface.setOrientationConfig(videoSource.getOrientationConfig())
       if (differentRecordResolution) {
         val result = videoEncoderRecord.prepareVideoEncoder(recordWidth, recordHeight, fps, recordBitrate, rotation,
           iFrameInterval, FormatVideoEncoder.SURFACE, profile, level)
@@ -383,7 +383,7 @@ abstract class StreamBase(
     videoSource.stop()
     videoSource.release()
     if (wasRunning) source.start(glInterface.surfaceTexture)
-    glInterface.forceOrientation(source.getOrientationConfig())
+    glInterface.setOrientationConfig(source.getOrientationConfig())
     videoSource = source
   }
 

library/src/main/java/com/pedro/library/view/GlStreamInterface.kt

@@ -30,6 +30,7 @@ import com.pedro.encoder.input.gl.SurfaceManager
 import com.pedro.encoder.input.gl.render.MainRender
 import com.pedro.encoder.input.gl.render.filters.BaseFilterRender
 import com.pedro.encoder.input.gl.render.filters.NoFilterRender
+import com.pedro.encoder.input.sources.OrientationConfig
 import com.pedro.encoder.input.sources.OrientationForced
 import com.pedro.encoder.input.video.CameraHelper
 import com.pedro.encoder.input.video.FpsLimiter
@@ -302,6 +303,24 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
     }
   }
 
+  fun setOrientationConfig(orientationConfig: OrientationConfig) {
+    when (orientationConfig.forced) {
+      OrientationForced.PORTRAIT, OrientationForced.LANDSCAPE -> {
+        forceOrientation(orientationConfig.forced)
+      }
+      OrientationForced.NONE -> {
+        if (orientationConfig.isPortrait == null && orientationConfig.cameraOrientation == null) {
+          forceOrientation(orientationConfig.forced)
+        } else {
+          orientationConfig.isPortrait?.let { setIsPortrait(it) }
+          orientationConfig.cameraOrientation?.let { setCameraOrientation(it) }
+          shouldHandleOrientation = false
+          this.orientationForced = orientationConfig.forced
+        }
+      }
+    }
+  }
+
   fun forceOrientation(forced: OrientationForced) {
     when (forced) {
       OrientationForced.PORTRAIT -> {