Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: ppapi/cpp/private/content_decryptor_private.cc

Issue 11023004: Update PPP side of Pepper CDM API to support video decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Set PPP interface version to 0.2 Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1be92a844d9e570d3b014135552c414623335ba3..ab26fcd85ff415532e9b0acea27773cdb39cc0ff 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>() {

Powered by Google App Engine
This is Rietveld 408576698