chore(core): move internal source folder

ThibaultBee · ThibaultBee · commit 214214ec0ac2 · 2024-04-25T14:57:10.000+02:00
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/audio/IAudioSource.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/audio/IAudioSource.kt
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources
+package io.github.thibaultbee.streampack.internal.sources.audio
 
 import io.github.thibaultbee.streampack.data.AudioConfig
+import io.github.thibaultbee.streampack.internal.sources.IFrameSource
 
 interface IAudioSource : IPublicAudioSource, IFrameSource<AudioConfig>
 
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/audio/MicrophoneSource.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/audio/MicrophoneSource.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources
+package io.github.thibaultbee.streampack.internal.sources.audio
 
 import android.Manifest
 import android.media.AudioRecord
@@ -26,11 +26,12 @@ import android.os.Build
 import androidx.annotation.RequiresPermission
 import io.github.thibaultbee.streampack.data.AudioConfig
 import io.github.thibaultbee.streampack.internal.data.Frame
+import io.github.thibaultbee.streampack.internal.sources.IFrameSource
 import io.github.thibaultbee.streampack.internal.utils.TimeUtils
 import io.github.thibaultbee.streampack.logger.Logger
 import java.nio.ByteBuffer
 
-class AudioSource : IAudioSource, IFrameSource<AudioConfig> {
+class MicrophoneSource : IAudioSource, IFrameSource<AudioConfig> {
     private var audioRecord: AudioRecord? = null
     private var mutedByteArray: ByteArray? = null
 
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/IVideoSource.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/IVideoSource.kt
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources
+package io.github.thibaultbee.streampack.internal.sources.video
 
 import io.github.thibaultbee.streampack.data.VideoConfig
 import io.github.thibaultbee.streampack.internal.orientation.ISourceOrientationProvider
+import io.github.thibaultbee.streampack.internal.sources.IFrameSource
+import io.github.thibaultbee.streampack.internal.sources.ISurfaceSource
 
 interface IVideoSource : IFrameSource<VideoConfig>, ISurfaceSource, IPublicVideoSource {
     /**
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraController.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraController.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
 import android.Manifest
 import android.content.Context
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraExecutorManager.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraExecutorManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
 import android.Manifest
 import android.hardware.camera2.CameraCaptureSession
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraHandlerManager.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraHandlerManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
 import android.Manifest
 import android.hardware.camera2.CameraCaptureSession
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraHelper.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraHelper.kt
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
 import android.content.Context
 import android.hardware.camera2.CameraCharacteristics
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraOrientationProvider.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraOrientationProvider.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
 import android.content.Context
 import android.hardware.camera2.CameraCharacteristics
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraSettings.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraSettings.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
 import android.content.Context
 import android.graphics.PointF
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraSource.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/CameraSource.kt
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
 import android.Manifest
 import android.content.Context
 import android.view.Surface
 import androidx.annotation.RequiresPermission
 import io.github.thibaultbee.streampack.data.VideoConfig
 import io.github.thibaultbee.streampack.internal.data.Frame
-import io.github.thibaultbee.streampack.internal.sources.IVideoSource
+import io.github.thibaultbee.streampack.internal.sources.video.IVideoSource
 import io.github.thibaultbee.streampack.internal.utils.av.video.DynamicRangeProfile
 import io.github.thibaultbee.streampack.utils.defaultCameraId
 import io.github.thibaultbee.streampack.utils.isFrameRateSupported
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/ICameraThreadManager.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/ICameraThreadManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
 import android.hardware.camera2.CameraCaptureSession
 import android.hardware.camera2.CameraDevice
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/IPublicCameraSource.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/camera/IPublicCameraSource.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.camera
+package io.github.thibaultbee.streampack.internal.sources.video.camera
 
-import io.github.thibaultbee.streampack.internal.sources.IPublicVideoSource
+import io.github.thibaultbee.streampack.internal.sources.video.IPublicVideoSource
 
 interface IPublicCameraSource : IPublicVideoSource {
     /**
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/screen/ScreenSource.kt b/core/src/main/java/io/github/thibaultbee/streampack/internal/sources/video/screen/ScreenSource.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.internal.sources.screen
+package io.github.thibaultbee.streampack.internal.sources.video.screen
 
 import android.content.Context
 import android.hardware.display.DisplayManager
@@ -29,7 +29,7 @@ import io.github.thibaultbee.streampack.data.VideoConfig
 import io.github.thibaultbee.streampack.error.StreamPackError
 import io.github.thibaultbee.streampack.internal.data.Frame
 import io.github.thibaultbee.streampack.internal.orientation.AbstractSourceOrientationProvider
-import io.github.thibaultbee.streampack.internal.sources.IVideoSource
+import io.github.thibaultbee.streampack.internal.sources.video.IVideoSource
 import io.github.thibaultbee.streampack.internal.utils.extensions.isDevicePortrait
 import io.github.thibaultbee.streampack.internal.utils.extensions.landscapize
 import io.github.thibaultbee.streampack.internal.utils.extensions.portraitize
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseAudioOnlyStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseAudioOnlyStreamer.kt
@@ -17,7 +17,7 @@ package io.github.thibaultbee.streampack.streamers.bases
 
 import android.content.Context
 import io.github.thibaultbee.streampack.internal.endpoints.IEndpoint
-import io.github.thibaultbee.streampack.internal.sources.AudioSource
+import io.github.thibaultbee.streampack.internal.sources.audio.MicrophoneSource
 import io.github.thibaultbee.streampack.listeners.OnErrorListener
 
 /**
@@ -34,7 +34,7 @@ open class BaseAudioOnlyStreamer(
 ) : BaseStreamer(
     context = context,
     internalVideoSource = null,
-    internalAudioSource = AudioSource(),
+    internalAudioSource = MicrophoneSource(),
     internalEndpoint = internalEndpoint,
     initialOnErrorListener = initialOnErrorListener
 )
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseCameraStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseCameraStreamer.kt
@@ -23,9 +23,9 @@ import android.view.TextureView
 import androidx.annotation.RequiresPermission
 import io.github.thibaultbee.streampack.error.StreamPackError
 import io.github.thibaultbee.streampack.internal.endpoints.IEndpoint
-import io.github.thibaultbee.streampack.internal.sources.AudioSource
-import io.github.thibaultbee.streampack.internal.sources.camera.CameraSource
-import io.github.thibaultbee.streampack.internal.sources.camera.IPublicCameraSource
+import io.github.thibaultbee.streampack.internal.sources.audio.MicrophoneSource
+import io.github.thibaultbee.streampack.internal.sources.video.camera.CameraSource
+import io.github.thibaultbee.streampack.internal.sources.video.camera.IPublicCameraSource
 import io.github.thibaultbee.streampack.listeners.OnErrorListener
 import io.github.thibaultbee.streampack.streamers.helpers.CameraStreamerConfigurationInfo
 import io.github.thibaultbee.streampack.streamers.interfaces.ICameraStreamer
@@ -47,7 +47,7 @@ open class BaseCameraStreamer(
 ) : BaseStreamer(
     context = context,
     internalVideoSource = CameraSource(context),
-    internalAudioSource = if (enableAudio) AudioSource() else null,
+    internalAudioSource = if (enableAudio) MicrophoneSource() else null,
     internalEndpoint = internalEndpoint,
     initialOnErrorListener = initialOnErrorListener
 ), ICameraStreamer {
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseScreenRecorderStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseScreenRecorderStreamer.kt
@@ -22,8 +22,8 @@ import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResult
 import androidx.core.app.ActivityCompat
 import io.github.thibaultbee.streampack.internal.endpoints.IEndpoint
-import io.github.thibaultbee.streampack.internal.sources.AudioSource
-import io.github.thibaultbee.streampack.internal.sources.screen.ScreenSource
+import io.github.thibaultbee.streampack.internal.sources.audio.MicrophoneSource
+import io.github.thibaultbee.streampack.internal.sources.video.screen.ScreenSource
 import io.github.thibaultbee.streampack.listeners.OnErrorListener
 
 /**
@@ -42,7 +42,7 @@ open class BaseScreenRecorderStreamer(
 ) : BaseStreamer(
     context = context,
     internalVideoSource = ScreenSource(context),
-    internalAudioSource = if (enableAudio) AudioSource() else null,
+    internalAudioSource = if (enableAudio) MicrophoneSource() else null,
     internalEndpoint = internalEndpoint,
     initialOnErrorListener = initialOnErrorListener
 ) {
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/bases/BaseStreamer.kt
@@ -33,10 +33,10 @@ import io.github.thibaultbee.streampack.internal.endpoints.IEndpoint
 import io.github.thibaultbee.streampack.internal.endpoints.IPublicEndpoint
 import io.github.thibaultbee.streampack.internal.events.EventHandler
 import io.github.thibaultbee.streampack.internal.gl.CodecSurface
-import io.github.thibaultbee.streampack.internal.sources.IAudioSource
-import io.github.thibaultbee.streampack.internal.sources.IPublicAudioSource
-import io.github.thibaultbee.streampack.internal.sources.IVideoSource
-import io.github.thibaultbee.streampack.internal.sources.IPublicVideoSource
+import io.github.thibaultbee.streampack.internal.sources.audio.IAudioSource
+import io.github.thibaultbee.streampack.internal.sources.audio.IPublicAudioSource
+import io.github.thibaultbee.streampack.internal.sources.video.IVideoSource
+import io.github.thibaultbee.streampack.internal.sources.video.IPublicVideoSource
 import io.github.thibaultbee.streampack.listeners.OnErrorListener
 import io.github.thibaultbee.streampack.logger.Logger
 import io.github.thibaultbee.streampack.streamers.helpers.IConfigurationInfo
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/interfaces/ICameraStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/interfaces/ICameraStreamer.kt
@@ -21,7 +21,7 @@ import android.view.SurfaceHolder
 import android.view.SurfaceView
 import android.view.TextureView
 import androidx.annotation.RequiresPermission
-import io.github.thibaultbee.streampack.internal.sources.camera.IPublicCameraSource
+import io.github.thibaultbee.streampack.internal.sources.video.camera.IPublicCameraSource
 import io.github.thibaultbee.streampack.streamers.bases.BaseStreamer
 
 interface ICameraStreamer {
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/streamers/interfaces/IStreamer.kt b/core/src/main/java/io/github/thibaultbee/streampack/streamers/interfaces/IStreamer.kt
@@ -22,8 +22,8 @@ import io.github.thibaultbee.streampack.data.VideoConfig
 import io.github.thibaultbee.streampack.error.StreamPackError
 import io.github.thibaultbee.streampack.internal.encoders.IPublicEncoder
 import io.github.thibaultbee.streampack.internal.endpoints.IPublicEndpoint
-import io.github.thibaultbee.streampack.internal.sources.IPublicAudioSource
-import io.github.thibaultbee.streampack.internal.sources.IPublicVideoSource
+import io.github.thibaultbee.streampack.internal.sources.audio.IPublicAudioSource
+import io.github.thibaultbee.streampack.internal.sources.video.IPublicVideoSource
 import io.github.thibaultbee.streampack.listeners.OnErrorListener
 import io.github.thibaultbee.streampack.streamers.helpers.IConfigurationInfo
 
diff --git a/core/src/test/java/io/github/thibaultbee/streampack/internal/sources/AudioCaptureUnitTest.kt b/core/src/test/java/io/github/thibaultbee/streampack/internal/sources/AudioCaptureUnitTest.kt
@@ -15,42 +15,43 @@
  */
 package io.github.thibaultbee.streampack.internal.sources
 
+import io.github.thibaultbee.streampack.internal.sources.audio.MicrophoneSource
 import io.github.thibaultbee.streampack.logger.Logger
 import io.github.thibaultbee.streampack.utils.FakeLogger
 import org.junit.Assert
 import org.junit.Test
 import java.nio.ByteBuffer
 
-class AudioSourceUnitTest {
+class MicrophoneSourceUnitTest {
     init {
         Logger.logger = FakeLogger()
     }
 
     @Test
     fun `assert exception on bad state`() {
-        val audioSource = AudioSource()
+        val microphoneSource = MicrophoneSource()
         try {
-            audioSource.startStream()
+            microphoneSource.startStream()
             Assert.fail()
         } catch (_: Exception) {
         }
         try {
-            audioSource.getFrame(ByteBuffer.allocate(10))
+            microphoneSource.getFrame(ByteBuffer.allocate(10))
             Assert.fail()
         } catch (_: Exception) {
         }
     }
 
     @Test
     fun `assert no exception on bad state`() {
-        val audioSource = AudioSource()
+        val microphoneSource = MicrophoneSource()
         try {
-            audioSource.stopStream()
+            microphoneSource.stopStream()
         } catch (e: Exception) {
             Assert.fail()
         }
         try {
-            audioSource.release()
+            microphoneSource.release()
         } catch (e: Exception) {
             Assert.fail()
         }
diff --git a/demos/camera/src/main/java/io/github/thibaultbee/streampack/app/utils/StreamerManager.kt b/demos/camera/src/main/java/io/github/thibaultbee/streampack/app/utils/StreamerManager.kt
@@ -28,7 +28,7 @@ import io.github.thibaultbee.streampack.listeners.OnErrorListener
 import io.github.thibaultbee.streampack.streamers.StreamerLifeCycleObserver
 import io.github.thibaultbee.streampack.streamers.interfaces.IStreamer
 import io.github.thibaultbee.streampack.ui.views.PreviewView
-import io.github.thibaultbee.streampack.internal.sources.camera.CameraSettings
+import io.github.thibaultbee.streampack.internal.sources.video.camera.CameraSettings
 import io.github.thibaultbee.streampack.utils.ChunkedFileOutputStream
 import io.github.thibaultbee.streampack.utils.backCameraList
 import io.github.thibaultbee.streampack.utils.frontCameraList
