refactor(core): make muxer name pascal case

ThibaultBee · Jan 10, 2025 · f659a6a · f659a6a
1 parent 87b7bc3
commit f659a6a
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/...idTest/java/io/github/thibaultbee/streampack/core/streamer/file/CameraStreamerFileTest.kt b/...idTest/java/io/github/thibaultbee/streampack/core/streamer/file/CameraStreamerFileTest.kt
@@ -31,7 +31,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.elements.endpoints.IEndpointInternal
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.CompositeEndpoint
-import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.mp4.MP4Muxer
+import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.mp4.Mp4Muxer
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.sinks.FileSink
 import io.github.thibaultbee.streampack.core.streamers.single.AudioConfig
 import io.github.thibaultbee.streampack.core.streamers.single.CameraSingleStreamer
@@ -159,7 +159,7 @@ class CameraStreamerFileTest(
                 arrayOf(
                     UriMediaDescriptor(FileUtils.createCacheFile("video.mp4").toUri()),
                     true,
-                    CompositeEndpoint(MP4Muxer(), FileSink())
+                    CompositeEndpoint(Mp4Muxer(), FileSink())
                 ),
             )
         }

diff --git a/...src/main/java/io/github/thibaultbee/streampack/core/elements/endpoints/DynamicEndpoint.kt b/...src/main/java/io/github/thibaultbee/streampack/core/elements/endpoints/DynamicEndpoint.kt
@@ -23,7 +23,7 @@ import io.github.thibaultbee.streampack.core.elements.encoders.CodecConfig
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.CompositeEndpoint
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.CompositeEndpoints
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.flv.FlvMuxer
-import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.TSMuxer
+import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.TsMuxer
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.data.TSServiceInfo
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.sinks.ContentSink
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.sinks.FileSink
@@ -119,7 +119,7 @@ open class DynamicEndpoint(
         val endpoint = getEndpoint(mediaDescriptor.type)
 
         if (endpoint is CompositeEndpoint) {
-            if (endpoint.muxer is TSMuxer) {
+            if (endpoint.muxer is TsMuxer) {
                 // Clean up services
                 endpoint.muxer.removeServices()
                 val serviceInfo = mediaDescriptor.getCustomData(TSServiceInfo::class.java)
@@ -183,7 +183,7 @@ open class DynamicEndpoint(
     private fun getTsFileEndpoint(): IEndpointInternal {
         if (tsFileEndpoint == null) {
             tsFileEndpoint = CompositeEndpoint(
-                TSMuxer(),
+                TsMuxer(),
                 FileSink()
             )
         }
@@ -193,7 +193,7 @@ open class DynamicEndpoint(
     private fun getTsContentEndpoint(): IEndpointInternal {
         if (tsContentEndpoint == null) {
             tsContentEndpoint = CompositeEndpoint(
-                TSMuxer(), ContentSink(context)
+                TsMuxer(), ContentSink(context)
             )
         }
         return tsContentEndpoint!!

diff --git a/...io/github/thibaultbee/streampack/core/elements/endpoints/composites/CompositeEndpoints.kt b/...io/github/thibaultbee/streampack/core/elements/endpoints/composites/CompositeEndpoints.kt
@@ -18,7 +18,7 @@ package io.github.thibaultbee.streampack.core.elements.endpoints.composites
 import io.github.thibaultbee.streampack.core.elements.endpoints.IEndpointInternal
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.IMuxerInternal
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.flv.FlvMuxer
-import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.TSMuxer
+import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.TsMuxer
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.data.TSServiceInfo
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.sinks.ISinkInternal
 
@@ -31,7 +31,7 @@ object CompositeEndpoints {
      */
     internal fun createSrtEndpoint(serviceInfo: TSServiceInfo?): IEndpointInternal {
         val sink = createSrtSink()
-        val muxer = TSMuxer()
+        val muxer = TsMuxer()
         if (serviceInfo != null) {
             muxer.addService(serviceInfo)
         }

diff --git a/...dpoints/composites/muxers/mp4/MP4Muxer.kt → ...dpoints/composites/muxers/mp4/Mp4Muxer.kt b/...dpoints/composites/muxers/mp4/MP4Muxer.kt → ...dpoints/composites/muxers/mp4/Mp4Muxer.kt
@@ -35,7 +35,7 @@ import io.github.thibaultbee.streampack.core.elements.utils.extensions.isAudio
 import io.github.thibaultbee.streampack.core.elements.utils.extensions.isVideo
 import java.nio.ByteBuffer
 
-class MP4Muxer(
+class Mp4Muxer(
     override var listener: IMuxerInternal.IMuxerListener? = null,
     private val timescale: Int = DEFAULT_TIMESCALE,
     private val segmenterFactory: MP4SegmenterFactory = DefaultMP4SegmenterFactory()

diff --git a/...nts/composites/muxers/mp4/MP4MuxerInfo.kt → ...nts/composites/muxers/mp4/Mp4MuxerInfo.kt b/...nts/composites/muxers/mp4/MP4MuxerInfo.kt → ...nts/composites/muxers/mp4/Mp4MuxerInfo.kt
diff --git a/...endpoints/composites/muxers/ts/TSMuxer.kt → ...endpoints/composites/muxers/ts/TsMuxer.kt b/...endpoints/composites/muxers/ts/TSMuxer.kt → ...endpoints/composites/muxers/ts/TsMuxer.kt
@@ -37,7 +37,7 @@ import java.nio.ByteBuffer
 import java.util.MissingFormatArgumentException
 import kotlin.random.Random
 
-class TSMuxer : IMuxerInternal {
+class TsMuxer : IMuxerInternal {
     override val info by lazy { TSMuxerInfo }
     private val tsServices = mutableListOf<Service>()
     private val tsPes = mutableListOf<Pes>()

diff --git a/...oints/composites/muxers/ts/TSMuxerInfo.kt → ...oints/composites/muxers/ts/TsMuxerInfo.kt b/...oints/composites/muxers/ts/TSMuxerInfo.kt → ...oints/composites/muxers/ts/TsMuxerInfo.kt
diff --git a/...oints/composites/muxers/ts/TSMuxerTest.kt → ...oints/composites/muxers/ts/TsMuxerTest.kt b/...oints/composites/muxers/ts/TSMuxerTest.kt → ...oints/composites/muxers/ts/TsMuxerTest.kt
@@ -28,7 +28,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.Test
 
-class TSMuxerTest {
+class TsMuxerTest {
     class MockMuxerListener :
         io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.IMuxerInternal.IMuxerListener {
         override fun onOutputFrame(packet: io.github.thibaultbee.streampack.core.elements.data.Packet) {}
@@ -52,7 +52,7 @@ class TSMuxerTest {
         val service = createFakeServiceInfo()
 
         val tsMux =
-            TSMuxer().apply {
+            TsMuxer().apply {
                 addService(service)
                 addStreams(
                     service,
@@ -86,7 +86,7 @@ class TSMuxerTest {
             )
         val aStreamConfig = AudioCodecConfig(mimeType = MediaFormat.MIMETYPE_AUDIO_AAC)
         try {
-            TSMuxer().apply {
+            TsMuxer().apply {
                 addStreams(
                     listOf(vStreamConfig1, vStreamConfig2, aStreamConfig)
                 )
@@ -99,7 +99,7 @@ class TSMuxerTest {
     @Test
     fun `re-add existing service test`() {
         val service = createFakeServiceInfo()
-        val tsMux = TSMuxer().apply {
+        val tsMux = TsMuxer().apply {
             addService(service)
         }
         try {
@@ -127,7 +127,7 @@ class TSMuxerTest {
         val service = createFakeServiceInfo()
 
         val tsMux =
-            TSMuxer().apply {
+            TsMuxer().apply {
                 addService(service)
                 addStreams(
                     service,
@@ -168,7 +168,7 @@ class TSMuxerTest {
         val service = createFakeServiceInfo()
 
         val tsMux =
-            TSMuxer().apply {
+            TsMuxer().apply {
                 addService(service)
                 addStreams(
                     service,
@@ -186,7 +186,7 @@ class TSMuxerTest {
 
     @Test
     fun `encode without streams test`() {
-        val tsMux = TSMuxer()
+        val tsMux = TsMuxer()
         try {
             tsMux.write(FakeFrames.generate(mimeType = MediaFormat.MIMETYPE_VIDEO_AVC), -1)
             fail()
@@ -196,7 +196,7 @@ class TSMuxerTest {
 
     @Test
     fun `encode with key frame with extra test `() {
-        val tsMux = TSMuxer()
+        val tsMux = TsMuxer()
         try {
             tsMux.write(
                 FakeFrames.generate(mimeType = MediaFormat.MIMETYPE_VIDEO_AVC), -1
@@ -215,7 +215,7 @@ class TSMuxerTest {
         )
         val service = createFakeServiceInfo()
 
-        val tsMux = TSMuxer().apply {
+        val tsMux = TsMuxer().apply {
             addService(service)
         }
         val streamPid =
@@ -235,7 +235,7 @@ class TSMuxerTest {
         val config = AudioCodecConfig(mimeType = MediaFormat.MIMETYPE_AUDIO_AAC)
         val service = createFakeServiceInfo()
 
-        val tsMux = TSMuxer().apply {
+        val tsMux = TsMuxer().apply {
             addService(service)
         }
         val streamPid =

diff --git a/...ava/io/github/thibaultbee/streampack/ext/srt/internal/endpoints/composites/SrtEndpoint.kt b/...ava/io/github/thibaultbee/streampack/ext/srt/internal/endpoints/composites/SrtEndpoint.kt
@@ -18,7 +18,7 @@ package io.github.thibaultbee.streampack.ext.srt.internal.endpoints.composites
 import io.github.thibaultbee.streampack.core.configuration.mediadescriptor.createDefaultTsServiceInfo
 import io.github.thibaultbee.streampack.ext.srt.internal.endpoints.composites.sinks.SrtSink
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.CompositeEndpoint
-import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.TSMuxer
+import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.TsMuxer
 import io.github.thibaultbee.streampack.core.elements.endpoints.composites.muxers.ts.data.TSServiceInfo
 
 /**
@@ -30,15 +30,15 @@ fun SrtEndpoint(serviceInfo: TSServiceInfo = createDefaultTsServiceInfo()) = Srt
 
 /**
  * A SRT endpoint.
- * It encapsulates a [TSMuxer] and a [SrtSink].
+ * It encapsulates a [TsMuxer] and a [SrtSink].
  */
 class SrtEndpoint internal constructor() :
-    CompositeEndpoint(TSMuxer(), SrtSink()) {
+    CompositeEndpoint(TsMuxer(), SrtSink()) {
     fun addService(serviceInfo: TSServiceInfo = createDefaultTsServiceInfo()) {
-        (muxer as TSMuxer).addService(serviceInfo)
+        (muxer as TsMuxer).addService(serviceInfo)
     }
 
     fun removeService(serviceInfo: TSServiceInfo) {
-        (muxer as TSMuxer).removeService(serviceInfo)
+        (muxer as TsMuxer).removeService(serviceInfo)
     }
 }