Index: webkit/plugins/ppapi/content_decryptor_delegate.cc |
diff --git a/webkit/plugins/ppapi/content_decryptor_delegate.cc b/webkit/plugins/ppapi/content_decryptor_delegate.cc |
index c4001443d0b4d06a9d0921efb6734b76636baa94..1a6739628450204d184ebc50b40d65cba2b2c1d8 100644 |
--- a/webkit/plugins/ppapi/content_decryptor_delegate.cc |
+++ b/webkit/plugins/ppapi/content_decryptor_delegate.cc |
@@ -87,17 +87,17 @@ static bool MakeEncryptedBlockInfo( |
block_info->tracking_info.request_id = request_id; |
// EOS buffers need a request ID and nothing more. |
- if (encrypted_buffer->IsEndOfStream()) return true; |
+ if (encrypted_buffer->is_end_of_stream()) return true; |
- DCHECK(encrypted_buffer->GetDataSize()) |
+ DCHECK(encrypted_buffer->get_data_size()) |
<< "DecryptConfig is set on an empty buffer"; |
block_info->tracking_info.timestamp = |
- encrypted_buffer->GetTimestamp().InMicroseconds(); |
- block_info->data_size = encrypted_buffer->GetDataSize(); |
+ encrypted_buffer->get_timestamp().InMicroseconds(); |
+ block_info->data_size = encrypted_buffer->get_data_size(); |
const media::DecryptConfig* decrypt_config = |
- encrypted_buffer->GetDecryptConfig(); |
+ encrypted_buffer->get_decrypt_config(); |
block_info->data_offset = decrypt_config->data_offset(); |
if (!CopyStringToArray(decrypt_config->key_id(), block_info->key_id) || |
@@ -347,7 +347,7 @@ bool ContentDecryptorDelegate::Decrypt( |
DVLOG(2) << "Decrypt() - request_id " << request_id; |
PP_EncryptedBlockInfo block_info = {}; |
- DCHECK(encrypted_buffer->GetDecryptConfig()); |
+ DCHECK(encrypted_buffer->get_decrypt_config()); |
if (!MakeEncryptedBlockInfo(encrypted_buffer, request_id, &block_info)) { |
return false; |
} |
@@ -510,7 +510,7 @@ bool ContentDecryptorDelegate::DecryptAndDecodeAudio( |
} |
// The resource should not be NULL for non-EOS buffer. |
- if (!encrypted_buffer->IsEndOfStream() && !encrypted_resource.get()) |
+ if (!encrypted_buffer->is_end_of_stream() && !encrypted_resource.get()) |
return false; |
const uint32_t request_id = next_decryption_request_id_++; |
@@ -551,7 +551,7 @@ bool ContentDecryptorDelegate::DecryptAndDecodeVideo( |
} |
// The resource should not be 0 for non-EOS buffer. |
- if (!encrypted_buffer->IsEndOfStream() && !encrypted_resource.get()) |
+ if (!encrypted_buffer->is_end_of_stream() && !encrypted_resource.get()) |
return false; |
const uint32_t request_id = next_decryption_request_id_++; |
@@ -732,9 +732,9 @@ void ContentDecryptorDelegate::DeliverBlock( |
// TODO(tomfinegan): Find a way to take ownership of the shared memory |
// managed by the PPB_Buffer_Dev, and avoid the extra copy. |
scoped_refptr<media::DecoderBuffer> decrypted_buffer( |
- media::DecoderBuffer::CopyFrom(static_cast<uint8*>(mapper.data()), |
+ media::DecoderBuffer::copy_from(static_cast<uint8*>(mapper.data()), |
block_info->data_size)); |
- decrypted_buffer->SetTimestamp( |
+ decrypted_buffer->set_timestamp( |
base::TimeDelta::FromMicroseconds(block_info->tracking_info.timestamp)); |
decrypt_cb.Run(media::Decryptor::kSuccess, decrypted_buffer); |
} |
@@ -908,7 +908,7 @@ bool ContentDecryptorDelegate::MakeMediaBufferResource( |
TRACE_EVENT0("eme", "ContentDecryptorDelegate::MakeMediaBufferResource"); |
// End of stream buffers are represented as null resources. |
- if (encrypted_buffer->IsEndOfStream()) { |
+ if (encrypted_buffer->is_end_of_stream()) { |
*resource = NULL; |
return true; |
} |
@@ -919,7 +919,7 @@ bool ContentDecryptorDelegate::MakeMediaBufferResource( |
(stream_type == media::Decryptor::kAudio) ? audio_input_resource_ |
: video_input_resource_; |
- const size_t data_size = static_cast<size_t>(encrypted_buffer->GetDataSize()); |
+ const size_t data_size = static_cast<size_t>(encrypted_buffer->get_data_size()); |
if (!media_resource.get() || media_resource->size() < data_size) { |
// Either the buffer hasn't been created yet, or we have one that isn't big |
// enough to fit |size| bytes. |
@@ -948,7 +948,7 @@ bool ContentDecryptorDelegate::MakeMediaBufferResource( |
media_resource = NULL; |
return false; |
} |
- memcpy(mapper.data(), encrypted_buffer->GetData(), data_size); |
+ memcpy(mapper.data(), encrypted_buffer->get_data(), data_size); |
*resource = media_resource; |
return true; |