| Index: media/cdm/aes_decryptor.cc
|
| diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc
|
| index 416ba5730749949f49b3c91092c05e48625aa402..f91020b8294a1b1fc117163fe7daf1bf1fdb768e 100644
|
| --- a/media/cdm/aes_decryptor.cc
|
| +++ b/media/cdm/aes_decryptor.cc
|
| @@ -167,7 +167,8 @@ static scoped_refptr<DecoderBuffer> DecryptData(const DecoderBuffer& input,
|
| // TODO(xhwang): Find a way to avoid this data copy.
|
| return DecoderBuffer::CopyFrom(
|
| reinterpret_cast<const uint8*>(decrypted_text.data()),
|
| - decrypted_text.size());
|
| + decrypted_text.size(),
|
| + false);
|
| }
|
|
|
| const std::vector<SubsampleEntry>& subsamples =
|
| @@ -192,7 +193,8 @@ static scoped_refptr<DecoderBuffer> DecryptData(const DecoderBuffer& input,
|
| // No need to decrypt if there is no encrypted data.
|
| if (total_encrypted_size <= 0) {
|
| return DecoderBuffer::CopyFrom(reinterpret_cast<const uint8*>(sample),
|
| - sample_size);
|
| + sample_size,
|
| + false);
|
| }
|
|
|
| // The encrypted portions of all subsamples must form a contiguous block,
|
| @@ -216,7 +218,7 @@ static scoped_refptr<DecoderBuffer> DecryptData(const DecoderBuffer& input,
|
| DCHECK_EQ(decrypted_text.size(), encrypted_text.size());
|
|
|
| scoped_refptr<DecoderBuffer> output = DecoderBuffer::CopyFrom(
|
| - reinterpret_cast<const uint8*>(sample), sample_size);
|
| + reinterpret_cast<const uint8*>(sample), sample_size, false);
|
| CopySubsamples(subsamples, kDstContainsClearBytes,
|
| reinterpret_cast<const uint8*>(decrypted_text.data()),
|
| output->writable_data());
|
| @@ -419,7 +421,8 @@ void AesDecryptor::Decrypt(StreamType stream_type,
|
| // An empty iv string signals that the frame is unencrypted.
|
| if (encrypted->decrypt_config()->iv().empty()) {
|
| decrypted = DecoderBuffer::CopyFrom(encrypted->data(),
|
| - encrypted->data_size());
|
| + encrypted->data_size(),
|
| + false);
|
| } else {
|
| const std::string& key_id = encrypted->decrypt_config()->key_id();
|
| DecryptionKey* key = GetKey(key_id);
|
|
|