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

Unified Diff: ppapi/c/private/ppb_content_decryptor_private.h

Issue 11477002: Fix in process PPAPI decryption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Run generator.py on a linux box, and cross fingers...? Created 8 years 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/c/private/ppb_content_decryptor_private.h
diff --git a/ppapi/c/private/ppb_content_decryptor_private.h b/ppapi/c/private/ppb_content_decryptor_private.h
index 486d9d759697516b54cdb11413f5437edfb1fc16..91209849ad1e35c6b074c255b005995c43c268b1 100644
--- a/ppapi/c/private/ppb_content_decryptor_private.h
+++ b/ppapi/c/private/ppb_content_decryptor_private.h
@@ -4,7 +4,7 @@
*/
/* From private/ppb_content_decryptor_private.idl,
- * modified Tue Dec 4 10:30:29 2012.
+ * modified Mon Dec 10 13:46:33 2012.
*/
#ifndef PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_
@@ -148,6 +148,10 @@ struct PPB_ContentDecryptor_Private_0_6 {
* <code>PPP_ContentDecryptor_Private</code> interface completes to
* deliver decrypted_block to the browser for decoding and rendering.
*
+ * The plugin must not hold a reference to the encrypted buffer resource
+ * provided to <code>Decrypt()</code> when it calls this method. The browser
+ * will reuse the buffer in a subsequent <code>Decrypt()</code> call.
+ *
* @param[in] decrypted_block A <code>PP_Resource</code> corresponding to a
* <code>PPB_Buffer_Dev</code> resource that contains a decrypted data
* block.
@@ -215,6 +219,11 @@ struct PPB_ContentDecryptor_Private_0_6 {
* <code>PPP_ContentDecryptor_Private</code> interface completes to deliver
* a decrypted and decoded video frame to the browser for rendering.
*
+ * The plugin must not hold a reference to the encrypted buffer resource
+ * provided to <code>DecryptAndDecode()</code> when it calls this method. The
+ * browser will reuse the buffer in a subsequent
+ * <code>DecryptAndDecode()</code> call.
+ *
* @param[in] decrypted_frame A <code>PP_Resource</code> corresponding to a
* <code>PPB_Buffer_Dev</code> resource that contains a video frame.
*
@@ -228,10 +237,15 @@ struct PPB_ContentDecryptor_Private_0_6 {
const struct PP_DecryptedFrameInfo* decrypted_frame_info);
/**
* Called after the <code>DecryptAndDecode()</code> method on the
- * <code>PPP_ContentDecryptor_Private</code> interface completes to
- * deliver a buffer of decrypted and decoded audio samples to the browser for
+ * <code>PPP_ContentDecryptor_Private</code> interface completes to deliver
+ * a buffer of decrypted and decoded audio samples to the browser for
* rendering.
*
+ * The plugin must not hold a reference to the encrypted buffer resource
+ * provided to <code>DecryptAndDecode()</code> when it calls this method. The
+ * browser will reuse the buffer in a subsequent
+ * <code>DecryptAndDecode()</code> call.
+ *
* <code>audio_frames</code> can contain multiple audio output buffers. Each
* buffer is serialized in this format:
*

Powered by Google App Engine
This is Rietveld 408576698