diff options
| author | Andreas Huber <andih@google.com> | 2013-08-08 15:52:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-08 15:52:48 +0000 |
| commit | d0f5664abb5a8d94ae13f63a5f3491b47383ee2f (patch) | |
| tree | cfd1f8e07656fe523b22ef3d7a31d38e42bbf422 | |
| parent | b687ff9f2e02790e8a8e3964cb73e87546cd72dd (diff) | |
| parent | a355bb4f5ce39a77d05f62263d4be888e903c4cd (diff) | |
| download | frameworks_av-d0f5664abb5a8d94ae13f63a5f3491b47383ee2f.zip frameworks_av-d0f5664abb5a8d94ae13f63a5f3491b47383ee2f.tar.gz frameworks_av-d0f5664abb5a8d94ae13f63a5f3491b47383ee2f.tar.bz2 | |
Merge "Handle undefined NAL type for h264 streaming"
| -rw-r--r-- | media/libstagefright/rtsp/AAVCAssembler.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/AAVCAssembler.cpp b/media/libstagefright/rtsp/AAVCAssembler.cpp index 7ea132e..a6825eb 100644 --- a/media/libstagefright/rtsp/AAVCAssembler.cpp +++ b/media/libstagefright/rtsp/AAVCAssembler.cpp @@ -106,6 +106,13 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addNALUnit( ++mNextExpectedSeqNo; return success ? OK : MALFORMED_PACKET; + } else if (nalType == 0) { + ALOGV("Ignoring undefined nal type."); + + queue->erase(queue->begin()); + ++mNextExpectedSeqNo; + + return OK; } else { ALOGV("Ignoring unsupported buffer (nalType=%d)", nalType); |