flutter-webrtc
diff --git a/‎android/src/main/java/com/cloudwebrtc/webrtc/record/VideoFileRenderer.java
Lines changed: 8 additions & 26 deletions b/‎android/src/main/java/com/cloudwebrtc/webrtc/record/VideoFileRenderer.java
Lines changed: 8 additions & 26 deletions
@@ -11,26 +11,21 @@
 
 import org.webrtc.EglBase;
 import org.webrtc.GlRectDrawer;
-import org.webrtc.ThreadUtils;
 import org.webrtc.VideoFrame;
 import org.webrtc.VideoFrameDrawer;
 import org.webrtc.VideoSink;
 import org.webrtc.audio.JavaAudioDeviceModule;
 import org.webrtc.audio.JavaAudioDeviceModule.SamplesReadyCallback;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.concurrent.CountDownLatch;
 
 class VideoFileRenderer implements VideoSink, SamplesReadyCallback {
     private static final String TAG = "VideoFileRenderer";
     private final HandlerThread renderThread;
     private final Handler renderThreadHandler;
     private final HandlerThread audioThread;
     private final Handler audioThreadHandler;
-    private final FileOutputStream videoOutFile;
-    private final String outputFileName;
     private int outputFileWidth = -1;
     private int outputFileHeight = -1;
     private ByteBuffer[] encoderOutputBuffers;
@@ -56,8 +51,6 @@ class VideoFileRenderer implements VideoSink, SamplesReadyCallback {
     private MediaCodec audioEncoder;
 
     VideoFileRenderer(String outputFile, final EglBase.Context sharedContext, boolean withAudio) throws IOException {
-        this.outputFileName = outputFile;
-        videoOutFile = new FileOutputStream(outputFile);
         renderThread = new HandlerThread(TAG + "RenderThread");
         renderThread.start();
         renderThreadHandler = new Handler(renderThread.getLooper());
@@ -134,28 +127,21 @@ private void renderFrameOnRenderThread(VideoFrame frame) {
      * Release all resources. All already posted frames will be rendered first.
      */
     void release() {
-        final CountDownLatch cleanupBarrier = new CountDownLatch(2);
         isRunning = false;
+        if (audioThreadHandler != null)
+            audioThreadHandler.post(() -> {
+                audioEncoder.stop();
+                audioEncoder.release();
+                audioThread.quit();
+            });
         renderThreadHandler.post(() -> {
             encoder.stop();
             encoder.release();
             eglBase.release();
+            mediaMuxer.stop();
+            mediaMuxer.release();
             renderThread.quit();
-            cleanupBarrier.countDown();
         });
-        if (audioThreadHandler != null) {
-            audioThreadHandler.post(() -> {
-                audioEncoder.stop();
-                audioEncoder.release();
-                audioThread.quit();
-                cleanupBarrier.countDown();
-            });
-        } else {
-            cleanupBarrier.countDown();
-        }
-        ThreadUtils.awaitUninterruptibly(cleanupBarrier);
-        mediaMuxer.stop();
-        mediaMuxer.release();
     }
 
     private boolean encoderStarted = false;
@@ -208,8 +194,6 @@ private void drainEncoder() {
                     if (muxerStarted)
                         mediaMuxer.writeSampleData(trackIndex, encodedData, bufferInfo);
                     isRunning = isRunning && (bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) == 0;
-                    Log.d(TAG, "passed " + bufferInfo.size + " bytes to file"
-                            + (!isRunning ? " (EOS)" : ""));
                     encoder.releaseOutputBuffer(encoderStatus, false);
                     if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
                         break;
@@ -262,8 +246,6 @@ private void drainAudio() {
                     if (muxerStarted)
                         mediaMuxer.writeSampleData(audioTrackIndex, encodedData, audioBufferInfo);
                     isRunning = isRunning && (audioBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) == 0;
-                    Log.d(TAG, "passed " + audioBufferInfo.size + " bytes to file"
-                            + (!isRunning ? " (EOS)" : ""));
                     audioEncoder.releaseOutputBuffer(encoderStatus, false);
                     if ((audioBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
                         break;