Eliminate box reordering in media::mp4::BoxReader.

media/mp4/box_definitions.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/box_definitions.h"
 
 #include "base/logging.h"
 #include "media/mp4/es_descriptor.h"
 #include "media/mp4/rcheck.h"
 
@@ skipping 207 matching lines @@
   return true;
 }
 
 SampleDescription::SampleDescription() : type(kInvalid) {}
 SampleDescription::~SampleDescription() {}
 FourCC SampleDescription::BoxType() const { return FOURCC_STSD; }
 
 bool SampleDescription::Parse(BoxReader* reader) {
   uint32 count;
   RCHECK(reader->SkipBytes(4) &&
-         reader->Read4(&count) &&
-         reader->ScanChildren());
+         reader->Read4(&count));
   video_entries.clear();
   audio_entries.clear();
 
   // Note: this value is preset before scanning begins. See comments in the
   // Parse(Media*) function.
   if (type == kVideo) {
     RCHECK(reader->ReadAllChildren(&video_entries));
   } else if (type == kAudio) {
     RCHECK(reader->ReadAllChildren(&audio_entries));
   }
@@ skipping 502 matching lines @@
 bool MovieFragment::Parse(BoxReader* reader) {
   RCHECK(reader->ScanChildren() &&
          reader->ReadChild(&header) &&
          reader->ReadChildren(&tracks) &&
          reader->MaybeReadChildren(&pssh));
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media