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

Unified Diff: ppapi/thunk/ppb_content_decryptor_private_thunk.cc

Issue 11028087: Add decoder de-initialize and reset to the Pepper CDM API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renaming and generalizing done... Created 8 years, 2 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/thunk/ppb_content_decryptor_private_thunk.cc
diff --git a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
index 3f57a381c5b14ef3cbe2871bcf3a2de3f1b6d65a..a9bcc28f6724ff102f35aa95302c34c3b7e0d39c 100644
--- a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
+++ b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
@@ -61,6 +61,24 @@ void DeliverBlock(PP_Instance instance,
enter.functions()->DeliverBlock(instance, decrypted_block, block_info);
}
+void DecoderDeinitializeDone(PP_Instance instance,
+ PP_StreamType decoder_type,
+ uint32_t request_id) {
+ EnterInstance enter(instance);
+ if (enter.succeeded())
brettw 2012/10/11 20:53:43 Nit: Chrome style says to use {} any time the bloc
Tom Finegan 2012/10/12 05:01:56 Done.
+ enter.functions()->DecoderDeinitializeDone(instance,
+ decoder_type,
+ request_id);
+}
+
+void DecoderResetDone(PP_Instance instance,
+ PP_StreamType decoder_type,
+ uint32_t request_id) {
+ EnterInstance enter(instance);
+ if (enter.succeeded())
+ enter.functions()->DecoderResetDone(instance, decoder_type, request_id);
+}
+
void DeliverFrame(PP_Instance instance,
PP_Resource decrypted_frame,
const PP_DecryptedFrameInfo* frame_info) {
@@ -83,6 +101,8 @@ const PPB_ContentDecryptor_Private g_ppb_decryption_thunk = {
&KeyMessage,
&KeyError,
&DeliverBlock,
+ &DecoderDeinitializeDone,
+ &DecoderResetDone,
&DeliverFrame,
&DeliverSamples
};
@@ -90,7 +110,7 @@ const PPB_ContentDecryptor_Private g_ppb_decryption_thunk = {
} // namespace
const PPB_ContentDecryptor_Private*
- GetPPB_ContentDecryptor_Private_0_2_Thunk() {
+ GetPPB_ContentDecryptor_Private_0_3_Thunk() {
return &g_ppb_decryption_thunk;
}

Powered by Google App Engine
This is Rietveld 408576698