diff options
| author | Andreas Huber <andih@google.com> | 2013-08-09 06:06:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-09 06:06:02 -0700 |
| commit | 8ca3e7e53b4156d62d6135fc0e4c756344d9a3c4 (patch) | |
| tree | 1f108f07b4d34a47ab3a624f3218f9e24196b42b /media | |
| parent | f874f1375d758c8a7a84572a94371fbd4085f0df (diff) | |
| parent | 9bdc9c4ee0b44ca407cdca4499df9b3134bc5884 (diff) | |
| download | frameworks_av-8ca3e7e53b4156d62d6135fc0e4c756344d9a3c4.zip frameworks_av-8ca3e7e53b4156d62d6135fc0e4c756344d9a3c4.tar.gz frameworks_av-8ca3e7e53b4156d62d6135fc0e4c756344d9a3c4.tar.bz2 | |
am 9bdc9c4e: am bcd86896: am d0f5664a: Merge "Handle undefined NAL type for h264 streaming"
* commit '9bdc9c4ee0b44ca407cdca4499df9b3134bc5884':
Handle undefined NAL type for h264 streaming
Diffstat (limited to 'media')
| -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); |