Added feature to stream only the stream from front camera by fgrzeskowiak · Pull Request #2 · marcin-adamczewski/rtmp-rtsp-stream-client-java

fgrzeskowiak · 2020-05-26T13:40:06Z

No description provided.

marcin-adamczewski · 2020-05-26T14:16:17Z

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


-    if (mode == 2 || mode == 3) { //stream rotation is enabled
-      SizeCalculator.updateMatrix(rotation, width, height, isPreview, isPortrait, MVPMatrix);
+    if(mode == 2 || mode == 3) {


Don't we want this logic here as well? Btw wrong formatting next to if

Removed the if completely

I guess we need those ifs, otherwise it may break logic for mode==0 and mode==1
Maybe you could leave previous logic as was and after updateMatrix call method like

if (!isPreview) { SizeCalculator.applyStreamFlip(isFlipHorizontal, isFrilVertical) { Matrix.setIdentityM(MVPMatrix, 0); Matrix.scaleM(MVPMatrix, 0, flipStreamHorizontal ? -1 : 1, flipStreamVertical ? -1 : 1, 1f); } }

marcin-adamczewski · 2020-05-26T14:17:11Z

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


-    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


Do we need those flips in the if check?

I guess we need, because the whole flipping happens in updateMatrix method, which originally executes only when aspectRatioMode is 2 or 3. We're not changing those modes here, so additional condition is needed to execute this method.

The other option would be to remove this if completely and move it to the updateMatrix method itself.

marcin-adamczewski · 2020-05-26T14:18:51Z

encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java

+  public Camera1ApiManager(SurfaceTexture surfaceTexture, Context context, CameraSwitchCallback cameraSwitchCallback) {
    this.surfaceTexture = surfaceTexture;
    this.context = context;
+    this.cameraSwitchCallback = cameraSwitchCallback;


Do we need this in constructor? I guess it should be optional

marcin-adamczewski · 2020-05-26T14:21:41Z

encoder/src/main/java/com/pedro/encoder/input/video/Camera1ApiManager.java

  private FaceDetectorCallback faceDetectorCallback;

-  public Camera1ApiManager(SurfaceView surfaceView, GetCameraData getCameraData) {
+  public Camera1ApiManager(SurfaceView surfaceView, GetCameraData getCameraData, CameraSwitchCallback cameraSwitchCallback) {


OpenGlViews works only for Camera2 api, so there is no need to add this callback here I guess?

As discussed, it works for Camera1

marcin-adamczewski · 2020-05-26T14:25:07Z

encoder/src/main/java/com/pedro/encoder/utils/gl/SizeCalculator.java

    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) {


I think that user should decide whether he wants to flip front or back camera

I think that isCameraFront param is not needed and user should decide whether to flip it.
So basically you don't need a callback for camera at all, or you could move it to Camera2ApiManager

so on theuser side it would be like

fun switchCamera { try { livestream.switchCamera() } finally { liveStream.glInterface.flipStreamVertical = livestream.isFrontCamera } }

or

livstream.cameraChangeListener() { isFrontCamera -> liveStream.glInterface.flipStreamVertical = isFrontCamera }

However, I'm not sure if putting the flip in finally block is a good idea. After all, it's executed after catch as well.

marcin-adamczewski · 2020-05-26T14:35:35Z

rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java

  private int encoderWidth, encoderHeight;
  private boolean loadAA = false;
  private int streamRotation;
+  private int flipStreamMode = 4;


what is it for?

Can be removed.

marcin-adamczewski · 2020-05-26T14:36:40Z

rtplibrary/src/main/java/com/pedro/rtplibrary/view/OffScreenGlThread.java

    this.context = context;
  }

+  public OffScreenGlThread(Context context, boolean isFlipStreamHorizontal, boolean isFlipStreamVertical) {


why is it in constructor?

Well, I thought, that if for OpenGlView you can set isStreamFlipHorizontal and isStreamFlipVertical in xml attrubutes, the natural way for OffScreenGlThread, which is not in xml, would be to set them in constructor.

But according to comment #2 (comment) I'll remove it.

marcin-adamczewski · 2020-05-29T13:08:18Z

rtplibrary/src/main/java/com/pedro/rtplibrary/view/LightOpenGlView.java

+
+  @Override
+  public void setIsFlipStreamVertical(boolean isStreamFlipVertical) {
+


don't we want this feature for this class?

marcin-adamczewski · 2020-05-29T14:49:49Z

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


-    if (mode == 2 || mode == 3) { //stream rotation is enabled
-      SizeCalculator.updateMatrix(rotation, width, height, isPreview, isPortrait, MVPMatrix);
+    if(mode == 2 || mode == 3) {


I guess we need those ifs, otherwise it may break logic for mode==0 and mode==1
Maybe you could leave previous logic as was and after updateMatrix call method like

if (!isPreview) { SizeCalculator.applyStreamFlip(isFlipHorizontal, isFrilVertical) { Matrix.setIdentityM(MVPMatrix, 0); Matrix.scaleM(MVPMatrix, 0, flipStreamHorizontal ? -1 : 1, flipStreamVertical ? -1 : 1, 1f); } }

marcin-adamczewski and others added 5 commits May 14, 2020 13:02

Added ability to pause and resume stream

0171249

Added jitpack

5d73537

Merge branch 'feature-pause-resume-stream'

fc824d7

Added feature to stream only the stream from front camera

01c6ccb

Removed unused lines

2a15557

marcin-adamczewski reviewed May 26, 2020

View reviewed changes

Filip Grześkowiak added 2 commits May 27, 2020 15:31

Added review suggestions

878a56a

Removed logs

7122886

marcin-adamczewski reviewed May 29, 2020

View reviewed changes

marcin-adamczewski force-pushed the master branch from f8d274d to c8bd386 Compare August 20, 2020 16:51


		@Override
		public void setIsFlipStreamVertical(boolean isStreamFlipVertical) {

Comments

Conversation

fgrzeskowiak commented May 26, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants