Allow auxiliary data to come inside the 'moof' atom.

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 108 matching lines @@
 
   scoped_ptr<BoxReader> reader(BoxReader::ReadTopLevelBox(buf, size, err));
   if (reader.get() == NULL) return false;
 
   if (reader->type() == FOURCC_MOOV) {
     *err = !ParseMoov(reader.get());
   } else if (reader->type() == FOURCC_MOOF) {
     moof_head_ = queue_.head();
     *err = !ParseMoof(reader.get());
 
-    // Set up first mdat offset for ParseMDATsUntil()
+    // Set up first mdat offset for ReadMDATsUntil().
     mdat_tail_ = queue_.head() + reader->size();
+
+    // Return early to avoid evicting 'moof' data from queue. Auxiliary info may
+    // be located anywhere in the file, including inside the 'moof' itself.
+    // (Since 'default-base-is-moof' is mandated, no data references can come
+    // before the head of the 'moof', so keeping this box around is sufficient.)
+    return !(*err);
   } else {
     DVLOG(2) << "Skipping unrecognized top-level box: "
              << FourCCToString(reader->type());
   }
 
   queue_.Pop(reader->size());
   return !(*err);
 }
 
 
@@ skipping 315 matching lines @@
   return true;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media