commit 94baecca5e14b083c46615a1bcf18ea6cf7cad46
author Andreas Huber <andih@google.com> Fri Apr 01 14:02:06 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 01 14:02:06 2011 -0700
tree ba882989bf1fc3e8f11dc20c55b4b4e9f31712c9
parent 2ba7ce928b0fa8917ee202836b0963ca58613453
parent dab59b5a4956b7e9b1ffc64a0676e7990579934e

Merge "Remove legacy hack to only drop frames every other late frame"

media/libstagefright/matroska/MatroskaExtractor.cpp

diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index b3e29b9..64266b8 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -291,6 +291,7 @@
     Mutex::Autolock autoLock(mExtractor->mLock);
 
     mCluster = mExtractor->mSegment->GetFirst();
+    mBlockEntry = NULL;
     mBlockEntryIndex = 0;
 
     do {
@@ -302,11 +303,13 @@
     Mutex::Autolock autoLock(mExtractor->mLock);
 
     mCluster = mExtractor->mSegment->FindCluster(seekTimeUs * 1000ll);
+    mBlockEntry = NULL;
     mBlockEntryIndex = 0;
 
-    while (!eos() && block()->GetTrackNumber() != mTrackNum) {
+    do {
         advance_l();
     }
+    while (!eos() && block()->GetTrackNumber() != mTrackNum);
 
     while (!eos() && !mBlockEntry->GetBlock()->IsKey()) {
         advance_l();