Move 'mdat' advancement logic to make more sense.

media/mp4/mp4_stream_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 62 matching lines @@
 
   queue_.Push(buf, size);
 
   BufferQueue audio_buffers;
   BufferQueue video_buffers;
 
   bool result, err = false;
 
   do {
     if (state_ == kParsingBoxes) {
-      if (mdat_tail_ > queue_.head()) {
-        result = queue_.Trim(mdat_tail_);
-      } else {
-        result = ParseBox(&err);
-      }
+      result = ParseBox(&err);
     } else {
       DCHECK_EQ(kEmittingSamples, state_);
       result = EnqueueSample(&audio_buffers, &video_buffers, &err);
       if (result) {
         int64 max_clear = runs_->GetMaxClearOffset() + moof_head_;
         DCHECK(max_clear <= queue_.tail());
         err = !(ReadMDATsUntil(max_clear) && queue_.Trim(max_clear));
       }
     }
   } while (result && !err);
@@ skipping 217 matching lines @@
 bool MP4StreamParser::EnqueueSample(BufferQueue* audio_buffers,
                                     BufferQueue* video_buffers,
                                     bool* err) {
   if (!runs_->IsRunValid()) {
     // Flush any buffers we've gotten in this chunk so that buffers don't
     // cross NewSegment() calls
     *err = !SendAndFlushSamples(audio_buffers, video_buffers);
     if (*err)
       return false;
 
+    // Remain in kEnqueueingSamples state, discarding data, until the end of
+    // the current 'mdat' box has been appended to the queue.
+    if (!queue_.Trim(mdat_tail_)) return false;

[acolwell GONE FROM CHROMIUM, 2012/07/30 15:45:50]

nit: Put return on its own line.

[strobe_, 2012/07/30 16:33:38]

Done.

+
     ChangeState(kParsingBoxes);
     end_of_segment_cb_.Run();
     return true;
   }
 
   if (!runs_->IsSampleValid()) {
     runs_->AdvanceRun();
     return true;
   }
 
@@ skipping 121 matching lines @@
   return true;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media