summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-29 09:45:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-29 09:45:24 -0700
commit8836f8e0bfc64dce81963db89dfc5d0f11c29483 (patch)
tree6f52c07d78708bc27513f17a2f6d73330ae3e46b
parentbf30787f2694057e775f3b527b649a9f8074237b (diff)
parent5b15adfe9e5ee9a92b5f0a2853246fce170d4eef (diff)
downloadframeworks_av-8836f8e0bfc64dce81963db89dfc5d0f11c29483.zip
frameworks_av-8836f8e0bfc64dce81963db89dfc5d0f11c29483.tar.gz
frameworks_av-8836f8e0bfc64dce81963db89dfc5d0f11c29483.tar.bz2
am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
* commit '5b15adfe9e5ee9a92b5f0a2853246fce170d4eef': MPEG2TSWriter: Read more immediately if an empty buffer is received
-rw-r--r--media/libstagefright/MPEG2TSWriter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG2TSWriter.cpp b/media/libstagefright/MPEG2TSWriter.cpp
index 92f12af..c9ed5bb 100644
--- a/media/libstagefright/MPEG2TSWriter.cpp
+++ b/media/libstagefright/MPEG2TSWriter.cpp
@@ -419,6 +419,8 @@ void MPEG2TSWriter::SourceInfo::onMessageReceived(const sp<AMessage> &msg) {
} else {
postAVCFrame(buffer);
}
+ } else {
+ readMore();
}
buffer->release();