summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-29 10:58:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-29 10:58:24 -0700
commit0a24726a64ba1c50aa6ee1610de2d80602d49fe6 (patch)
tree52dc8f5e163c26cb134853956be824298cb6a5eb
parent55fb8470278b2eb747db3f4d7c245e37abdb7f2f (diff)
parent8836f8e0bfc64dce81963db89dfc5d0f11c29483 (diff)
downloadframeworks_av-0a24726a64ba1c50aa6ee1610de2d80602d49fe6.zip
frameworks_av-0a24726a64ba1c50aa6ee1610de2d80602d49fe6.tar.gz
frameworks_av-0a24726a64ba1c50aa6ee1610de2d80602d49fe6.tar.bz2
am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
* commit '8836f8e0bfc64dce81963db89dfc5d0f11c29483': 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();