From 017124997f6c9b1e705a1fa1da219b0e7a201de4 Mon Sep 17 00:00:00 2001
From: Marcin Adamczewski <marcin.adamczewski@appunite.com>
Date: Thu, 14 May 2020 13:02:53 +0200
Subject: [PATCH 1/6] Added ability to pause and resume stream

---
 .../openglexample/OpenGlRtmpActivity.java     | 12 +++++++
 app/src/main/res/layout/activity_open_gl.xml  | 24 +++++++++++++
 app/src/main/res/values/strings.xml           |  2 ++
 .../com/pedro/encoder/video/VideoEncoder.java | 14 ++++++++
 .../pedro/rtplibrary/base/Camera1Base.java    | 34 +++++++++++++++++++
 .../pedro/rtplibrary/base/Camera2Base.java    | 30 ++++++++++++++++
 6 files changed, 116 insertions(+)

diff --git a/app/src/main/java/com/pedro/rtpstreamer/openglexample/OpenGlRtmpActivity.java b/app/src/main/java/com/pedro/rtpstreamer/openglexample/OpenGlRtmpActivity.java
index cd5edac3d0..29df95bc5c 100644
--- a/app/src/main/java/com/pedro/rtpstreamer/openglexample/OpenGlRtmpActivity.java
+++ b/app/src/main/java/com/pedro/rtpstreamer/openglexample/OpenGlRtmpActivity.java
@@ -107,6 +107,8 @@ protected void onCreate(Bundle savedInstanceState) {
     bRecord.setOnClickListener(this);
     Button switchCamera = findViewById(R.id.switch_camera);
     switchCamera.setOnClickListener(this);
+    findViewById(R.id.b_pause_stream).setOnClickListener(this);
+    findViewById(R.id.b_resume_stream).setOnClickListener(this);
     etUrl = findViewById(R.id.et_rtp_url);
     etUrl.setHint(R.string.hint_rtmp);
     rtmpCamera1 = new RtmpCamera1(openGlView, this);
@@ -407,6 +409,16 @@ public void onClick(View view) {
           Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
         }
         break;
+      case R.id.b_pause_stream:
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+          rtmpCamera1.pauseStream();
+        }
+        break;
+      case R.id.b_resume_stream:
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+          rtmpCamera1.resumeStream();
+        }
+        break;
       case R.id.b_record:
         if (!rtmpCamera1.isRecording()) {
           try {
diff --git a/app/src/main/res/layout/activity_open_gl.xml b/app/src/main/res/layout/activity_open_gl.xml
index faab5af8f1..ea701de24b 100644
--- a/app/src/main/res/layout/activity_open_gl.xml
+++ b/app/src/main/res/layout/activity_open_gl.xml
@@ -29,6 +29,30 @@
       />
 
   <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_above="@+id/bottom_buttons"
+      android:gravity="center"
+      android:orientation="horizontal">
+
+    <Button
+        android:id="@+id/b_pause_stream"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="5dp"
+        android:text="@string/pause_stream" />
+
+    <Button
+        android:id="@+id/b_resume_stream"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="5dp"
+        android:text="@string/resume_stream" />
+
+  </LinearLayout>
+
+  <LinearLayout
+      android:id="@+id/bottom_buttons"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:orientation="horizontal"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e67677645a..074b50b6ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,6 +27,8 @@
   <string name="select_file">Select file</string>
   <string name="start_record">Start record</string>
   <string name="stop_record">Stop record</string>
+  <string name="pause_stream">Pause stream</string>
+  <string name="resume_stream">Resume stream</string>
   <string name="resync_file">ReSync file</string>
   <!--menu-->
   <string name="microphone">Microphone</string>
diff --git a/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java b/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
index 8330ad48c4..1472df3571 100644
--- a/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
+++ b/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
@@ -176,6 +176,20 @@ public void run() {
     Log.i(TAG, "started");
   }
 
+  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+  public void pause() {
+    Bundle params = new Bundle();
+    params.putInt(MediaCodec.PARAMETER_KEY_SUSPEND, 1);
+    codec.setParameters(params);
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+  public void resume() {
+    Bundle params = new Bundle();
+    params.putInt(MediaCodec.PARAMETER_KEY_SUSPEND, 0);
+    codec.setParameters(params);
+  }
+
   @Override
   protected void stopImp() {
     if (handlerThread != null) {
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
index 18dbdcf70b..5d3ed81a40 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
@@ -459,6 +459,40 @@ public void startStream(String url) {
     onPreview = true;
   }
 
+  /**
+   * Pauses only video part of a stream keeping preview on.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+  public void pauseStreamVideo() {
+    videoEncoder.pause();
+  }
+
+  /**
+   * Resumes video part of a stream.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+  public void resumeStreamVideo() {
+    videoEncoder.resume();
+  }
+
+  /**
+   * Pauses both video and audio part of a stream keeping preview on.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+  public void pauseStream() {
+    pauseStreamVideo();
+    disableAudio();
+  }
+
+  /**
+   * Resumes both video and audio part of a stream.
+   */
+  @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+  public void resumeStream() {
+    resumeStreamVideo();
+    enableAudio();
+  }
+
   private void startEncoders() {
     videoEncoder.start();
     audioEncoder.start();
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
index 75b80b34dd..34538bd442 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
@@ -432,6 +432,36 @@ public void startStream(String url) {
     onPreview = true;
   }
 
+  /**
+   * Pauses only video part of a stream keeping preview on.
+   */
+  public void pauseStreamVideo() {
+    videoEncoder.pause();
+  }
+
+  /**
+   * Resumes video part of a stream.
+   */
+  public void resumeStreamVideo() {
+    videoEncoder.resume();
+  }
+
+  /**
+   * Pauses both video and audio part of a stream keeping preview on.
+   */
+  public void pauseStream() {
+    pauseStreamVideo();
+    disableAudio();
+  }
+
+  /**
+   * Resumes both video and audio part of a stream.
+   */
+  public void resumeStream() {
+    resumeStreamVideo();
+    enableAudio();
+  }
+
   private void startEncoders() {
     videoEncoder.start();
     audioEncoder.start();

From 5d7353720b8b269fc8d66a3a235accd114c1913d Mon Sep 17 00:00:00 2001
From: Marcin Adamczewski <marcin.adamczewski@appunite.com>
Date: Tue, 19 May 2020 17:44:55 +0200
Subject: [PATCH 2/6] Added jitpack

---
 encoder/build.gradle    | 2 +-
 rtmp/build.gradle       | 2 +-
 rtplibrary/build.gradle | 2 +-
 rtsp/build.gradle       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/encoder/build.gradle b/encoder/build.gradle
index 22d09ee41b..1aa5a4ad5e 100644
--- a/encoder/build.gradle
+++ b/encoder/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-group = 'com.github.pedroSG94'
+group='com.github.marcin-adamczewski'
 
 android {
   compileSdkVersion 29
diff --git a/rtmp/build.gradle b/rtmp/build.gradle
index 75cb42666d..3b568440d2 100644
--- a/rtmp/build.gradle
+++ b/rtmp/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-group = 'com.github.pedroSG94'
+group='com.github.marcin-adamczewski'
 
 android {
   compileSdkVersion 29
diff --git a/rtplibrary/build.gradle b/rtplibrary/build.gradle
index 9337a02615..8a9ed33e6c 100644
--- a/rtplibrary/build.gradle
+++ b/rtplibrary/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-group = 'com.github.pedroSG94'
+group='com.github.marcin-adamczewski'
 
 android {
   compileSdkVersion 29
diff --git a/rtsp/build.gradle b/rtsp/build.gradle
index a9c57b01c6..07a8f90287 100644
--- a/rtsp/build.gradle
+++ b/rtsp/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-group = 'com.github.pedroSG94'
+group='com.github.marcin-adamczewski'
 
 android {
   compileSdkVersion 29

From 01c6ccb3da1294de51b2324e706b17e4b5e8deae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Grze=C5=9Bkowiak?= <filip.grzeskowiak@appunite.com>
Date: Tue, 26 May 2020 15:39:15 +0200
Subject: [PATCH 3/6] Added feature to stream only the stream from front camera

---
 app/src/main/res/layout/activity_open_gl.xml  |  4 ++--
 .../input/gl/render/ManagerRender.java        |  5 +++--
 .../encoder/input/gl/render/ScreenRender.java | 18 ++++++++++++---
 .../input/gl/render/SimpleCameraRender.java   |  5 +++--
 .../input/video/Camera1ApiManager.java        | 12 +++++++---
 .../input/video/Camera2ApiManager.java        |  7 +++++-
 .../input/video/CameraSwitchCallback.java     |  5 +++++
 .../encoder/utils/gl/SizeCalculator.java      |  6 ++++-
 .../pedro/rtplibrary/base/Camera1Base.java    | 18 ++++++++++-----
 .../pedro/rtplibrary/base/Camera2Base.java    | 13 ++++++++---
 .../pedro/rtplibrary/view/GlInterface.java    |  2 ++
 .../rtplibrary/view/LightOpenGlView.java      |  5 +++++
 .../rtplibrary/view/OffScreenGlThread.java    | 22 ++++++++++++++++---
 .../com/pedro/rtplibrary/view/OpenGlView.java | 15 ++++++++++---
 rtplibrary/src/main/res/values/attrs.xml      |  2 ++
 15 files changed, 110 insertions(+), 29 deletions(-)
 create mode 100644 encoder/src/main/java/com/pedro/encoder/input/video/CameraSwitchCallback.java

diff --git a/app/src/main/res/layout/activity_open_gl.xml b/app/src/main/res/layout/activity_open_gl.xml
index ea701de24b..663a05d0d8 100644
--- a/app/src/main/res/layout/activity_open_gl.xml
+++ b/app/src/main/res/layout/activity_open_gl.xml
@@ -13,8 +13,7 @@
       app:aspectRatioMode="adjust"
       app:AAEnabled="false"
       app:numFilters="1"
-      app:isFlipHorizontal="false"
-      app:isFlipVertical="false"
+      app:isStreamFlipHorizontal="true"
       />
 
   <EditText
@@ -24,6 +23,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:gravity="center"
+      android:text="rtmp://rtmp-global.cloud.vimeo.com/live/3060b920-dba0-41cd-9dd5-4f178589e255"
       android:layout_margin="20dp"
       android:id="@+id/et_rtp_url"
       />
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
index e3b9ad6b41..645208e029 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
@@ -62,8 +62,9 @@ public void drawOffScreen() {
   }
 
   public void drawScreen(int width, int height, boolean keepAspectRatio, int mode, int rotation,
-      boolean isPreview) {
-    screenRender.draw(width, height, keepAspectRatio, mode, rotation, isPreview);
+      boolean isPreview, boolean isCameraFront, boolean flipStreamHorizontal, boolean flipStreamVertical) {
+    screenRender.draw(width, height, keepAspectRatio, mode, rotation,
+            isPreview, isCameraFront, flipStreamHorizontal, flipStreamVertical);
   }
 
   public void release() {
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
index 7027795e6d..a8ab9aa523 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
@@ -78,11 +78,12 @@ public void initGl(Context context) {
   }
 
   public void draw(int width, int height, boolean keepAspectRatio, int mode, int rotation,
-      boolean isPreview) {
+      boolean isPreview, boolean isCameraFront, boolean flipStreamHorizontal, boolean flipStreamVertical) {
     GlUtil.checkGlError("drawScreen start");
 
-    if (mode == 2 || mode == 3) { //stream rotation is enabled
-      SizeCalculator.updateMatrix(rotation, width, height, isPreview, isPortrait, MVPMatrix);
+    if (mode == 2 || mode == 3 || flipStreamHorizontal || flipStreamVertical) { //stream rotation is enabled
+      SizeCalculator.updateMatrix(rotation, width, height, isPreview,
+              isPortrait, isCameraFront, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
     }
     SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, streamWidth,
         streamHeight);
@@ -136,4 +137,15 @@ public void setStreamSize(int streamWidth, int streamHeight) {
     this.streamWidth = streamWidth;
     this.streamHeight = streamHeight;
   }
+
+//  public void setFlip(boolean isFlipHorizontal, boolean isFlipVertical) {
+//    Matrix.setIdentityM(scaleMatrix, 0);
+//    Matrix.scaleM(scaleMatrix, 0, isFlipVertical ? -1f : 1f, isFlipHorizontal ? -1f : 1f, 1f);
+//    update();
+//  }
+//
+//  private void update() {
+//    Matrix.setIdentityM(MVPMatrix, 0);
+//    Matrix.multiplyMM(MVPMatrix, 0, scaleMatrix, 0, MVPMatrix, 0);
+//  }
 }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
index 7893ef9325..ca373b2acf 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
@@ -90,8 +90,9 @@ public void drawFrame(int width, int height, boolean keepAspectRatio, int mode,
     GlUtil.checkGlError("drawFrame start");
     surfaceTexture.getTransformMatrix(STMatrix);
 
-    if (mode == 2 || mode == 3) { //stream rotation is enabled
-      SizeCalculator.updateMatrix(rotation, width, height, isPreview, isPortrait, MVPMatrix);
+    if(mode == 2 || mode == 3) {
+      SizeCalculator.updateMatrix(rotation, width, height, isPreview,
+              isPortrait,  false, false, false, MVPMatrix);
     }
     SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, streamWidth,
         streamHeight);
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java b/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
index 03d5118848..e39e80dace 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
@@ -44,6 +44,7 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
   private boolean isPortrait = false;
   private int cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;
   private Context context;
+  private CameraSwitchCallback cameraSwitchCallback;
 
   //default parameters for camera
   private int width = 640;
@@ -63,23 +64,26 @@ public interface FaceDetectorCallback {
 
   private FaceDetectorCallback faceDetectorCallback;
 
-  public Camera1ApiManager(SurfaceView surfaceView, GetCameraData getCameraData) {
+  public Camera1ApiManager(SurfaceView surfaceView, GetCameraData getCameraData, CameraSwitchCallback cameraSwitchCallback) {
     this.surfaceView = surfaceView;
     this.getCameraData = getCameraData;
     this.context = surfaceView.getContext();
+    this.cameraSwitchCallback = cameraSwitchCallback;
     init();
   }
 
-  public Camera1ApiManager(TextureView textureView, GetCameraData getCameraData) {
+  public Camera1ApiManager(TextureView textureView, GetCameraData getCameraData, CameraSwitchCallback cameraSwitchCallback) {
     this.textureView = textureView;
     this.getCameraData = getCameraData;
     this.context = textureView.getContext();
+    this.cameraSwitchCallback = cameraSwitchCallback;
     init();
   }
 
-  public Camera1ApiManager(SurfaceTexture surfaceTexture, Context context) {
+  public Camera1ApiManager(SurfaceTexture surfaceTexture, Context context, CameraSwitchCallback cameraSwitchCallback) {
     this.surfaceTexture = surfaceTexture;
     this.context = context;
+    this.cameraSwitchCallback = cameraSwitchCallback;
     init();
   }
 
@@ -348,12 +352,14 @@ public void switchCamera() throws CameraOpenException {
           cameraSelect = i;
           if (!checkCanOpen()) {
             cameraSelect = oldCamera;
+            cameraSwitchCallback.cameraSwitchResult(false);
             throw new CameraOpenException("This camera resolution cant be opened");
           }
           stop();
           cameraFacing = cameraFacing == Camera.CameraInfo.CAMERA_FACING_BACK
               ? Camera.CameraInfo.CAMERA_FACING_FRONT : Camera.CameraInfo.CAMERA_FACING_BACK;
           start();
+          cameraSwitchCallback.cameraSwitchResult(true);
           return;
         }
       }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java b/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
index cd7afae2e2..804876a315 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
@@ -66,6 +66,7 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
   private float zoomLevel = 1.0f;
   private boolean lanternEnable = false;
   private boolean running = false;
+  private CameraSwitchCallback cameraSwitchCallback;
 
   //Face detector
   public interface FaceDetectorCallback {
@@ -76,8 +77,9 @@ public interface FaceDetectorCallback {
   private boolean faceDetectionEnabled = false;
   private int faceDetectionMode;
 
-  public Camera2ApiManager(Context context) {
+  public Camera2ApiManager(Context context, CameraSwitchCallback cameraSwitchCallback) {
     cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+    this.cameraSwitchCallback = cameraSwitchCallback;
   }
 
   public void prepareCamera(SurfaceView surfaceView, Surface surface) {
@@ -387,11 +389,14 @@ public void openCameraId(Integer cameraId) {
         running = true;
         isFrontCamera =
             (LENS_FACING_FRONT == cameraCharacteristics.get(CameraCharacteristics.LENS_FACING));
+        cameraSwitchCallback.cameraSwitchResult(true);
       } catch (CameraAccessException | SecurityException e) {
         Log.e(TAG, "Error", e);
+        cameraSwitchCallback.cameraSwitchResult(false);
       }
     } else {
       Log.e(TAG, "Camera2ApiManager need be prepared, Camera2ApiManager not enabled");
+      cameraSwitchCallback.cameraSwitchResult(false);
     }
   }
 
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/CameraSwitchCallback.java b/encoder/src/main/java/com/pedro/encoder/input/video/CameraSwitchCallback.java
new file mode 100644
index 0000000000..a2676ed4f2
--- /dev/null
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/CameraSwitchCallback.java
@@ -0,0 +1,5 @@
+package com.pedro.encoder.input.video;
+
+public interface CameraSwitchCallback {
+    void cameraSwitchResult(boolean cameraSwitchResult);
+}
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
index daf3d901eb..067b334ca1 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
@@ -36,12 +36,16 @@ public static void calculateViewPort(boolean keepAspectRatio, int mode, int prev
   }
 
   public static void updateMatrix(int rotation, int width, int height, boolean isPreview,
-      boolean isPortrait, float[] MVPMatrix) {
+                                  boolean isPortrait, boolean isCameraFront,
+                                  boolean flipStreamHorizontal, boolean flipStreamVertical, float[] MVPMatrix) {
     Matrix.setIdentityM(MVPMatrix, 0);
     PointF scale = getScale(rotation, width, height, isPortrait, isPreview);
     Matrix.scaleM(MVPMatrix, 0, scale.x, scale.y, 1f);
     if (!isPreview && !isPortrait) rotation += 90;
     Matrix.rotateM(MVPMatrix, 0, rotation, 0f, 0f, -1f);
+    if (!isPreview && isCameraFront) {
+      Matrix.scaleM(MVPMatrix, 0, flipStreamHorizontal ? -1 : 1, flipStreamVertical ? -1 : 1, 1f);
+    }
   }
 
   private static PointF getScale(int rotation, int width, int height, boolean isPortrait,
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
index 5d3ed81a40..3bd89bf6e1 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
@@ -19,6 +19,7 @@
 import com.pedro.encoder.input.video.Camera1ApiManager;
 import com.pedro.encoder.input.video.CameraHelper;
 import com.pedro.encoder.input.video.CameraOpenException;
+import com.pedro.encoder.input.video.CameraSwitchCallback;
 import com.pedro.encoder.input.video.GetCameraData;
 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.video.FormatVideoEncoder;
@@ -48,7 +49,7 @@
  */
 
 public abstract class Camera1Base
-    implements GetAacData, GetCameraData, GetVideoData, GetMicrophoneData {
+    implements GetAacData, GetCameraData, GetVideoData, GetMicrophoneData, CameraSwitchCallback {
 
   private static final String TAG = "Camera1Base";
 
@@ -67,13 +68,13 @@ public abstract class Camera1Base
 
   public Camera1Base(SurfaceView surfaceView) {
     context = surfaceView.getContext();
-    cameraManager = new Camera1ApiManager(surfaceView, this);
+    cameraManager = new Camera1ApiManager(surfaceView, this, this);
     init();
   }
 
   public Camera1Base(TextureView textureView) {
     context = textureView.getContext();
-    cameraManager = new Camera1ApiManager(textureView, this);
+    cameraManager = new Camera1ApiManager(textureView, this, this);
     init();
   }
 
@@ -82,7 +83,7 @@ public Camera1Base(OpenGlView openGlView) {
     context = openGlView.getContext();
     this.glInterface = openGlView;
     this.glInterface.init();
-    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context);
+    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context, this);
     init();
   }
 
@@ -91,7 +92,7 @@ public Camera1Base(LightOpenGlView lightOpenGlView) {
     context = lightOpenGlView.getContext();
     this.glInterface = lightOpenGlView;
     this.glInterface.init();
-    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context);
+    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context, this);
     init();
   }
 
@@ -100,7 +101,7 @@ public Camera1Base(Context context) {
     this.context = context;
     glInterface = new OffScreenGlThread(context);
     glInterface.init();
-    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context);
+    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context, this);
     init();
   }
 
@@ -690,6 +691,11 @@ public void switchCamera() throws CameraOpenException {
     }
   }
 
+  @Override
+  public void cameraSwitchResult(boolean cameraSwitchResult) {
+    if(cameraSwitchResult) glInterface.setIsCameraFront(isFrontCamera());
+  }
+
   public GlInterface getGlInterface() {
     if (glInterface != null) {
       return glInterface;
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
index 34538bd442..6f0778f181 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
@@ -20,6 +20,7 @@
 import com.pedro.encoder.input.video.Camera2ApiManager;
 import com.pedro.encoder.input.video.CameraHelper;
 import com.pedro.encoder.input.video.CameraOpenException;
+import com.pedro.encoder.input.video.CameraSwitchCallback;
 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.video.FormatVideoEncoder;
 import com.pedro.encoder.video.GetVideoData;
@@ -46,7 +47,7 @@
  * Created by pedro on 7/07/17.
  */
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrophoneData {
+public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrophoneData, CameraSwitchCallback {
 
   protected Context context;
   private Camera2ApiManager cameraManager;
@@ -93,7 +94,7 @@ public Camera2Base(LightOpenGlView lightOpenGlView) {
   public Camera2Base(Context context, boolean useOpengl) {
     this.context = context;
     if (useOpengl) {
-      glInterface = new OffScreenGlThread(context);
+      glInterface = new OffScreenGlThread(context, true, false);
       glInterface.init();
     }
     isBackground = true;
@@ -101,7 +102,7 @@ public Camera2Base(Context context, boolean useOpengl) {
   }
 
   private void init(Context context) {
-    cameraManager = new Camera2ApiManager(context);
+    cameraManager = new Camera2ApiManager(context, this);
     videoEncoder = new VideoEncoder(this);
     microphoneManager = new MicrophoneManager(this);
     audioEncoder = new AudioEncoder(this);
@@ -716,12 +717,18 @@ public int getStreamHeight() {
    *
    * @throws CameraOpenException If the other camera doesn't support same resolution.
    */
+
   public void switchCamera() throws CameraOpenException {
     if (isStreaming() || onPreview) {
       cameraManager.switchCamera();
     }
   }
 
+  @Override
+  public void cameraSwitchResult(boolean cameraSwitchResult) {
+    if(cameraSwitchResult) glInterface.setIsCameraFront(isFrontCamera());
+  }
+
   public GlInterface getGlInterface() {
     if (glInterface != null) {
       return glInterface;
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
index 4daa95bc01..b5560b6408 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
@@ -100,4 +100,6 @@ public interface GlInterface {
   void stop();
 
   void setFps(int fps);
+
+  void setIsCameraFront(boolean isCameraFront);
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
index e81272b005..da8305b9b7 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
@@ -133,6 +133,11 @@ public void enableAA(boolean AAEnabled) {
 
   }
 
+  @Override
+  public void setIsCameraFront(boolean isCameraFront) {
+
+  }
+
   @Override
   public void setRotation(int rotation) {
     simpleCameraRender.setRotation(rotation);
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
index 25d64da81b..665a2a3319 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
@@ -39,6 +39,10 @@ public class OffScreenGlThread
   private int encoderWidth, encoderHeight;
   private boolean loadAA = false;
   private int streamRotation;
+  private int flipStreamMode = 4;
+  private boolean isCameraFront = false;
+  private boolean isFlipStreamHorizontal = false;
+  private boolean isFlipStreamVertical = false;
 
   private boolean AAEnabled = false;
   private FpsLimiter fpsLimiter = new FpsLimiter();
@@ -49,6 +53,12 @@ public OffScreenGlThread(Context context) {
     this.context = context;
   }
 
+  public OffScreenGlThread(Context context, boolean isFlipStreamHorizontal, boolean isFlipStreamVertical) {
+    this.context = context;
+    this.isFlipStreamHorizontal = isFlipStreamHorizontal;
+    this.isFlipStreamVertical = isFlipStreamVertical;
+  }
+
   @Override
   public void init() {
     if (!initialized) textureManager = new ManagerRender();
@@ -178,7 +188,8 @@ public void run() {
           surfaceManager.makeCurrent();
           textureManager.updateFrame();
           textureManager.drawOffScreen();
-          textureManager.drawScreen(encoderWidth, encoderHeight, false, 0, 0, true);
+          textureManager.drawScreen(encoderWidth, encoderHeight, false, flipStreamMode, 0,
+                  isCameraFront, true, isFlipStreamHorizontal, isFlipStreamVertical);
           if (takePhotoCallback != null) {
             takePhotoCallback.onTakePhoto(
                 GlUtil.getBitmap(encoderWidth, encoderHeight, encoderWidth, encoderHeight));
@@ -189,8 +200,8 @@ public void run() {
           synchronized (sync) {
             if (surfaceManagerEncoder != null && !fpsLimiter.limitFPS()) {
               surfaceManagerEncoder.makeCurrent();
-              textureManager.drawScreen(encoderWidth, encoderHeight, false, 0, streamRotation,
-                  false);
+              textureManager.drawScreen(encoderWidth, encoderHeight, false, flipStreamMode, streamRotation,
+                  isCameraFront,false, isFlipStreamHorizontal, isFlipStreamVertical);
               surfaceManagerEncoder.swapBuffer();
             }
           }
@@ -211,6 +222,11 @@ public void run() {
     }
   }
 
+  @Override
+  public void setIsCameraFront(boolean isCameraFront) {
+    this.isCameraFront = isCameraFront;
+  }
+
   @Override
   public void onFrameAvailable(SurfaceTexture surfaceTexture) {
     synchronized (sync) {
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
index e7264767d0..61fe62559c 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
@@ -28,7 +28,9 @@ public class OpenGlView extends OpenGlViewBase {
   private boolean AAEnabled = false;
   private boolean keepAspectRatio = false;
   private int aspectRatioMode = 0;
+  private boolean isCameraFront = false;
   private boolean isFlipHorizontal = false, isFlipVertical = false;
+  private boolean isStreamFlipHorizontal = false, isStreamFlipVertical = false;
 
   public OpenGlView(Context context) {
     super(context);
@@ -44,6 +46,8 @@ public OpenGlView(Context context, AttributeSet attrs) {
       ManagerRender.numFilters = typedArray.getInt(R.styleable.OpenGlView_numFilters, 1);
       isFlipHorizontal = typedArray.getBoolean(R.styleable.OpenGlView_isFlipHorizontal, false);
       isFlipVertical = typedArray.getBoolean(R.styleable.OpenGlView_isFlipVertical, false);
+      isStreamFlipHorizontal = typedArray.getBoolean(R.styleable.OpenGlView_isStreamFlipHorizontal, false);
+      isStreamFlipVertical = typedArray.getBoolean(R.styleable.OpenGlView_isStreamFlipVertical, false);
     } finally {
       typedArray.recycle();
     }
@@ -112,6 +116,11 @@ public void surfaceChanged(SurfaceHolder holder, int format, int width, int heig
     if (managerRender != null) managerRender.setPreviewSize(previewWidth, previewHeight);
   }
 
+  @Override
+  public void setIsCameraFront(boolean isCameraFront) {
+    this.isCameraFront = isCameraFront;
+  }
+
   @Override
   public void run() {
     releaseSurfaceManager();
@@ -127,8 +136,8 @@ public void run() {
           surfaceManager.makeCurrent();
           managerRender.updateFrame();
           managerRender.drawOffScreen();
-          managerRender.drawScreen(previewWidth, previewHeight, keepAspectRatio, aspectRatioMode, 0,
-              true);
+          managerRender.drawScreen(previewWidth, previewHeight, keepAspectRatio, aspectRatioMode,
+                  0, true, isCameraFront, isStreamFlipHorizontal, isStreamFlipVertical);
           if (takePhotoCallback != null) {
             takePhotoCallback.onTakePhoto(
                 GlUtil.getBitmap(previewWidth, previewHeight, encoderWidth, encoderHeight));
@@ -140,7 +149,7 @@ public void run() {
             if (surfaceManagerEncoder != null && !fpsLimiter.limitFPS()) {
               surfaceManagerEncoder.makeCurrent();
               managerRender.drawScreen(encoderWidth, encoderHeight, false, aspectRatioMode,
-                  streamRotation, false);
+                  streamRotation, false, isCameraFront, isStreamFlipHorizontal, isStreamFlipVertical);
               surfaceManagerEncoder.swapBuffer();
             }
           }
diff --git a/rtplibrary/src/main/res/values/attrs.xml b/rtplibrary/src/main/res/values/attrs.xml
index d2c08add97..bd6dd861e1 100644
--- a/rtplibrary/src/main/res/values/attrs.xml
+++ b/rtplibrary/src/main/res/values/attrs.xml
@@ -23,6 +23,8 @@
     <attr name="aspectRatioMode"/>
     <attr name="isFlipHorizontal"/>
     <attr name="isFlipVertical"/>
+    <attr name="isStreamFlipHorizontal" format="boolean"/>
+    <attr name="isStreamFlipVertical" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="LightOpenGlView">

From 2a155577adcb646d1b9a8698f7c0dd0f739f9729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Grze=C5=9Bkowiak?= <filip.grzeskowiak@appunite.com>
Date: Tue, 26 May 2020 15:42:42 +0200
Subject: [PATCH 4/6] Removed unused lines

---
 app/src/main/res/layout/activity_open_gl.xml          |  1 -
 .../pedro/encoder/input/gl/render/ScreenRender.java   | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/app/src/main/res/layout/activity_open_gl.xml b/app/src/main/res/layout/activity_open_gl.xml
index 663a05d0d8..7381228842 100644
--- a/app/src/main/res/layout/activity_open_gl.xml
+++ b/app/src/main/res/layout/activity_open_gl.xml
@@ -23,7 +23,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:gravity="center"
-      android:text="rtmp://rtmp-global.cloud.vimeo.com/live/3060b920-dba0-41cd-9dd5-4f178589e255"
       android:layout_margin="20dp"
       android:id="@+id/et_rtp_url"
       />
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
index a8ab9aa523..73faca5376 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
@@ -137,15 +137,4 @@ public void setStreamSize(int streamWidth, int streamHeight) {
     this.streamWidth = streamWidth;
     this.streamHeight = streamHeight;
   }
-
-//  public void setFlip(boolean isFlipHorizontal, boolean isFlipVertical) {
-//    Matrix.setIdentityM(scaleMatrix, 0);
-//    Matrix.scaleM(scaleMatrix, 0, isFlipVertical ? -1f : 1f, isFlipHorizontal ? -1f : 1f, 1f);
-//    update();
-//  }
-//
-//  private void update() {
-//    Matrix.setIdentityM(MVPMatrix, 0);
-//    Matrix.multiplyMM(MVPMatrix, 0, scaleMatrix, 0, MVPMatrix, 0);
-//  }
 }

From 878a56a10b9c77b4b18015b06fd7c3260e44ef1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Grze=C5=9Bkowiak?= <filip.grzeskowiak@appunite.com>
Date: Wed, 27 May 2020 15:31:09 +0200
Subject: [PATCH 5/6] Added review suggestions

---
 .../openglexample/OpenGlRtmpActivity.java     |  2 ++
 app/src/main/res/layout/activity_open_gl.xml  |  1 -
 .../input/gl/render/ManagerRender.java        |  4 +--
 .../encoder/input/gl/render/ScreenRender.java |  9 +++--
 .../input/gl/render/SimpleCameraRender.java   |  2 +-
 .../input/video/Camera1ApiManager.java        | 14 +++-----
 .../input/video/Camera2ApiManager.java        |  7 +---
 .../input/video/CameraSwitchCallback.java     |  5 ---
 .../encoder/utils/gl/SizeCalculator.java      |  6 ++--
 .../pedro/rtplibrary/base/Camera1Base.java    | 22 ++++++------
 .../pedro/rtplibrary/base/Camera2Base.java    | 16 +++++----
 .../pedro/rtplibrary/view/GlInterface.java    |  4 ++-
 .../rtplibrary/view/LightOpenGlView.java      |  7 +++-
 .../rtplibrary/view/OffScreenGlThread.java    | 36 +++++++++----------
 .../com/pedro/rtplibrary/view/OpenGlView.java | 16 ++++++---
 15 files changed, 75 insertions(+), 76 deletions(-)
 delete mode 100644 encoder/src/main/java/com/pedro/encoder/input/video/CameraSwitchCallback.java

diff --git a/app/src/main/java/com/pedro/rtpstreamer/openglexample/OpenGlRtmpActivity.java b/app/src/main/java/com/pedro/rtpstreamer/openglexample/OpenGlRtmpActivity.java
index 29df95bc5c..7e36b2910e 100644
--- a/app/src/main/java/com/pedro/rtpstreamer/openglexample/OpenGlRtmpActivity.java
+++ b/app/src/main/java/com/pedro/rtpstreamer/openglexample/OpenGlRtmpActivity.java
@@ -407,6 +407,8 @@ public void onClick(View view) {
           rtmpCamera1.switchCamera();
         } catch (CameraOpenException e) {
           Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
+        } finally {
+          rtmpCamera1.setIsStreamFlipHorizontal(rtmpCamera1.isFrontCamera());
         }
         break;
       case R.id.b_pause_stream:
diff --git a/app/src/main/res/layout/activity_open_gl.xml b/app/src/main/res/layout/activity_open_gl.xml
index 7381228842..32f77c6c16 100644
--- a/app/src/main/res/layout/activity_open_gl.xml
+++ b/app/src/main/res/layout/activity_open_gl.xml
@@ -13,7 +13,6 @@
       app:aspectRatioMode="adjust"
       app:AAEnabled="false"
       app:numFilters="1"
-      app:isStreamFlipHorizontal="true"
       />
 
   <EditText
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
index 645208e029..71db474cd1 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ManagerRender.java
@@ -62,9 +62,9 @@ public void drawOffScreen() {
   }
 
   public void drawScreen(int width, int height, boolean keepAspectRatio, int mode, int rotation,
-      boolean isPreview, boolean isCameraFront, boolean flipStreamHorizontal, boolean flipStreamVertical) {
+      boolean isPreview, boolean flipStreamHorizontal, boolean flipStreamVertical) {
     screenRender.draw(width, height, keepAspectRatio, mode, rotation,
-            isPreview, isCameraFront, flipStreamHorizontal, flipStreamVertical);
+            isPreview, flipStreamHorizontal, flipStreamVertical);
   }
 
   public void release() {
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
index 73faca5376..bec44ce96b 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
@@ -78,13 +78,12 @@ public void initGl(Context context) {
   }
 
   public void draw(int width, int height, boolean keepAspectRatio, int mode, int rotation,
-      boolean isPreview, boolean isCameraFront, boolean flipStreamHorizontal, boolean flipStreamVertical) {
+      boolean isPreview, boolean flipStreamHorizontal, boolean flipStreamVertical) {
+    System.out.println("flipStreamHorizontal " + flipStreamHorizontal + " flipStreamVertical " + flipStreamVertical);
     GlUtil.checkGlError("drawScreen start");
 
-    if (mode == 2 || mode == 3 || flipStreamHorizontal || flipStreamVertical) { //stream rotation is enabled
-      SizeCalculator.updateMatrix(rotation, width, height, isPreview,
-              isPortrait, isCameraFront, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
-    }
+    SizeCalculator.updateMatrix(rotation, width, height, isPreview,
+            isPortrait, flipStreamHorizontal, flipStreamVertical, MVPMatrix);
     SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, streamWidth,
         streamHeight);
 
diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
index ca373b2acf..3ae7248d70 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/SimpleCameraRender.java
@@ -92,7 +92,7 @@ public void drawFrame(int width, int height, boolean keepAspectRatio, int mode,
 
     if(mode == 2 || mode == 3) {
       SizeCalculator.updateMatrix(rotation, width, height, isPreview,
-              isPortrait,  false, false, false, MVPMatrix);
+              isPortrait, false, false, MVPMatrix);
     }
     SizeCalculator.calculateViewPort(keepAspectRatio, mode, width, height, streamWidth,
         streamHeight);
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java b/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
index e39e80dace..453c999a90 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java
@@ -11,6 +11,8 @@
 import android.view.SurfaceView;
 import android.view.TextureView;
 
+import androidx.annotation.Nullable;
+
 import com.pedro.encoder.Frame;
 import java.io.IOException;
 import java.util.Iterator;
@@ -44,7 +46,6 @@ public class Camera1ApiManager implements Camera.PreviewCallback, Camera.FaceDet
   private boolean isPortrait = false;
   private int cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;
   private Context context;
-  private CameraSwitchCallback cameraSwitchCallback;
 
   //default parameters for camera
   private int width = 640;
@@ -64,26 +65,23 @@ public interface FaceDetectorCallback {
 
   private FaceDetectorCallback faceDetectorCallback;
 
-  public Camera1ApiManager(SurfaceView surfaceView, GetCameraData getCameraData, CameraSwitchCallback cameraSwitchCallback) {
+  public Camera1ApiManager(SurfaceView surfaceView, GetCameraData getCameraData) {
     this.surfaceView = surfaceView;
     this.getCameraData = getCameraData;
     this.context = surfaceView.getContext();
-    this.cameraSwitchCallback = cameraSwitchCallback;
     init();
   }
 
-  public Camera1ApiManager(TextureView textureView, GetCameraData getCameraData, CameraSwitchCallback cameraSwitchCallback) {
+  public Camera1ApiManager(TextureView textureView, GetCameraData getCameraData) {
     this.textureView = textureView;
     this.getCameraData = getCameraData;
     this.context = textureView.getContext();
-    this.cameraSwitchCallback = cameraSwitchCallback;
     init();
   }
 
-  public Camera1ApiManager(SurfaceTexture surfaceTexture, Context context, CameraSwitchCallback cameraSwitchCallback) {
+  public Camera1ApiManager(SurfaceTexture surfaceTexture, Context context) {
     this.surfaceTexture = surfaceTexture;
     this.context = context;
-    this.cameraSwitchCallback = cameraSwitchCallback;
     init();
   }
 
@@ -352,14 +350,12 @@ public void switchCamera() throws CameraOpenException {
           cameraSelect = i;
           if (!checkCanOpen()) {
             cameraSelect = oldCamera;
-            cameraSwitchCallback.cameraSwitchResult(false);
             throw new CameraOpenException("This camera resolution cant be opened");
           }
           stop();
           cameraFacing = cameraFacing == Camera.CameraInfo.CAMERA_FACING_BACK
               ? Camera.CameraInfo.CAMERA_FACING_FRONT : Camera.CameraInfo.CAMERA_FACING_BACK;
           start();
-          cameraSwitchCallback.cameraSwitchResult(true);
           return;
         }
       }
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java b/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
index 804876a315..cd7afae2e2 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/video/Camera2ApiManager.java
@@ -66,7 +66,6 @@ public class Camera2ApiManager extends CameraDevice.StateCallback {
   private float zoomLevel = 1.0f;
   private boolean lanternEnable = false;
   private boolean running = false;
-  private CameraSwitchCallback cameraSwitchCallback;
 
   //Face detector
   public interface FaceDetectorCallback {
@@ -77,9 +76,8 @@ public interface FaceDetectorCallback {
   private boolean faceDetectionEnabled = false;
   private int faceDetectionMode;
 
-  public Camera2ApiManager(Context context, CameraSwitchCallback cameraSwitchCallback) {
+  public Camera2ApiManager(Context context) {
     cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
-    this.cameraSwitchCallback = cameraSwitchCallback;
   }
 
   public void prepareCamera(SurfaceView surfaceView, Surface surface) {
@@ -389,14 +387,11 @@ public void openCameraId(Integer cameraId) {
         running = true;
         isFrontCamera =
             (LENS_FACING_FRONT == cameraCharacteristics.get(CameraCharacteristics.LENS_FACING));
-        cameraSwitchCallback.cameraSwitchResult(true);
       } catch (CameraAccessException | SecurityException e) {
         Log.e(TAG, "Error", e);
-        cameraSwitchCallback.cameraSwitchResult(false);
       }
     } else {
       Log.e(TAG, "Camera2ApiManager need be prepared, Camera2ApiManager not enabled");
-      cameraSwitchCallback.cameraSwitchResult(false);
     }
   }
 
diff --git a/encoder/src/main/java/com/pedro/encoder/input/video/CameraSwitchCallback.java b/encoder/src/main/java/com/pedro/encoder/input/video/CameraSwitchCallback.java
deleted file mode 100644
index a2676ed4f2..0000000000
--- a/encoder/src/main/java/com/pedro/encoder/input/video/CameraSwitchCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pedro.encoder.input.video;
-
-public interface CameraSwitchCallback {
-    void cameraSwitchResult(boolean cameraSwitchResult);
-}
diff --git a/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java b/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
index 067b334ca1..9cae15e9e5 100644
--- a/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
+++ b/encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java
@@ -36,14 +36,14 @@ public static void calculateViewPort(boolean keepAspectRatio, int mode, int prev
   }
 
   public static void updateMatrix(int rotation, int width, int height, boolean isPreview,
-                                  boolean isPortrait, boolean isCameraFront,
-                                  boolean flipStreamHorizontal, boolean flipStreamVertical, float[] MVPMatrix) {
+                                  boolean isPortrait, boolean flipStreamHorizontal,
+                                  boolean flipStreamVertical, float[] MVPMatrix) {
     Matrix.setIdentityM(MVPMatrix, 0);
     PointF scale = getScale(rotation, width, height, isPortrait, isPreview);
     Matrix.scaleM(MVPMatrix, 0, scale.x, scale.y, 1f);
     if (!isPreview && !isPortrait) rotation += 90;
     Matrix.rotateM(MVPMatrix, 0, rotation, 0f, 0f, -1f);
-    if (!isPreview && isCameraFront) {
+    if (!isPreview) {
       Matrix.scaleM(MVPMatrix, 0, flipStreamHorizontal ? -1 : 1, flipStreamVertical ? -1 : 1, 1f);
     }
   }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
index 3bd89bf6e1..d88ab76bd2 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera1Base.java
@@ -19,7 +19,6 @@
 import com.pedro.encoder.input.video.Camera1ApiManager;
 import com.pedro.encoder.input.video.CameraHelper;
 import com.pedro.encoder.input.video.CameraOpenException;
-import com.pedro.encoder.input.video.CameraSwitchCallback;
 import com.pedro.encoder.input.video.GetCameraData;
 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.video.FormatVideoEncoder;
@@ -49,7 +48,7 @@
  */
 
 public abstract class Camera1Base
-    implements GetAacData, GetCameraData, GetVideoData, GetMicrophoneData, CameraSwitchCallback {
+    implements GetAacData, GetCameraData, GetVideoData, GetMicrophoneData {
 
   private static final String TAG = "Camera1Base";
 
@@ -68,13 +67,13 @@ public abstract class Camera1Base
 
   public Camera1Base(SurfaceView surfaceView) {
     context = surfaceView.getContext();
-    cameraManager = new Camera1ApiManager(surfaceView, this, this);
+    cameraManager = new Camera1ApiManager(surfaceView, this);
     init();
   }
 
   public Camera1Base(TextureView textureView) {
     context = textureView.getContext();
-    cameraManager = new Camera1ApiManager(textureView, this, this);
+    cameraManager = new Camera1ApiManager(textureView, this);
     init();
   }
 
@@ -83,7 +82,7 @@ public Camera1Base(OpenGlView openGlView) {
     context = openGlView.getContext();
     this.glInterface = openGlView;
     this.glInterface.init();
-    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context, this);
+    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context);
     init();
   }
 
@@ -92,7 +91,7 @@ public Camera1Base(LightOpenGlView lightOpenGlView) {
     context = lightOpenGlView.getContext();
     this.glInterface = lightOpenGlView;
     this.glInterface.init();
-    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context, this);
+    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context);
     init();
   }
 
@@ -101,7 +100,7 @@ public Camera1Base(Context context) {
     this.context = context;
     glInterface = new OffScreenGlThread(context);
     glInterface.init();
-    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context, this);
+    cameraManager = new Camera1ApiManager(glInterface.getSurfaceTexture(), context);
     init();
   }
 
@@ -691,9 +690,12 @@ public void switchCamera() throws CameraOpenException {
     }
   }
 
-  @Override
-  public void cameraSwitchResult(boolean cameraSwitchResult) {
-    if(cameraSwitchResult) glInterface.setIsCameraFront(isFrontCamera());
+  public void setIsStreamFlipVertical(boolean isStreamFlipVertical) {
+    glInterface.setIsFlipStreamVertical(isStreamFlipVertical);
+  }
+
+  public void setIsStreamFlipHorizontal(boolean isStreamFlipHorizontal) {
+    glInterface.setIsFlipStreamHorizontal(isStreamFlipHorizontal);
   }
 
   public GlInterface getGlInterface() {
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
index 6f0778f181..df63e53fa6 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/base/Camera2Base.java
@@ -20,7 +20,6 @@
 import com.pedro.encoder.input.video.Camera2ApiManager;
 import com.pedro.encoder.input.video.CameraHelper;
 import com.pedro.encoder.input.video.CameraOpenException;
-import com.pedro.encoder.input.video.CameraSwitchCallback;
 import com.pedro.encoder.utils.CodecUtil;
 import com.pedro.encoder.video.FormatVideoEncoder;
 import com.pedro.encoder.video.GetVideoData;
@@ -47,7 +46,7 @@
  * Created by pedro on 7/07/17.
  */
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrophoneData, CameraSwitchCallback {
+public abstract class Camera2Base implements GetAacData, GetVideoData, GetMicrophoneData {
 
   protected Context context;
   private Camera2ApiManager cameraManager;
@@ -94,7 +93,7 @@ public Camera2Base(LightOpenGlView lightOpenGlView) {
   public Camera2Base(Context context, boolean useOpengl) {
     this.context = context;
     if (useOpengl) {
-      glInterface = new OffScreenGlThread(context, true, false);
+      glInterface = new OffScreenGlThread(context);
       glInterface.init();
     }
     isBackground = true;
@@ -102,7 +101,7 @@ public Camera2Base(Context context, boolean useOpengl) {
   }
 
   private void init(Context context) {
-    cameraManager = new Camera2ApiManager(context, this);
+    cameraManager = new Camera2ApiManager(context);
     videoEncoder = new VideoEncoder(this);
     microphoneManager = new MicrophoneManager(this);
     audioEncoder = new AudioEncoder(this);
@@ -724,9 +723,12 @@ public void switchCamera() throws CameraOpenException {
     }
   }
 
-  @Override
-  public void cameraSwitchResult(boolean cameraSwitchResult) {
-    if(cameraSwitchResult) glInterface.setIsCameraFront(isFrontCamera());
+  public void setIsStreamFlipVertical(boolean isStreamFlipVertical) {
+    glInterface.setIsFlipStreamVertical(isStreamFlipVertical);
+  }
+
+  public void setIsStreamFlipHorizontal(boolean isStreamFlipHorizontal) {
+    glInterface.setIsFlipStreamHorizontal(isStreamFlipHorizontal);
   }
 
   public GlInterface getGlInterface() {
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
index b5560b6408..6ec88e6f1c 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/GlInterface.java
@@ -101,5 +101,7 @@ public interface GlInterface {
 
   void setFps(int fps);
 
-  void setIsCameraFront(boolean isCameraFront);
+  void setIsFlipStreamHorizontal(boolean isStreamFlipHorizontal);
+
+  void setIsFlipStreamVertical(boolean isStreamFlipVertical);
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
index da8305b9b7..fdd16d391e 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java
@@ -134,7 +134,12 @@ public void enableAA(boolean AAEnabled) {
   }
 
   @Override
-  public void setIsCameraFront(boolean isCameraFront) {
+  public void setIsFlipStreamHorizontal(boolean isStreamFlipHorizontal) {
+
+  }
+
+  @Override
+  public void setIsFlipStreamVertical(boolean isStreamFlipVertical) {
 
   }
 
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
index 665a2a3319..656bfab27b 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java
@@ -39,11 +39,8 @@ public class OffScreenGlThread
   private int encoderWidth, encoderHeight;
   private boolean loadAA = false;
   private int streamRotation;
-  private int flipStreamMode = 4;
-  private boolean isCameraFront = false;
-  private boolean isFlipStreamHorizontal = false;
-  private boolean isFlipStreamVertical = false;
-
+  private boolean isStreamFlipHorizontal = false;
+  private boolean isStreamFlipVertical = false;
   private boolean AAEnabled = false;
   private FpsLimiter fpsLimiter = new FpsLimiter();
   //used with camera
@@ -53,12 +50,6 @@ public OffScreenGlThread(Context context) {
     this.context = context;
   }
 
-  public OffScreenGlThread(Context context, boolean isFlipStreamHorizontal, boolean isFlipStreamVertical) {
-    this.context = context;
-    this.isFlipStreamHorizontal = isFlipStreamHorizontal;
-    this.isFlipStreamVertical = isFlipStreamVertical;
-  }
-
   @Override
   public void init() {
     if (!initialized) textureManager = new ManagerRender();
@@ -188,8 +179,8 @@ public void run() {
           surfaceManager.makeCurrent();
           textureManager.updateFrame();
           textureManager.drawOffScreen();
-          textureManager.drawScreen(encoderWidth, encoderHeight, false, flipStreamMode, 0,
-                  isCameraFront, true, isFlipStreamHorizontal, isFlipStreamVertical);
+          textureManager.drawScreen(encoderWidth, encoderHeight, false, 0, 0,
+                  true, isStreamFlipHorizontal, isStreamFlipVertical);
           if (takePhotoCallback != null) {
             takePhotoCallback.onTakePhoto(
                 GlUtil.getBitmap(encoderWidth, encoderHeight, encoderWidth, encoderHeight));
@@ -200,8 +191,8 @@ public void run() {
           synchronized (sync) {
             if (surfaceManagerEncoder != null && !fpsLimiter.limitFPS()) {
               surfaceManagerEncoder.makeCurrent();
-              textureManager.drawScreen(encoderWidth, encoderHeight, false, flipStreamMode, streamRotation,
-                  isCameraFront,false, isFlipStreamHorizontal, isFlipStreamVertical);
+              textureManager.drawScreen(encoderWidth, encoderHeight, false, 0, streamRotation,
+                  false, isStreamFlipHorizontal, isStreamFlipVertical);
               surfaceManagerEncoder.swapBuffer();
             }
           }
@@ -222,11 +213,6 @@ public void run() {
     }
   }
 
-  @Override
-  public void setIsCameraFront(boolean isCameraFront) {
-    this.isCameraFront = isCameraFront;
-  }
-
   @Override
   public void onFrameAvailable(SurfaceTexture surfaceTexture) {
     synchronized (sync) {
@@ -234,4 +220,14 @@ public void onFrameAvailable(SurfaceTexture surfaceTexture) {
       sync.notifyAll();
     }
   }
+
+  @Override
+  public void setIsFlipStreamHorizontal(boolean isStreamFlipHorizontal) {
+    this.isStreamFlipHorizontal = isStreamFlipHorizontal;
+  }
+
+  @Override
+  public void setIsFlipStreamVertical(boolean isStreamFlipVertical) {
+    this.isStreamFlipVertical = isStreamFlipVertical;
+  }
 }
diff --git a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
index 61fe62559c..a03e3d6796 100644
--- a/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
+++ b/rtplibrary/src/main/java/com/pedro/rtplibrary/view/OpenGlView.java
@@ -8,7 +8,9 @@
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
+
 import androidx.annotation.RequiresApi;
+
 import com.pedro.encoder.input.gl.SurfaceManager;
 import com.pedro.encoder.input.gl.render.ManagerRender;
 import com.pedro.encoder.input.gl.render.filters.BaseFilterRender;
@@ -28,7 +30,6 @@ public class OpenGlView extends OpenGlViewBase {
   private boolean AAEnabled = false;
   private boolean keepAspectRatio = false;
   private int aspectRatioMode = 0;
-  private boolean isCameraFront = false;
   private boolean isFlipHorizontal = false, isFlipVertical = false;
   private boolean isStreamFlipHorizontal = false, isStreamFlipVertical = false;
 
@@ -117,8 +118,13 @@ public void surfaceChanged(SurfaceHolder holder, int format, int width, int heig
   }
 
   @Override
-  public void setIsCameraFront(boolean isCameraFront) {
-    this.isCameraFront = isCameraFront;
+  public void setIsFlipStreamHorizontal(boolean isStreamFlipHorizontal) {
+    this.isStreamFlipHorizontal = isStreamFlipHorizontal;
+  }
+
+  @Override
+  public void setIsFlipStreamVertical(boolean isStreamFlipVertical) {
+    this.isStreamFlipVertical = isStreamFlipVertical;
   }
 
   @Override
@@ -137,7 +143,7 @@ public void run() {
           managerRender.updateFrame();
           managerRender.drawOffScreen();
           managerRender.drawScreen(previewWidth, previewHeight, keepAspectRatio, aspectRatioMode,
-                  0, true, isCameraFront, isStreamFlipHorizontal, isStreamFlipVertical);
+                  0, true, isStreamFlipHorizontal, isStreamFlipVertical);
           if (takePhotoCallback != null) {
             takePhotoCallback.onTakePhoto(
                 GlUtil.getBitmap(previewWidth, previewHeight, encoderWidth, encoderHeight));
@@ -149,7 +155,7 @@ public void run() {
             if (surfaceManagerEncoder != null && !fpsLimiter.limitFPS()) {
               surfaceManagerEncoder.makeCurrent();
               managerRender.drawScreen(encoderWidth, encoderHeight, false, aspectRatioMode,
-                  streamRotation, false, isCameraFront, isStreamFlipHorizontal, isStreamFlipVertical);
+                  streamRotation, false, isStreamFlipHorizontal, isStreamFlipVertical);
               surfaceManagerEncoder.swapBuffer();
             }
           }

From 7122886f2766d94753f0f8df44ea89a489d0576e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Grze=C5=9Bkowiak?= <filip.grzeskowiak@appunite.com>
Date: Thu, 28 May 2020 12:18:47 +0200
Subject: [PATCH 6/6] Removed logs

---
 .../java/com/pedro/encoder/input/gl/render/ScreenRender.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
index bec44ce96b..b1d4fc3cc2 100644
--- a/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
+++ b/encoder/src/main/java/com/pedro/encoder/input/gl/render/ScreenRender.java
@@ -79,7 +79,6 @@ public void initGl(Context context) {
 
   public void draw(int width, int height, boolean keepAspectRatio, int mode, int rotation,
       boolean isPreview, boolean flipStreamHorizontal, boolean flipStreamVertical) {
-    System.out.println("flipStreamHorizontal " + flipStreamHorizontal + " flipStreamVertical " + flipStreamVertical);
     GlUtil.checkGlError("drawScreen start");
 
     SizeCalculator.updateMatrix(rotation, width, height, isPreview,