move preview new classes outside of GlInterface and add access to new methods to StreamBase

Author: pedroSG94

library/src/main/java/com/pedro/library/base/StreamBase.kt

@@ -51,6 +51,7 @@ import com.pedro.library.util.FpsListener
 import com.pedro.library.util.PreviewCallback
 import com.pedro.library.util.streamclient.StreamBaseClient
 import com.pedro.library.view.GlStreamInterface
+import com.pedro.library.view.preview.MultiPreviewConfig
 import java.nio.ByteBuffer
 import kotlin.math.max
 
@@ -366,15 +367,30 @@ abstract class StreamBase(
     if (removeCallbacks) previewCallback.removeCallbacks()
   }
 
-  fun addPreviewSurface(
-    surface: Surface,
-    config: GlStreamInterface.MultiPreviewConfig
-  ) {
+  fun addPreviewSurface(surface: Surface, config: MultiPreviewConfig) {
     if (!surface.isValid) throw IllegalArgumentException("Make sure the Surface is valid")
     if (!isOnPreview) throw IllegalStateException("Preview must be started before adding surfaces")
     glInterface.addMultiPreviewSurface(surface, config)
   }
 
+  fun removeMultiPreviewSurface(surface: Surface) {
+    glInterface.removeMultiPreviewSurface(surface)
+  }
+
+  fun removeAllMultiPreviewSurfaces() {
+    glInterface.removeAllMultiPreviewSurfaces()
+  }
+
+  fun updateMultiPreviewConfig(surface: Surface, config: MultiPreviewConfig): Boolean {
+    return glInterface.updateMultiPreviewConfig(surface, config)
+  }
+
+  fun hasMultiPreviewSurface(surface: Surface): Boolean {
+    return glInterface.hasMultiPreviewSurface(surface)
+  }
+
+  fun getMultiPreviewSurfaceCount(): Int = glInterface.getMultiPreviewSurfaceCount()
+
   /**
    * Change video source to Camera1 or Camera2.
    * Must be called after prepareVideo.

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

@@ -39,6 +39,8 @@ import com.pedro.encoder.utils.gl.AspectRatioMode
 import com.pedro.encoder.utils.gl.GlUtil
 import com.pedro.library.util.Filter
 import com.pedro.library.util.SensorRotationManager
+import com.pedro.library.view.preview.MultiPreviewConfig
+import com.pedro.library.view.preview.PreviewSurfaceInfo
 import java.util.concurrent.BlockingQueue
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ExecutorService
@@ -63,32 +65,6 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
   private val multiPreviewSurfaceManagers = ConcurrentHashMap<Surface, PreviewSurfaceInfo>()
   private val mainRender = MainRender()
 
-  /**
-   * User-facing configuration for a multi-preview surface.
-   * All configuration fields are mutable to support dynamic updates.
-   *
-   * @param width the width of the preview. 0 to use preview or encoder resolution
-   * @param height the height of the preview. 0 to use preview or encoder resolution
-   * @param horizontalFlip true to flip horizontally
-   * @param verticalFlip true to flip vertically
-   * @param aspectRatioMode aspect ratio mode for this surface
-   * @param isPortrait true for portrait orientation, false for landscape
-   * @param viewPort viewport for this surface. null for full screen
-   */
-  data class MultiPreviewConfig(
-    var width: Int = 0,
-    var height: Int = 0,
-    var horizontalFlip: Boolean = false,
-    var verticalFlip: Boolean = false,
-    var aspectRatioMode: AspectRatioMode = AspectRatioMode.Adjust,
-    var isPortrait: Boolean = false,
-    var viewPort: ViewPort? = null
-  )
-
-  data class PreviewSurfaceInfo(
-    val surfaceManager: SurfaceManager,
-    val config: MultiPreviewConfig
-  )
   private var encoderWidth = 0
   private var encoderHeight = 0
   private var encoderRecordWidth = 0
@@ -419,10 +395,18 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
       val w = if (config.width > 0) config.width else if (previewWidth == 0) encoderWidth else previewWidth
       val h = if (config.height > 0) config.height else if (previewHeight == 0) encoderHeight else previewHeight
 
-      val surfaceMgr = SurfaceManager()
-      surfaceMgr.eglSetup(surface, surfaceManager)
-      val finalConfig = MultiPreviewConfig(w, h, config.horizontalFlip, config.verticalFlip, config.aspectRatioMode, config.isPortrait, config.viewPort)
-      multiPreviewSurfaceManagers[surface] = PreviewSurfaceInfo(surfaceMgr, finalConfig)
+      val surfaceManager = SurfaceManager()
+      surfaceManager.eglSetup(surface, this@GlStreamInterface.surfaceManager)
+      val finalConfig = MultiPreviewConfig(
+        w,
+        h,
+        config.horizontalFlip,
+        config.verticalFlip,
+        config.aspectRatioMode,
+        config.isPortrait,
+        config.viewPort
+      )
+      multiPreviewSurfaceManagers[surface] = PreviewSurfaceInfo(surfaceManager, finalConfig)
     }
   }
 

library/src/main/java/com/pedro/library/view/preview/MultiPreviewConfig.kt

@@ -0,0 +1,44 @@
+/*
+ *
+ *  * Copyright (C) 2024 pedroSG94.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package com.pedro.library.view.preview
+
+import com.pedro.encoder.utils.ViewPort
+import com.pedro.encoder.utils.gl.AspectRatioMode
+
+/**
+   * User-facing configuration for a multi-preview surface.
+   * All configuration fields are mutable to support dynamic updates.
+   *
+   * @param width the width of the preview. 0 to use preview or encoder resolution
+   * @param height the height of the preview. 0 to use preview or encoder resolution
+   * @param horizontalFlip true to flip horizontally
+   * @param verticalFlip true to flip vertically
+   * @param aspectRatioMode aspect ratio mode for this surface
+   * @param isPortrait true for portrait orientation, false for landscape
+   * @param viewPort viewport for this surface. null for full screen
+   */
+data class MultiPreviewConfig(
+  var width: Int = 0,
+  var height: Int = 0,
+  var horizontalFlip: Boolean = false,
+  var verticalFlip: Boolean = false,
+  var aspectRatioMode: AspectRatioMode = AspectRatioMode.Adjust,
+  var isPortrait: Boolean = false,
+  var viewPort: ViewPort? = null
+)

library/src/main/java/com/pedro/library/view/preview/PreviewSurfaceInfo.kt

@@ -0,0 +1,26 @@
+/*
+ *
+ *  * Copyright (C) 2024 pedroSG94.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package com.pedro.library.view.preview
+
+import com.pedro.encoder.input.gl.SurfaceManager
+
+internal data class PreviewSurfaceInfo(
+  val surfaceManager: SurfaceManager,
+  val config: MultiPreviewConfig
+)