| 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 7dbce34d6edd45da8fe101a2a2928e754f98d61e..18f077221d2a0f2170232ab711edf384d9e1d9d8 100644
|
| --- a/ppapi/cpp/private/content_decryptor_private.cc
|
| +++ b/ppapi/cpp/private/content_decryptor_private.cc
|
| @@ -105,6 +105,23 @@ void Decrypt(PP_Instance instance,
|
| *encrypted_block_info);
|
| }
|
|
|
| +void ResetVideoDecoder(PP_Instance instance, uint32_t request_id) {
|
| + void* object =
|
| + Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
|
| + if (!object)
|
| + return;
|
| + static_cast<ContentDecryptor_Private*>(object)->ResetVideoDecoder(
|
| + request_id);
|
| +}
|
| +
|
| +void StopVideoDecoder(PP_Instance instance, uint32_t request_id) {
|
| + void* object =
|
| + Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
|
| + if (!object)
|
| + return;
|
| + static_cast<ContentDecryptor_Private*>(object)->StopVideoDecoder(request_id);
|
| +}
|
| +
|
| void DecryptAndDecodeFrame(
|
| PP_Instance instance,
|
| PP_Resource encrypted_resource,
|
| @@ -126,6 +143,8 @@ const PPP_ContentDecryptor_Private ppp_content_decryptor = {
|
| &AddKey,
|
| &CancelKeyRequest,
|
| &Decrypt,
|
| + &ResetVideoDecoder,
|
| + &StopVideoDecoder,
|
| &DecryptAndDecodeFrame
|
| };
|
|
|
| @@ -220,6 +239,22 @@ void ContentDecryptor_Private::DeliverBlock(
|
| }
|
| }
|
|
|
| +void ContentDecryptor_Private::DecoderReset(uint32_t request_id) {
|
| + if (has_interface<PPB_ContentDecryptor_Private>()) {
|
| + get_interface<PPB_ContentDecryptor_Private>()->DecoderReset(
|
| + associated_instance_.pp_instance(),
|
| + request_id);
|
| + }
|
| +}
|
| +
|
| +void ContentDecryptor_Private::DecoderStopped(uint32_t request_id) {
|
| + if (has_interface<PPB_ContentDecryptor_Private>()) {
|
| + get_interface<PPB_ContentDecryptor_Private>()->DecoderStopped(
|
| + associated_instance_.pp_instance(),
|
| + request_id);
|
| + }
|
| +}
|
| +
|
| void ContentDecryptor_Private::DeliverFrame(
|
| pp::Buffer_Dev decrypted_frame,
|
| const PP_DecryptedFrameInfo& decrypted_frame_info) {
|
|
|