Combine 'pssh' parsing routines.

media/formats/mp4/box_definitions.h

 // 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.
 
 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 26 matching lines @@
   bool Parse(BoxReader* reader) override; \
   FourCC BoxType() const override;
 
 struct MEDIA_EXPORT FileType : Box {
   DECLARE_BOX_METHODS(FileType);
 
   FourCC major_brand;
   uint32 minor_version;
 };
 
+// If only copying the 'pssh' boxes, use ProtectionSystemSpecificHeader.
+// If access to the individual fields is needed, use
+// FullProtectionSystemSpecificHeader.
 struct MEDIA_EXPORT ProtectionSystemSpecificHeader : Box {
   DECLARE_BOX_METHODS(ProtectionSystemSpecificHeader);
 
+  std::vector<uint8> raw_box;
+};
+
+struct MEDIA_EXPORT FullProtectionSystemSpecificHeader : Box {
+  DECLARE_BOX_METHODS(FullProtectionSystemSpecificHeader);
+
   std::vector<uint8> system_id;
-  std::vector<uint8> raw_box;
+  std::vector<std::vector<uint8>> key_ids;
+  std::vector<uint8> data;
 };
 
 struct MEDIA_EXPORT SampleAuxiliaryInformationOffset : Box {
   DECLARE_BOX_METHODS(SampleAuxiliaryInformationOffset);
 
   std::vector<uint64> offsets;
 };
 
 struct MEDIA_EXPORT SampleAuxiliaryInformationSize : Box {
   DECLARE_BOX_METHODS(SampleAuxiliaryInformationSize);
@@ skipping 367 matching lines @@
   std::vector<TrackFragment> tracks;
   std::vector<ProtectionSystemSpecificHeader> pssh;
 };
 
 #undef DECLARE_BOX
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_