commit 14bb6a3b64b22cc7369bf3cc52c177b5dae17a06
author Lajos Molnar <lajos@google.com> Mon Aug 17 15:40:31 2020 -0700
committer Lajos Molnar <lajos@google.com> Wed Feb 17 08:32:58 2021 -0800
tree 5736f274f57950f77bc5f1b89570ab4fc7d23c0d
parent 6a10473891d4a1efb610ee7d30d3625ecc510440

revert ARTPWriter StripStartcode fix

This is reverted so fixes to this code from AOSP can be applied.

Bug: 165061754
Merged-in: I41f5bb67049f4e4ff454aedac28b5cbda2c4df24
Change-Id: I41f5bb67049f4e4ff454aedac28b5cbda2c4df24

media/libstagefright/rtsp/ARTPWriter.cpp

diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp
index 70d34de..7800fd1 100644
--- a/media/libstagefright/rtsp/ARTPWriter.cpp
+++ b/media/libstagefright/rtsp/ARTPWriter.cpp
@@ -295,8 +295,8 @@
 
     ptr = (const uint8_t *)buffer->data() + buffer->range_offset();
 
-    if (buffer->range_length() > 0 && (*ptr & H264_NALU_MASK) == H264_NALU_SPS) {
-        for (uint32_t i = 1; i + 4 <= buffer->range_length(); i++) {
+    if ((*ptr & H264_NALU_MASK) == H264_NALU_SPS) {
+        for (uint32_t i = 0; i < buffer->range_length(); i++) {
 
             if (!memcmp(ptr + i, "\x00\x00\x00\x01", 4)) {
                 // Now, we found one more NAL unit in the media buffer.
@@ -316,28 +316,28 @@
     if (mediaBuffer == NULL || mediaBuffer->range_length() < 4)
         return;
 
-    if ((*spsBuffer) != NULL) {
+    if((*spsBuffer) != NULL) {
         (*spsBuffer)->release();
         (*spsBuffer) = NULL;
     }
 
-    if ((*ppsBuffer) != NULL) {
+    if((*ppsBuffer) != NULL) {
         (*ppsBuffer)->release();
         (*ppsBuffer) = NULL;
     }
 
     // we got sps/pps but startcode of sps is striped.
     (*spsBuffer) = MediaBufferBase::Create(spsSize);
+    int32_t ppsSize = mediaBuffer->range_length() - spsSize - 4/*startcode*/;
+    (*ppsBuffer) = MediaBufferBase::Create(ppsSize);
     memcpy((*spsBuffer)->data(),
             (const uint8_t *)mediaBuffer->data() + mediaBuffer->range_offset(),
             spsSize);
 
-    int32_t ppsSize = mediaBuffer->range_length() - spsSize - 4 /*startcode*/;
     if (ppsSize > 0) {
-        (*ppsBuffer) = MediaBufferBase::Create(ppsSize);
         ALOGV("PPS found. size=%d", (int)ppsSize);
-        mediaBuffer->set_range(mediaBuffer->range_offset() + spsSize + 4 /*startcode*/,
-                mediaBuffer->range_length() - spsSize - 4 /*startcode*/);
+        mediaBuffer->set_range(mediaBuffer->range_offset() + spsSize + 4/*startcode*/,
+                mediaBuffer->range_length() - spsSize - 4/*startcode*/);
         memcpy((*ppsBuffer)->data(),
                 (const uint8_t *)mediaBuffer->data() + mediaBuffer->range_offset(),
                 ppsSize);