chunk SRT packets again

Author: pedroSG94

srt/src/main/java/com/pedro/srt/mpeg2ts/packets/AacPacket.kt

@@ -19,7 +19,6 @@ package com.pedro.srt.mpeg2ts.packets
 import com.pedro.common.AudioUtils
 import com.pedro.common.frame.MediaFrame
 import com.pedro.common.removeInfo
-import com.pedro.common.toByteArray
 import com.pedro.srt.mpeg2ts.MpegTsPacket
 import com.pedro.srt.mpeg2ts.MpegType
 import com.pedro.srt.mpeg2ts.Pes
@@ -55,7 +54,7 @@ class AacPacket(
     fixedBuffer.get(payload, headerSize, length)
 
     val pes = Pes(psiManager.getAudioPid().toInt(), false, PesType.AUDIO, mediaFrame.info.timestamp, ByteBuffer.wrap(payload))
-    val mpeg2tsPackets = mpegTsPacketizer.write(listOf(pes)).map { buffer ->
+    val mpeg2tsPackets = chunkPackets(mpegTsPacketizer.write(listOf(pes))).map { buffer ->
         MpegTsPacket(buffer, MpegType.AUDIO, PacketPosition.SINGLE, isKey = false)
     }
     if (mpeg2tsPackets.isNotEmpty()) callback(mpeg2tsPackets)

srt/src/main/java/com/pedro/srt/mpeg2ts/packets/BasePacket.kt

@@ -17,9 +17,11 @@
 package com.pedro.srt.mpeg2ts.packets
 
 import com.pedro.common.frame.MediaFrame
+import com.pedro.common.toByteArray
 import com.pedro.srt.mpeg2ts.MpegTsPacket
 import com.pedro.srt.mpeg2ts.MpegTsPacketizer
 import com.pedro.srt.mpeg2ts.psi.PsiManager
+import java.nio.ByteBuffer
 
 /**
  * Created by pedro on 20/8/23.
@@ -47,7 +49,7 @@ abstract class BasePacket(
 ) {
 
   protected val mpegTsPacketizer =  MpegTsPacketizer(psiManager)
-  protected var chunkSize = limitSize / MpegTsPacketizer.packetSize //max number of ts packets per srtpacket
+  private var chunkSize = limitSize / MpegTsPacketizer.packetSize //max number of ts packets per srtpacket
 
   abstract suspend fun createAndSendPacket(
     mediaFrame: MediaFrame,
@@ -65,4 +67,16 @@ abstract class BasePacket(
     this.limitSize = limitSize
     chunkSize = limitSize / MpegTsPacketizer.packetSize
   }
+
+  protected fun chunkPackets(mpeg2tsPackets: List<ByteArray>): List<ByteArray> {
+    val chunked = mpeg2tsPackets.chunked(chunkSize)
+    val packets = mutableListOf<ByteArray>()
+    chunked.forEach { chunks ->
+      val size = chunks.sumOf { it.size }
+      val buffer = ByteBuffer.allocate(size)
+      chunks.forEach { buffer.put(it) }
+      packets.add(buffer.toByteArray())
+    }
+    return packets
+  }
 }

srt/src/main/java/com/pedro/srt/mpeg2ts/packets/H26XPacket.kt

@@ -78,7 +78,7 @@ class H26XPacket(
     validBuffer.get(payload, 0, validBuffer.remaining())
 
     val pes = Pes(psiManager.getVideoPid().toInt(), isKeyFrame, PesType.VIDEO, mediaFrame.info.timestamp, ByteBuffer.wrap(payload))
-    val mpeg2tsPackets = mpegTsPacketizer.write(listOf(pes)).map { buffer ->
+    val mpeg2tsPackets = chunkPackets(mpegTsPacketizer.write(listOf(pes))).map { buffer ->
       MpegTsPacket(buffer, MpegType.VIDEO, PacketPosition.SINGLE, isKeyFrame)
     }
     if (mpeg2tsPackets.isNotEmpty()) callback(mpeg2tsPackets)

srt/src/main/java/com/pedro/srt/mpeg2ts/packets/OpusPacket.kt

@@ -18,7 +18,6 @@ package com.pedro.srt.mpeg2ts.packets
 
 import com.pedro.common.frame.MediaFrame
 import com.pedro.common.removeInfo
-import com.pedro.common.toByteArray
 import com.pedro.srt.mpeg2ts.MpegTsPacket
 import com.pedro.srt.mpeg2ts.MpegType
 import com.pedro.srt.mpeg2ts.Pes
@@ -50,7 +49,7 @@ class OpusPacket(
     System.arraycopy(header, 0, payload, 0, header.size)
 
     val pes = Pes(psiManager.getAudioPid().toInt(), true, PesType.PRIVATE_STREAM_1, mediaFrame.info.timestamp, ByteBuffer.wrap(payload))
-    val mpeg2tsPackets = mpegTsPacketizer.write(listOf(pes)).map { buffer ->
+    val mpeg2tsPackets = chunkPackets(mpegTsPacketizer.write(listOf(pes))).map { buffer ->
       MpegTsPacket(buffer, MpegType.AUDIO, PacketPosition.SINGLE, true)
     }
     if (mpeg2tsPackets.isNotEmpty()) callback(mpeg2tsPackets)