summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-08-22 21:18:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-22 21:18:41 +0000
commit687ee2d4e0fcddc4af0b6ad1096ea330c23a85c4 (patch)
tree14172c2f7b15ff63ec2ee9700b4180350abb281d
parent51e194c31dce5f9b62ebae2023b91fb2f38b0a77 (diff)
parent89c4ab2f4e4fbccf5c67e2671cf252053dbe5d38 (diff)
downloadframeworks_av-687ee2d4e0fcddc4af0b6ad1096ea330c23a85c4.zip
frameworks_av-687ee2d4e0fcddc4af0b6ad1096ea330c23a85c4.tar.gz
frameworks_av-687ee2d4e0fcddc4af0b6ad1096ea330c23a85c4.tar.bz2
am 89c4ab2f: Merge "print warning if offset != buffer size" into lmp-dev
* commit '89c4ab2f4e4fbccf5c67e2671cf252053dbe5d38': print warning if offset != buffer size
-rw-r--r--media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
index 76f8f54..7eb6542 100644
--- a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
+++ b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
@@ -358,6 +358,11 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket(
CopyTimes(accessUnit, buffer);
mPackets.push_back(accessUnit);
}
+
+ if (offset != buffer->size()) {
+ ALOGW("potentially malformed packet (offset %d, size %d)",
+ offset, buffer->size());
+ }
}
queue->erase(queue->begin());