| Index: ppapi/cpp/private/content_decryptor_private.cc
|
| diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc
|
| index 585f1fb33a5c76a464598b8fb780d86a9cb072fc..7dbce34d6edd45da8fe101a2a2928e754f98d61e 100644
|
| --- a/ppapi/cpp/private/content_decryptor_private.cc
|
| +++ b/ppapi/cpp/private/content_decryptor_private.cc
|
| @@ -105,19 +105,20 @@ void Decrypt(PP_Instance instance,
|
| *encrypted_block_info);
|
| }
|
|
|
| -void DecryptAndDecode(PP_Instance instance,
|
| - PP_Resource encrypted_resource,
|
| - const PP_EncryptedBlockInfo* encrypted_block_info) {
|
| +void DecryptAndDecodeFrame(
|
| + PP_Instance instance,
|
| + PP_Resource encrypted_resource,
|
| + const PP_EncryptedVideoFrameInfo* encrypted_video_frame_info) {
|
| void* object =
|
| Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
|
| if (!object)
|
| return;
|
|
|
| - pp::Buffer_Dev encrypted_block(pp::PassRef(), encrypted_resource);
|
| + pp::Buffer_Dev encrypted_frame(pp::PassRef(), encrypted_resource);
|
|
|
| - static_cast<ContentDecryptor_Private*>(object)->DecryptAndDecode(
|
| - encrypted_block,
|
| - *encrypted_block_info);
|
| + static_cast<ContentDecryptor_Private*>(object)->DecryptAndDecodeFrame(
|
| + encrypted_frame,
|
| + *encrypted_video_frame_info);
|
| }
|
|
|
| const PPP_ContentDecryptor_Private ppp_content_decryptor = {
|
| @@ -125,7 +126,7 @@ const PPP_ContentDecryptor_Private ppp_content_decryptor = {
|
| &AddKey,
|
| &CancelKeyRequest,
|
| &Decrypt,
|
| - &DecryptAndDecode
|
| + &DecryptAndDecodeFrame
|
| };
|
|
|
| template <> const char* interface_name<PPB_ContentDecryptor_Private>() {
|
|
|