refactoring

Author: pedroSG94

app/src/main/java/com/pedro/streamer/rotation/CameraFragment.kt

@@ -39,6 +39,9 @@ import com.pedro.library.util.BitrateAdapter
 import com.pedro.streamer.R
 import com.pedro.streamer.utils.PathUtils
 import com.pedro.streamer.utils.toast
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -156,10 +159,12 @@ class CameraFragment: Fragment(), ConnectChecker {
       }
     }
     bSwitchCamera.setOnClickListener {
-      when (val source = genericStream.videoSource) {
-        is Camera1Source -> source.switchCamera()
-        is Camera2Source -> source.switchCamera()
-        is CameraXSource -> source.switchCamera()
+      CoroutineScope(Dispatchers.IO).launch {
+        genericStream.stopPreview()
+        // Prepare video and audio with new settings.
+        genericStream.prepareVideo(1920, 1080, 5000 * 1000, 30)
+        genericStream.prepareAudio(32000, true, 128 * 1000)
+        genericStream.startPreview(surfaceView)
       }
     }
     return view

library/src/main/java/com/pedro/library/view/GlStreamInterface.kt

@@ -136,35 +136,27 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
   }
 
   override fun addMediaCodecSurface(surface: Surface) {
-    executor?.secureSubmit {
-      if (surfaceManager.isReady) {
-        surfaceManagerEncoder.release()
-        surfaceManagerEncoder.eglSetup(surface, surfaceManager)
-      }
+    if (surfaceManager.isReady) {
+      surfaceManagerEncoder.release()
+      surfaceManagerEncoder.eglSetup(surface, surfaceManager)
     }
   }
 
   override fun removeMediaCodecSurface() {
     threadQueue.clear()
-    executor?.secureSubmit {
-      surfaceManagerEncoder.release()
-    }
+    surfaceManagerEncoder.release()
   }
 
   override fun addMediaCodecRecordSurface(surface: Surface) {
-    executor?.secureSubmit {
-      if (surfaceManager.isReady) {
-        surfaceManagerEncoderRecord.release()
-        surfaceManagerEncoderRecord.eglSetup(surface, surfaceManager)
-      }
+    if (surfaceManager.isReady) {
+      surfaceManagerEncoderRecord.release()
+      surfaceManagerEncoderRecord.eglSetup(surface, surfaceManager)
     }
   }
 
   override fun removeMediaCodecRecordSurface() {
     threadQueue.clear()
-    executor?.secureSubmit {
-      surfaceManagerEncoderRecord.release()
-    }
+    surfaceManagerEncoderRecord.release()
   }
 
   override fun takePhoto(takePhotoCallback: TakePhotoCallback?) {
@@ -174,14 +166,15 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
   override fun start() {
     threadQueue.clear()
     executor = newSingleThreadExecutor(threadQueue)
+    surfaceManager.release()
+    surfaceManager.eglSetup()
+    surfaceManagerPhoto.release()
+    surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManager)
+    sensorRotationManager.start()
+    running.set(true)
     executor?.secureSubmit {
-      surfaceManager.release()
-      surfaceManager.eglSetup()
       surfaceManager.makeCurrent()
       mainRender.initGl(context, encoderWidth, encoderHeight, encoderWidth, encoderHeight)
-      surfaceManagerPhoto.release()
-      surfaceManagerPhoto.eglSetup(encoderWidth, encoderHeight, surfaceManager)
-      running.set(true)
       mainRender.getSurfaceTexture().setOnFrameAvailableListener(this)
       forceRender.start {
         executor?.execute {
@@ -192,24 +185,21 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
           }
         }
       }
-      sensorRotationManager.start()
     }
   }
 
   override fun stop() {
     running.set(false)
     threadQueue.clear()
-    executor?.secureSubmit {
-      forceRender.stop()
-      sensorRotationManager.stop()
-      surfaceManagerPhoto.release()
-      surfaceManagerEncoder.release()
-      surfaceManagerEncoderRecord.release()
-      surfaceManager.release()
-      mainRender.release()
-    }
     executor?.shutdownNow()
     executor = null
+    forceRender.stop()
+    sensorRotationManager.stop()
+    surfaceManagerPhoto.release()
+    surfaceManagerEncoder.release()
+    surfaceManagerEncoderRecord.release()
+    surfaceManager.release()
+    mainRender.release()
   }
 
   private fun draw(forced: Boolean) {

library/src/main/java/com/pedro/library/view/OpenGlView.java

@@ -316,12 +316,7 @@ public void addMediaCodecSurface(Surface surface) {
   @Override
   public void removeMediaCodecSurface() {
     threadQueue.clear();
-    ExecutorService executor = this.executor;
-    if (executor == null) return;
-    ExtensionsKt.secureSubmit(executor, () -> {
-      surfaceManagerEncoder.release();
-      return null;
-    });
+    surfaceManagerEncoder.release();
   }
 
   @Override
@@ -385,18 +380,15 @@ public void stop() {
     running.set(false);
     threadQueue.clear();
     ExecutorService executor = this.executor;
-    if (executor == null) return;
-    ExtensionsKt.secureSubmit(executor, () -> {
-      forceRenderer.stop();
-      surfaceManagerPhoto.release();
-      surfaceManagerEncoder.release();
-      surfaceManagerEncoderRecord.release();
-      surfaceManager.release();
-      mainRender.release();
-      return null;
-    });
-    executor.shutdownNow();
+    if (executor != null) executor.shutdownNow();
     this.executor = null;
+    forceRenderer.stop();
+    surfaceManagerPhoto.release();
+    surfaceManagerEncoder.release();
+    surfaceManagerEncoderRecord.release();
+    surfaceManager.release();
+    mainRender.release();
+
   }
 
   @Override