fix(*): do not remove prefix of frame when frame does not have extra

ThibaultBee · Mar 27, 2024 · adf88e5 · adf88e5
1 parent 99f158f
commit adf88e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...n/java/io/github/thibaultbee/streampack/internal/utils/extensions/ByteBufferExtensions.kt b/...n/java/io/github/thibaultbee/streampack/internal/utils/extensions/ByteBufferExtensions.kt
@@ -293,6 +293,9 @@ fun ByteBuffer.extractRbsp(headerLength: Int): ByteBuffer {
  * @return [ByteBuffer] without prefixes
  */
 fun ByteBuffer.removePrefixes(prefixes: List<ByteBuffer>): ByteBuffer {
+    if (prefixes.isEmpty()) {
+        return this
+    }
     val mutablePrefixes = prefixes.toMutableList()
     var hasPrefix = true
     while (hasPrefix) {

diff --git a/.../java/io/github/thibaultbee/streampack/internal/utils/extensions/MediaFormatExtensions.kt b/.../java/io/github/thibaultbee/streampack/internal/utils/extensions/MediaFormatExtensions.kt
@@ -23,8 +23,12 @@ import java.nio.ByteBuffer
  * Extracts csd buffers from MediaFormat.
  * It can contains SPS, PPS for AVC.
  */
-val MediaFormat.extra: List<ByteBuffer>
+val MediaFormat.extra: List<ByteBuffer>?
     get() {
+        if (!containsKey("csd-0") && !containsKey("csd-1") && !containsKey("csd-2")) {
+            return null
+        }
+
         val extra = mutableListOf<ByteBuffer>()
 
         getByteBuffer("csd-0")?.let {