Update EME MediaKeyNeededEvent.initData for ISO BMFF to match current spec.

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"
 
 namespace media {
 namespace mp4 {
 
 FileType::FileType() {}
 FileType::~FileType() {}
 FourCC FileType::BoxType() const { return FOURCC_FTYP; }
 
 bool FileType::Parse(BoxReader* reader) {
   RCHECK(reader->ReadFourCC(&major_brand) && reader->Read4(&minor_version));
   size_t num_brands = (reader->size() - reader->pos()) / sizeof(FourCC);
   return reader->SkipBytes(sizeof(FourCC) * num_brands);  // compatible_brands
 }
 
 ProtectionSystemSpecificHeader::ProtectionSystemSpecificHeader() {}
 ProtectionSystemSpecificHeader::~ProtectionSystemSpecificHeader() {}
 FourCC ProtectionSystemSpecificHeader::BoxType() const { return FOURCC_PSSH; }
 
 bool ProtectionSystemSpecificHeader::Parse(BoxReader* reader) {
+  // Validate the box's contents and hang on to the system ID.
   uint32 size;
-  return reader->ReadFullBoxHeader() &&
+  RCHECK(reader->ReadFullBoxHeader() &&
          reader->ReadVec(&system_id, 16) &&
          reader->Read4(&size) &&
-         reader->ReadVec(&data, size);
+         reader->HasBytes(size));
+
+  // Copy the entire box, including the header, for passing to EME as initData.
+  raw_box.clear();

[ddorwin, 2012/09/21 04:04:28]

Should it ever not be empty?

[strobe_, 2012/09/21 18:29:46]

Changed to DCHECK(empty())

+  raw_box.insert(raw_box.end(),

[ddorwin, 2012/09/21 04:04:28]

Odd to use end() when you just cleared it. Can you use assign() instead?

[strobe_, 2012/09/21 18:29:46]

Done.

+                 reader->data(), reader->data() + reader->size());
+  return true;
 }
 
 SampleAuxiliaryInformationOffset::SampleAuxiliaryInformationOffset() {}
 SampleAuxiliaryInformationOffset::~SampleAuxiliaryInformationOffset() {}
 FourCC SampleAuxiliaryInformationOffset::BoxType() const { return FOURCC_SAIO; }
 
 bool SampleAuxiliaryInformationOffset::Parse(BoxReader* reader) {
   RCHECK(reader->ReadFullBoxHeader());
   if (reader->flags() & 1)
     RCHECK(reader->SkipBytes(8));
@@ skipping 698 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