fix MPEGTS small

Author: pedroSG94

srt/src/main/java/com/pedro/srt/mpeg2ts/MpegTsPacketizer.kt

@@ -31,6 +31,7 @@ class MpegTsPacketizer(private val psiManager: PsiManager) {
 
   companion object {
     const val packetSize = 188
+    const val headerSize = 4
   }
 
   private var pesContinuity = 0
@@ -72,23 +73,28 @@ class MpegTsPacketizer(private val psiManager: PsiManager) {
           packets.add(buffer.toByteArray())
         }
         is Pes -> {
-          var adaptationFieldControl = AdaptationFieldControl.ADAPTATION_PAYLOAD
-          writeHeader(buffer, true, mpegTsPayload.pid, adaptationFieldControl, pesContinuity)
+          val data = mpegTsPayload.bufferData
+
           val isAudio = psiManager.getAudioPid().toInt() == mpegTsPayload.pid
           val pcr = if (isAudio && !mpegTsPayload.isKeyFrame) null else TimeUtils.getCurrentTimeMicro()
           val adaptationField = AdaptationField(
             discontinuityIndicator = false,
             randomAccessIndicator = mpegTsPayload.isKeyFrame, //only video can be true
             pcr = pcr
           )
-          buffer.put(adaptationField.getData())
+          val adaptationData = adaptationField.getData()
+          val isSmall = data.remaining() < buffer.remaining() - headerSize - adaptationData.size - mpegTsPayload.headerLength
+          var adaptationFieldControl = if (isSmall) AdaptationFieldControl.PAYLOAD else AdaptationFieldControl.ADAPTATION_PAYLOAD
+          writeHeader(buffer, true, mpegTsPayload.pid, adaptationFieldControl, pesContinuity)
+          buffer.put(adaptationData)
           mpegTsPayload.writeHeader(buffer)
 
-          val data = mpegTsPayload.bufferData
-          if (data.remaining() < buffer.remaining()) { //small packet
+          if (isSmall) {
             buffer.put(data)
             val stuffingSize = buffer.remaining()
-            writeStuffingBytes(buffer, stuffingSize, false)
+            writeStuffingBytes(buffer, stuffingSize, true)
+            packets.add(buffer.toByteArray())
+            pesContinuity = (pesContinuity + 1) and 0xF
             return@forEachIndexed
           }
           while (data.hasRemaining()) {

srt/src/main/java/com/pedro/srt/mpeg2ts/Pes.kt

@@ -33,7 +33,7 @@ class Pes(
   val bufferData: ByteBuffer
 ): MpegTsPayload(pid, isKeyFrame) {
 
-  private val headerLength = 14
+  val headerLength = 14
 
   private val length = headerLength + bufferData.remaining()
   private val markerBits = 2