| commit | c247f8b96c5f777f33103b49cb80b4bbf3eb554a | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Feb 18 02:19:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 18 02:19:24 2021 +0000 |
| tree | 32697677923fdb9648a7c98812d117507bd5f9ec | |
| parent | f35c8bbd539a49feb9fb5dc4caef13a7e90de9d5 [diff] | |
| parent | e997e44fd302396286dda92e9094b6d514ca52bc [diff] |
Merge "VT: Skip unknown payload type packet" am: 2ea8149a2d am: e997e44fd3 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/953061 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7d1373a3d926c3747909054a57758d400b110d7b
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.