diff options
| author | Andreas Huber <andih@google.com> | 2013-08-08 16:21:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-08 16:21:42 -0700 |
| commit | 9bdc9c4ee0b44ca407cdca4499df9b3134bc5884 (patch) | |
| tree | 88945b688848d6ee0553f6327523d9c3fe284488 | |
| parent | f31abb4ee82050030b3e5a0793bb2b8e30f40d31 (diff) | |
| parent | bcd86896e486e303d285e13477e0623b2a920e78 (diff) | |
| download | frameworks_av-9bdc9c4ee0b44ca407cdca4499df9b3134bc5884.zip frameworks_av-9bdc9c4ee0b44ca407cdca4499df9b3134bc5884.tar.gz frameworks_av-9bdc9c4ee0b44ca407cdca4499df9b3134bc5884.tar.bz2 | |
am bcd86896: am d0f5664a: Merge "Handle undefined NAL type for h264 streaming"
* commit 'bcd86896e486e303d285e13477e0623b2a920e78':
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); |