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

BUG=
TEST=Manual, in browser


Review URL: https://chromiumcodereview.appspot.com/10826056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148982 0039d316-1c4b-4281-b951-d872f2087c98

media/mp4/mp4_stream_parser.cc

@@ -122,8 +122,14 @@ bool MP4StreamParser::ParseBox(bool* err) {
     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());