| commit | e997e44fd302396286dda92e9094b6d514ca52bc | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Feb 18 01:43:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 18 01:43:21 2021 +0000 |
| tree | 6bd28fa085d192df688395ddfc9271b29c919f69 | |
| parent | 612f648ace4c84cc6e9c5ff0f96b059442593240 [diff] | |
| parent | 2ea8149a2dc18c9dd9251e69e28faca7c2096b81 [diff] |
Merge "VT: Skip unknown payload type packet" am: 2ea8149a2d Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/953061 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I47c0a8b74d2be6406e5eadc19828ccd8cfab360c
diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp index b62a2c5..7666694 100644 --- a/media/libstagefright/rtsp/ARTPConnection.cpp +++ b/media/libstagefright/rtsp/ARTPConnection.cpp
@@ -597,6 +597,11 @@ return -1; } + if ((data[1] & 0x7f) == 20) { + // Unassigned payload type + return -1; + } + if (data[0] & 0x20) { // Padding present.