commit 1b832c3d8f2b1b24f9bc7025afd2b4a8b4e6c6f9
author Glenn Kasten <gkasten@google.com> Thu Aug 08 23:39:34 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 08 23:39:35 2013 +0000
tree 59129feacd309c8ce496d47f29e2468821e63579
parent 9bdc9c4ee0b44ca407cdca4499df9b3134bc5884
parent 4a0efb77198c69df711ab369ac482a42dbdfab07

Merge "Fix regression for AudioRecord streaming callback mode" into klp-dev

media/libstagefright/rtsp/AAVCAssembler.cpp

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 @@
         ++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);