| 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 "base/logging.h" | 5 #include "base/logging.h" |
| 6 #include "media/webm/webm_content_encodings.h" | 6 #include "media/webm/webm_content_encodings.h" |
| 7 | 7 |
| 8 namespace media { | 8 namespace media { |
| 9 | 9 |
| 10 ContentEncoding::ContentEncoding() | 10 ContentEncoding::ContentEncoding() |
| 11 : order_(kOrderInvalid), | 11 : order_(kOrderInvalid), |
| 12 scope_(kScopeInvalid), | 12 scope_(kScopeInvalid), |
| 13 type_(kTypeInvalid), | 13 type_(kTypeInvalid), |
| 14 encryption_algo_(kEncAlgoInvalid), | 14 encryption_algo_(kEncAlgoInvalid), |
| 15 encryption_key_id_size_(0), | |
| 16 cipher_mode_(kCipherModeInvalid) { | 15 cipher_mode_(kCipherModeInvalid) { |
| 17 } | 16 } |
| 18 | 17 |
| 19 ContentEncoding::~ContentEncoding() {} | 18 ContentEncoding::~ContentEncoding() {} |
| 20 | 19 |
| 21 void ContentEncoding::SetEncryptionKeyId(const uint8* encryption_key_id, | 20 void ContentEncoding::SetEncryptionKeyId(const uint8* encryption_key_id, |
| 22 int size) { | 21 int size) { |
| 23 DCHECK(encryption_key_id); | 22 DCHECK(encryption_key_id); |
| 24 DCHECK_GT(size, 0); | 23 DCHECK_GT(size, 0); |
| 25 encryption_key_id_.reset(new uint8[size]); | 24 encryption_key_id_.assign(reinterpret_cast<const char*>(encryption_key_id), |
| 26 memcpy(encryption_key_id_.get(), encryption_key_id, size); | 25 size); |
| 27 encryption_key_id_size_ = size; | |
| 28 } | 26 } |
| 29 | 27 |
| 30 } // namespace media | 28 } // namespace media |
| OLD | NEW |