Merge pull request #1745 from pedroSG94/feature/rotate-stream

allow rotate only stream (all or camera only)

Author: pedroSG94

encoder/src/main/java/com/pedro/encoder/input/gl/render/CameraRender.java

@@ -42,6 +42,8 @@ public class CameraRender extends BaseRenderOffScreen {
 
   private int[] textureID = new int[1];
   private float[] rotationMatrix = new float[16];
+  private float[] MVPMatrixPreview = new float[16];
+  private float[] rotationPreviewMatrix = new float[16];
   private float[] scaleMatrix = new float[16];
 
   private int program = -1;
@@ -52,9 +54,11 @@ public class CameraRender extends BaseRenderOffScreen {
 
   private SurfaceTexture surfaceTexture;
   private Surface surface;
+  private boolean previewMode = false;
 
   public CameraRender() {
     Matrix.setIdentityM(MVPMatrix, 0);
+    Matrix.setIdentityM(MVPMatrixPreview, 0);
     Matrix.setIdentityM(STMatrix, 0);
     float[] vertex = CameraHelper.getVerticesData();
     squareVertex = ByteBuffer.allocateDirect(vertex.length * FLOAT_SIZE_BYTES)
@@ -111,7 +115,7 @@ public void draw() {
         SQUARE_VERTEX_DATA_STRIDE_BYTES, squareVertex);
     GLES20.glEnableVertexAttribArray(aTextureCameraHandle);
 
-    GLES20.glUniformMatrix4fv(uMVPMatrixHandle, 1, false, MVPMatrix, 0);
+    GLES20.glUniformMatrix4fv(uMVPMatrixHandle, 1, false, previewMode ? MVPMatrixPreview : MVPMatrix, 0);
     GLES20.glUniformMatrix4fv(uSTMatrixHandle, 1, false, STMatrix, 0);
     //camera
     GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
@@ -144,11 +148,22 @@ public Surface getSurface() {
   }
 
   public void setRotation(int rotation) {
+    setRotationStream(rotation);
+    setRotationPreview(rotation);
+  }
+
+  public void setRotationStream(int rotation) {
     Matrix.setIdentityM(rotationMatrix, 0);
     Matrix.rotateM(rotationMatrix, 0, rotation, 0f, 0f, -1f);
     update();
   }
 
+  public void setRotationPreview(int rotation) {
+    Matrix.setIdentityM(rotationPreviewMatrix, 0);
+    Matrix.rotateM(rotationPreviewMatrix, 0, rotation, 0f, 0f, -1f);
+    update();
+  }
+
   public void setFlip(boolean isFlipHorizontal, boolean isFlipVertical) {
     Matrix.setIdentityM(scaleMatrix, 0);
     Matrix.scaleM(scaleMatrix, 0, isFlipHorizontal ? -1f : 1f, isFlipVertical ? -1f : 1f, 1f);
@@ -159,5 +174,13 @@ private void update() {
     Matrix.setIdentityM(MVPMatrix, 0);
     Matrix.multiplyMM(MVPMatrix, 0, scaleMatrix, 0, MVPMatrix, 0);
     Matrix.multiplyMM(MVPMatrix, 0, rotationMatrix, 0, MVPMatrix, 0);
+
+    Matrix.setIdentityM(MVPMatrixPreview, 0);
+    Matrix.multiplyMM(MVPMatrixPreview, 0, scaleMatrix, 0, MVPMatrixPreview, 0);
+    Matrix.multiplyMM(MVPMatrixPreview, 0, rotationPreviewMatrix, 0, MVPMatrixPreview, 0);
+  }
+
+  public void setMode(boolean previewMode) {
+    this.previewMode = previewMode;
   }
 }

encoder/src/main/java/com/pedro/encoder/input/gl/render/MainRender.kt

@@ -56,7 +56,8 @@ class MainRender {
 
   fun isReady(): Boolean = running.get()
 
-  fun drawOffScreen() {
+  fun drawOffScreen(isPreview: Boolean) {
+    cameraRender.setMode(isPreview)
     cameraRender.draw()
     for (baseFilterRender in filterRenders) baseFilterRender.draw()
   }
@@ -184,6 +185,14 @@ class MainRender {
     cameraRender.setRotation(rotation)
   }
 
+  fun setCameraRotationStream(rotation: Int) {
+    cameraRender.setRotationStream(rotation)
+  }
+
+  fun setCameraRotationPreview(rotation: Int) {
+    cameraRender.setRotationPreview(rotation)
+  }
+
   fun setCameraFlip(isFlipHorizontal: Boolean, isFlipVertical: Boolean) {
     cameraRender.setFlip(isFlipHorizontal, isFlipVertical)
   }

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

@@ -64,8 +64,8 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
   private var streamOrientation = 0
   private var previewWidth = 0
   private var previewHeight = 0
-  private var previewOrientation = 0
   private var isPortrait = false
+  private var isPortraitPreview = false
   private var orientationForced = OrientationForced.NONE
   private val filterQueue: BlockingQueue<Filter> = LinkedBlockingQueue()
   private val threadQueue = LinkedBlockingQueue<Runnable>()
@@ -85,7 +85,7 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
   private val sensorRotationManager = SensorRotationManager(context, true, true) { orientation, isPortrait ->
     if (autoHandleOrientation && shouldHandleOrientation) {
       setCameraOrientation(orientation)
-      this.isPortrait = isPortrait
+      setIsPortrait(isPortrait)
     }
   }
 
@@ -220,7 +220,7 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
     if (surfaceManager.isReady && mainRender.isReady()) {
       surfaceManager.makeCurrent()
       mainRender.updateFrame()
-      mainRender.drawOffScreen()
+      mainRender.drawOffScreen(false)
       surfaceManager.swapBuffer()
     }
 
@@ -239,6 +239,11 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
       OrientationForced.LANDSCAPE -> false
       OrientationForced.NONE -> isPortrait
     }
+    val orientationPreview = when (orientationForced) {
+      OrientationForced.PORTRAIT -> true
+      OrientationForced.LANDSCAPE -> false
+      OrientationForced.NONE -> isPortraitPreview
+    }
     // render VideoEncoder (stream and record)
     if (surfaceManagerEncoder.isReady && mainRender.isReady() && !limitFps) {
       val w = if (muteVideo) 0 else encoderWidth
@@ -270,8 +275,13 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
     if (surfaceManagerPreview.isReady && mainRender.isReady() && !limitFps) {
       val w =  if (previewWidth == 0) encoderWidth else previewWidth
       val h =  if (previewHeight == 0) encoderHeight else previewHeight
+      if (surfaceManager.isReady && mainRender.isReady()) {
+        surfaceManager.makeCurrent()
+        mainRender.drawOffScreen(true)
+        surfaceManager.swapBuffer()
+      }
       surfaceManagerPreview.makeCurrent()
-      mainRender.drawScreenPreview(w, h, orientation, aspectRatioMode, previewOrientation,
+      mainRender.drawScreenPreview(w, h, orientationPreview, aspectRatioMode, 0,
         isPreviewVerticalFlip, isPreviewHorizontalFlip)
       surfaceManagerPreview.swapBuffer()
     }
@@ -332,17 +342,30 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
   }
 
   fun setIsPortrait(isPortrait: Boolean) {
-    this.isPortrait = isPortrait
+    setPreviewIsPortrait(isPortrait)
+    setStreamIsPortrait(isPortrait)
+  }
+
+  fun setPreviewIsPortrait(isPortrait: Boolean) {
+    this.isPortraitPreview = isPortrait
   }
 
-  fun setPreviewRotation(orientation: Int) {
-    this.previewOrientation = orientation
+  fun setStreamIsPortrait(isPortrait: Boolean) {
+    this.isPortrait = isPortrait
   }
 
   fun setCameraOrientation(orientation: Int) {
     mainRender.setCameraRotation(orientation)
   }
 
+  fun setCameraPreviewOrientation(orientation: Int) {
+    mainRender.setCameraRotationPreview(orientation)
+  }
+
+  fun setCameraStreamOrientation(orientation: Int) {
+    mainRender.setCameraRotationStream(orientation)
+  }
+
   override fun setFilter(filterPosition: Int, baseFilterRender: BaseFilterRender) {
     filterQueue.add(Filter(FilterAction.SET_INDEX, filterPosition, baseFilterRender))
   }
@@ -372,7 +395,7 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
   }
 
   override fun setRotation(rotation: Int) {
-    mainRender.setCameraRotation(rotation)
+    setCameraOrientation(rotation)
   }
 
   override fun forceFpsLimit(fps: Int) {

library/src/main/java/com/pedro/library/view/OpenGlView.java

@@ -256,7 +256,7 @@ private void draw(boolean forced) {
     if (surfaceManager.isReady() && mainRender.isReady()) {
       surfaceManager.makeCurrent();
       mainRender.updateFrame();
-      mainRender.drawOffScreen();
+      mainRender.drawOffScreen(false);
       if (!limitFps) {
         mainRender.drawScreen(previewWidth, previewHeight, aspectRatioMode, 0,
             isPreviewVerticalFlip, isPreviewHorizontalFlip);