commit 0675e5651ab2a278125ef292d4e8ad6536b88ce9
author Byeongjo Park <bjo.park@samsung.com> Tue Sep 08 15:15:27 2020 +0900
committer Josh Hou <joshhou@google.com> Wed Jan 13 10:14:31 2021 +0800
tree a1f171715e34371ace118eb30856f38e6298842a
parent 1c8663bcaadbf298454fda0c6171e99dee35a539

VT: Fixed an issue that CVO can not be parsed.

[Problem] CVO value can not be parsed even the
  RTP eXtension packetized in standard.
[Cause] Extension length index should not be 0.
[Solution] Remove a code that modified extension length.

Bug: 167935079

Signed-off-by: Byeongjo Park <bjo.park@samsung.com>
Change-Id: I1ae58c7f4edab108eb0f24836d80c0ae23665137

media/libstagefright/rtsp/ARTPConnection.cpp

diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp
index 07f9dd3..97a9bbb 100644
--- a/media/libstagefright/rtsp/ARTPConnection.cpp
+++ b/media/libstagefright/rtsp/ARTPConnection.cpp
@@ -678,14 +678,14 @@
         const uint8_t *extensionData = &data[payloadOffset];
 
         size_t extensionLength =
-            4 * (extensionData[2] << 8 | extensionData[3]);
+            (4 * (extensionData[2] << 8 | extensionData[3])) + 4;
 
-        if (size < payloadOffset + 4 + extensionLength) {
+        if (size < payloadOffset + extensionLength) {
             return -1;
         }
 
         parseRTPExt(s, (const uint8_t *)extensionData, extensionLength, &cvoDegrees);
-        payloadOffset += 4 + extensionLength;
+        payloadOffset += extensionLength;
     }
 
     uint32_t srcId = u32at(&data[8]);
@@ -699,8 +699,9 @@
     meta->setInt32("rtp-time", rtpTime);
     meta->setInt32("PT", data[1] & 0x7f);
     meta->setInt32("M", data[1] >> 7);
-    if (cvoDegrees >= 0)
+    if (cvoDegrees >= 0) {
         meta->setInt32("cvo", cvoDegrees);
+    }
 
     buffer->setInt32Data(u16at(&data[2]));
     buffer->setRange(payloadOffset, size - payloadOffset);