| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "media/base/decrypt_config.h" | 5 #include "media/base/decrypt_config.h" | 
| 6 | 6 | 
|  | 7 #include <stddef.h> | 
|  | 8 | 
| 7 #include "base/logging.h" | 9 #include "base/logging.h" | 
| 8 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" | 
| 9 | 11 | 
| 10 namespace media { | 12 namespace media { | 
| 11 | 13 | 
| 12 DecryptConfig::DecryptConfig(const std::string& key_id, | 14 DecryptConfig::DecryptConfig(const std::string& key_id, | 
| 13                              const std::string& iv, | 15                              const std::string& iv, | 
| 14                              const std::vector<SubsampleEntry>& subsamples) | 16                              const std::vector<SubsampleEntry>& subsamples) | 
| 15     : key_id_(key_id), | 17     : key_id_(key_id), | 
| 16       iv_(iv), | 18       iv_(iv), | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 45   os << " subsamples:["; | 47   os << " subsamples:["; | 
| 46   for (const SubsampleEntry& entry : subsamples_) { | 48   for (const SubsampleEntry& entry : subsamples_) { | 
| 47     os << "(clear:" << entry.clear_bytes << ", cypher:" << entry.cypher_bytes | 49     os << "(clear:" << entry.clear_bytes << ", cypher:" << entry.cypher_bytes | 
| 48        << ")"; | 50        << ")"; | 
| 49   } | 51   } | 
| 50   os << "]"; | 52   os << "]"; | 
| 51   return os; | 53   return os; | 
| 52 } | 54 } | 
| 53 | 55 | 
| 54 }  // namespace media | 56 }  // namespace media | 
| OLD | NEW | 
|---|