Disabled surface hardware scaler due to resizing bugs when starting/stopping stream. Provided methods to gracefully pause the stream and camera. Improved overlay texture stability

riccardo-auctionslive · riccardo-auctionslive · commit b56e05a6ece6 · 2025-10-30T08:57:06.000+11:00
diff --git a/webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/WebRTCClient.java b/webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/WebRTCClient.java
@@ -638,7 +638,7 @@ public void setRendererForVideoTrack(SurfaceViewRenderer renderer, VideoTrack vi
                 remoteVideoSink.setTarget(renderer);
                 renderer.init(eglBase.getEglBaseContext(), null);
                 renderer.setScalingType(config.scalingType);
-                renderer.setEnableHardwareScaler(true);
+                renderer.setEnableHardwareScaler(false); /* This was enabled, but causes weird resizing and resolutions on Samsung S23 Ultra */
                 renderer.setTag(renderer.getId(), remoteVideoSink);
             }
             videoTrack.addSink(remoteVideoSink);
@@ -784,7 +784,7 @@ public void initializeRenderers() {
             config.localVideoRenderer.init(eglBase.getEglBaseContext(), null);
             config.localVideoRenderer.setScalingType(config.scalingType);
             config.localVideoRenderer.setZOrderMediaOverlay(true);
-            config.localVideoRenderer.setEnableHardwareScaler(true /* enabled */);
+            config.localVideoRenderer.setEnableHardwareScaler(false); /* This was enabled, but causes weird resizing and resolutions on Samsung S23 Ultra */
             config.localVideoRenderer.setOnTouchListener(this::handleFocusTouch);
             localVideoSink.setTarget(config.localVideoRenderer);
         }
@@ -843,6 +843,52 @@ public void initializeVideoCapturer() {
         });
     }
 
+    public void releaseVideoCapturer() {
+        localVideoTrack = null;
+        localAudioTrack = null;
+
+        mainHandler.post(() -> {
+            executor.execute(() -> {
+                if (videoCapturer != null && !videoCapturerStopped) {
+                    try {
+                        videoCapturer.stopCapture();
+                        videoCapturer.dispose();
+                        videoCapturer = null;
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    videoCapturerStopped = true;
+                }
+
+                Log.d(TAG, "Closing audio source.");
+                if (audioSource != null) {
+                    audioSource.dispose();
+                    audioSource = null;
+                }
+                Log.d(TAG, "Stopping capture.");
+                if (videoCapturer != null && !videoCapturerStopped) {
+                    try {
+                        videoCapturer.stopCapture();
+                        videoCapturer.dispose();
+                        videoCapturer = null;
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    videoCapturerStopped = true;
+                }
+                Log.d(TAG, "Closing video source.");
+                if (videoSource != null) {
+                    videoSource.dispose();
+                    videoSource = null;
+                }
+                if (surfaceTextureHelper != null) {
+                    surfaceTextureHelper.dispose();
+                    surfaceTextureHelper = null;
+                }
+            });
+        });
+    }
+
     public void setBitrate(int bitrate) {
         setVideoMaxBitrate(bitrate);
     }
@@ -957,6 +1003,30 @@ public void stop(String streamId, boolean byUser) {
         }
     }
 
+    public void stopPublish(String streamId) {
+        if(released){
+            return;
+        }
+
+        mainHandler.post(() -> {
+            executor.execute(() -> {
+                PeerInfo peerInfo = peers.get(streamId);
+                if (peerInfo != null) {
+                    Log.d(TAG, "Closing peer connections for " + peerInfo.id);
+                    PeerConnection peerConnection = peerInfo.peerConnection;
+                    if (peerConnection != null) {
+                        peerConnection.dispose();
+                        peerInfo.peerConnection = null;
+                    }
+                }
+                peers.clear();
+
+                Log.d(TAG, "Closing peer connection done.");
+                onPeerConnectionClosed();
+            });
+        });
+    }
+
     @Override
     public void switchCamera() {
         if (config.videoSource == StreamSource.FRONT_CAMERA) {
diff --git a/webrtc-android-framework/src/main/java/org/webrtc/OverlayManager.java b/webrtc-android-framework/src/main/java/org/webrtc/OverlayManager.java
@@ -112,10 +112,11 @@ public int compare(OverlayBitmap a, OverlayBitmap b) {
         }
 
         OverlayManager.renderThreadHandler.post(() -> {
-            if (textureId != 0) {
-                GLES20.glDeleteTextures(1, new int[] { textureId }, 0);
-            }
+            int oldTextureId = textureId;
             textureId = GlUtil.loadTexture(currentBitmap);
+            if (oldTextureId != 0) {
+                GLES20.glDeleteTextures(1, new int[] { oldTextureId }, 0);
+            }
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,11 @@ public int compare(OverlayBitmap a, OverlayBitmap b) {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`OverlayManager.renderThreadHandler.post(() -> {`
`115`		`- if (textureId != 0) {`
`116`		`- GLES20.glDeleteTextures(1, new int[] { textureId }, 0);`
`117`		`- }`
	`115`	`+ int oldTextureId = textureId;`
`118`	`116`	`textureId = GlUtil.loadTexture(currentBitmap);`
	`117`	`+ if (oldTextureId != 0) {`
	`118`	`+ GLES20.glDeleteTextures(1, new int[] { oldTextureId }, 0);`
	`119`	`+ }`
`119`	`120`	`});`
`120`	`121`	`}`
`121`	`122`