Revert of Combine 'pssh' parsing routines.

media/formats/mp4/box_reader.cc

 // Copyright 2014 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/formats/mp4/box_reader.h"
 
 #include <string.h>
 #include <algorithm>
 #include <set>
 
@@ skipping 57 matching lines @@
 }
 
 bool BufferReader::Read4sInto8s(int64* v) {
   // Beware of the need for sign extension.
   int32 tmp;
   RCHECK(Read4s(&tmp));
   *v = tmp;
   return true;
 }
 
-BoxReader::BoxReader(const uint8* buf,
-                     const int size,
-                     const LogCB& log_cb,
-                     bool is_EOS)
+
+BoxReader::BoxReader(const uint8* buf, const int size,
+                     const LogCB& log_cb)
     : BufferReader(buf, size),
       log_cb_(log_cb),
       type_(FOURCC_NULL),
       version_(0),
       flags_(0),
-      scanned_(false),
-      is_EOS_(is_EOS) {
+      scanned_(false) {
 }
 
 BoxReader::~BoxReader() {
   if (scanned_ && !children_.empty()) {
     for (ChildMap::iterator itr = children_.begin();
          itr != children_.end(); ++itr) {
       DVLOG(1) << "Skipping unknown box: " << FourCCToString(itr->first);
     }
   }
 }
 
 // static
 BoxReader* BoxReader::ReadTopLevelBox(const uint8* buf,
                                       const int buf_size,
                                       const LogCB& log_cb,
                                       bool* err) {
-  scoped_ptr<BoxReader> reader(
-      new BoxReader(buf, buf_size, log_cb, false));
+  scoped_ptr<BoxReader> reader(new BoxReader(buf, buf_size, log_cb));
   if (!reader->ReadHeader(err))
     return NULL;
 
   if (!IsValidTopLevelBox(reader->type(), log_cb)) {
     *err = true;
     return NULL;
   }
 
   if (reader->size() <= buf_size)
     return reader.release();
 
   return NULL;
 }
 
 // static
 bool BoxReader::StartTopLevelBox(const uint8* buf,
                                  const int buf_size,
                                  const LogCB& log_cb,
                                  FourCC* type,
                                  int* box_size,
                                  bool* err) {
-  BoxReader reader(buf, buf_size, log_cb, false);
+  BoxReader reader(buf, buf_size, log_cb);
   if (!reader.ReadHeader(err)) return false;
   if (!IsValidTopLevelBox(reader.type(), log_cb)) {
     *err = true;
     return false;
   }
   *type = reader.type();
   *box_size = reader.size();
   return true;
 }
 
 // static
-BoxReader* BoxReader::ReadConcatentatedBoxes(const uint8* buf,
-                                             const int buf_size) {
-  return new BoxReader(buf, buf_size, LogCB(), true);
-}
-
-// static
 bool BoxReader::IsValidTopLevelBox(const FourCC& type,
                                    const LogCB& log_cb) {
   switch (type) {
     case FOURCC_FTYP:
     case FOURCC_PDIN:
     case FOURCC_BLOC:
     case FOURCC_MOOV:
     case FOURCC_MOOF:
     case FOURCC_MFRA:
     case FOURCC_MDAT:
@@ skipping 15 matching lines @@
       return false;
   }
 }
 
 bool BoxReader::ScanChildren() {
   DCHECK(!scanned_);
   scanned_ = true;
 
   bool err = false;
   while (pos() < size()) {
-    BoxReader child(&buf_[pos_], size_ - pos_, log_cb_, is_EOS_);
+    BoxReader child(&buf_[pos_], size_ - pos_, log_cb_);
     if (!child.ReadHeader(&err)) break;
 
     children_.insert(std::pair<FourCC, BoxReader>(child.type(), child));
     pos_ += child.size();
   }
 
   DCHECK(!err);
   return !err && pos() == size();
 }
 
@@ skipping 25 matching lines @@
   RCHECK(Read4(&vflags));
   version_ = vflags >> 24;
   flags_ = vflags & 0xffffff;
   return true;
 }
 
 bool BoxReader::ReadHeader(bool* err) {
   uint64 size = 0;
   *err = false;
 
-  if (!HasBytes(8)) {
-    // If EOS is known, then this is an error. If not, additional data may be
-    // appended later, so this is a soft error.
-    *err = is_EOS_;
-    return false;
-  }
+  if (!HasBytes(8)) return false;
   CHECK(Read4Into8(&size) && ReadFourCC(&type_));
 
   if (size == 0) {
-    if (is_EOS_) {
-      // All the data bytes are expected to be provided.
-      size = size_;
-    } else {
-      MEDIA_LOG(DEBUG, log_cb_)
-          << "ISO BMFF boxes that run to EOS are not supported";
-      *err = true;
-      return false;
-    }
+    MEDIA_LOG(DEBUG, log_cb_) << "Media Source Extensions do not support ISO "
+                                 "BMFF boxes that run to EOS";
+    *err = true;
+    return false;
   } else if (size == 1) {
-    if (!HasBytes(8)) {
-      // If EOS is known, then this is an error. If not, it's a soft error.
-      *err = is_EOS_;
-      return false;
-    }
+    if (!HasBytes(8)) return false;
     CHECK(Read8(&size));
   }
 
   // Implementation-specific: support for boxes larger than 2^31 has been
   // removed.
   if (size < static_cast<uint64>(pos_) ||
       size > static_cast<uint64>(kint32max)) {
     *err = true;
     return false;
   }
 
-  // Make sure the buffer contains at least the expected number of bytes.
-  // Since the data may be appended in pieces, this can only be checked if EOS.
-  if (is_EOS_ && size > static_cast<uint64>(size_)) {
-    *err = true;
-    return false;
-  }
-
   // Note that the pos_ head has advanced to the byte immediately after the
   // header, which is where we want it.
   size_ = size;
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media