fix(*): fix srt Media Descriptor packages

Author: ThibaultBee

demos/camera/src/main/java/io/github/thibaultbee/streampack/app/data/storage/DataStoreRepository.kt

@@ -21,7 +21,7 @@ import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.Media
 import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.UriMediaDescriptor
 import io.github.thibaultbee.streampack.core.streamers.single.AudioConfig
 import io.github.thibaultbee.streampack.core.streamers.single.VideoConfig
-import io.github.thibaultbee.streampack.ext.srt.data.mediadescriptor.SrtMediaDescriptor
+import io.github.thibaultbee.streampack.ext.srt.configuration.mediadescriptor.SrtMediaDescriptor
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map

demos/screenrecorder/src/main/java/io/github/thibaultbee/streampack/screenrecorder/MainActivity.kt

@@ -51,7 +51,7 @@ import io.github.thibaultbee.streampack.core.streamers.single.ISingleStreamer
 import io.github.thibaultbee.streampack.core.streamers.single.IVideoSingleStreamer
 import io.github.thibaultbee.streampack.core.streamers.single.VideoConfig
 import io.github.thibaultbee.streampack.core.streamers.utils.MediaProjectionUtils
-import io.github.thibaultbee.streampack.ext.srt.data.mediadescriptor.SrtMediaDescriptor
+import io.github.thibaultbee.streampack.ext.srt.configuration.mediadescriptor.SrtMediaDescriptor
 import io.github.thibaultbee.streampack.screenrecorder.databinding.ActivityMainBinding
 import io.github.thibaultbee.streampack.screenrecorder.models.EndpointType
 import io.github.thibaultbee.streampack.screenrecorder.services.DemoMediaProjectionService

extensions/srt/src/androidTest/java/io/github/thibaultbee/streampack/ext/srt/data/SrtMediaDescriptorTest.kt renamed to extensions/srt/src/androidTest/java/io/github/thibaultbee/streampack/ext/srt/configuration/mediadescriptor/SrtMediaDescriptorTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Thibault B.
+ * Copyright (C) 2025 Thibault B.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,46 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.ext.srt.data
+package io.github.thibaultbee.streampack.ext.srt.configuration.mediadescriptor
 
-import io.github.thibaultbee.streampack.ext.srt.data.mediadescriptor.SrtMediaDescriptor
-import org.junit.Assert.assertEquals
-import org.junit.Assert.fail
+import org.junit.Assert
 import org.junit.Test
 
 class SrtMediaDescriptorTest {
     @Test
     fun fromUrl() {
         val url = "srt://broadcast.host.com:1234"
         val connection = SrtMediaDescriptor(url)
-        assertEquals("broadcast.host.com", connection.host)
-        assertEquals(1234, connection.port)
+        Assert.assertEquals("broadcast.host.com", connection.host)
+        Assert.assertEquals(1234, connection.port)
     }
 
     @Test
     fun fromIp() {
         val url = "srt://192.168.1.12:1234"
         val connection = SrtMediaDescriptor(url)
-        assertEquals("192.168.1.12", connection.host)
-        assertEquals(1234, connection.port)
+        Assert.assertEquals("192.168.1.12", connection.host)
+        Assert.assertEquals(1234, connection.port)
     }
 
     @Test
     fun fromUrlWithParameters() {
         val url = "srt://host.com:1234?streamid=streamId&passphrase=passPhrase"
         val connection = SrtMediaDescriptor(url)
-        assertEquals("host.com", connection.host)
-        assertEquals(1234, connection.port)
-        assertEquals("streamId", connection.streamId)
-        assertEquals("passPhrase", connection.passphrase)
+        Assert.assertEquals("host.com", connection.host)
+        Assert.assertEquals(1234, connection.port)
+        Assert.assertEquals("streamId", connection.streamId)
+        Assert.assertEquals("passPhrase", connection.passphrase)
     }
 
     @Test
     fun fromUrlWithBadScheme() {
         val url = "srtp://broadcast.host.com:1234"
         try {
             SrtMediaDescriptor(url)
-            fail("Should throw an exception")
+            Assert.fail("Should throw an exception")
         } catch (_: Throwable) {
         }
     }
@@ -63,7 +61,10 @@ class SrtMediaDescriptorTest {
         try {
             SrtMediaDescriptor(url)
         } catch (t: Throwable) {
-            assertEquals("Failed to parse URL $url: unknown parameter(s): unknown", t.message)
+            Assert.assertEquals(
+                "Failed to parse URL $url: unknown parameter(s): unknown",
+                t.message
+            )
         }
     }
 }

extensions/srt/src/main/java/io/github/thibaultbee/streampack/ext/srt/data/mediadescriptor/SrtMediaDescriptor.kt renamed to extensions/srt/src/main/java/io/github/thibaultbee/streampack/ext/srt/configuration/mediadescriptor/SrtMediaDescriptor.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.thibaultbee.streampack.ext.srt.data.mediadescriptor
+package io.github.thibaultbee.streampack.ext.srt.configuration.mediadescriptor
 
 import android.net.Uri
 import io.github.thibaultbee.srtdroid.core.models.SrtUrl

extensions/srt/src/main/java/io/github/thibaultbee/streampack/ext/srt/elements/endpoints/composites/sinks/SrtSink.kt

@@ -30,7 +30,7 @@ import io.github.thibaultbee.streampack.core.elements.endpoints.MediaSinkType
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.sinks.AbstractSink
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.sinks.ClosedException
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.sinks.SinkConfiguration
-import io.github.thibaultbee.streampack.ext.srt.data.mediadescriptor.SrtMediaDescriptor
+import io.github.thibaultbee.streampack.ext.srt.configuration.mediadescriptor.SrtMediaDescriptor
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.runBlocking