Skip to content

clear renderer on released #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
USAMAWIZARD wants to merge 2 commits into
base: master
Choose a base branch
from
Open

clear renderer on released #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e63a0c6
clear renderer on released
USAMAWIZARD Mar 31, 2026
91855a4
clear renderer on released
USAMAWIZARD Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/WebRTCClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,13 +1217,16 @@ public void releaseRenderer(SurfaceViewRenderer renderer, VideoTrack track, Vide
VideoTrack videoTrack = (track != null) ? track : (VideoTrack) renderer.getTag();
VideoSink videoSink = (sink != null) ? sink : (VideoSink) renderer.getTag(renderer.getId());

if (videoTrack != null && videoSink != null)

if (videoTrack != null && videoSink != null) {
videoTrack.removeSink(videoSink);
renderer.clearAnimation();
mainHandler.postAtFrontOfQueue(renderer::clearImage);
}

renderer.clearAnimation();
renderer.clearImage();
renderer.release();
renderer.setTag(null);
renderer.setTag(renderer.getId(), null);
});
}

Expand Down
5 changes: 5 additions & 0 deletions webrtc-android-framework/src/main/java/org/webrtc/EglRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,11 @@ public void release() {
renderThreadHandler.removeCallbacks(logStatisticsRunnable);
// Release EGL and GL resources on render thread.
renderThreadHandler.postAtFrontOfQueue(() -> {
// Clear surface before EGL teardown so the last video frame is not left visible.
if (eglBase != null && eglBase.hasSurface()) {
eglBase.makeCurrent();
clearSurfaceOnRenderThread(0 /* red */, 0 /* green */, 0 /* blue */, 0 /* alpha */);
}
// Detach current shader program.
synchronized (EglBase.lock) {
GLES20.glUseProgram(/* program= */ 0);
Expand Down
22 changes: 22 additions & 0 deletions ...-android-framework/src/test/java/io/antmedia/webrtcandroidframework/WebRTCClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,6 +1301,28 @@ public void releaseRendererTest() throws NoSuchFieldException, IllegalAccessEx
verify(renderer).clearImage();
verify(renderer).release();
verify(renderer).setTag(null);
verify(renderer).setTag(1, null);
}

@Test
public void releaseRenderer_withoutTrackAndSink_stillClearsAndReleases()
throws NoSuchFieldException, IllegalAccessException {
SurfaceViewRenderer renderer = mock(SurfaceViewRenderer.class);
when(renderer.getId()).thenReturn(2);
when(renderer.getTag()).thenReturn(null);
when(renderer.getTag(2)).thenReturn(null);

Field field = WebRTCClient.class.getDeclaredField("mainHandler");
field.setAccessible(true);
field.set(webRTCClient, getMockHandler());

webRTCClient.releaseRenderer(renderer);

verify(renderer).clearAnimation();
verify(renderer).clearImage();
verify(renderer).release();
verify(renderer).setTag(null);
verify(renderer).setTag(2, null);
}

@Test
Expand Down
Loading