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

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: Address comments with the exception of renaming Deinit 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
« no previous file with comments | « ppapi/proxy/ppp_content_decryptor_private_proxy.cc ('k') | ppapi/thunk/ppb_instance_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e0e4c68cdb576be8b274e5d6f958ca6f34ecf8b1..da77d6e3912896c6b3dd1294303d40db74edf86c 100644
--- a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
+++ b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
@@ -69,6 +69,25 @@ void DecoderInitialized(PP_Instance instance,
enter.functions()->DecoderInitialized(instance, success, request_id);
}
+void DecoderDeinitializeDone(PP_Instance instance,
+ PP_DecryptorStreamType decoder_type,
+ uint32_t request_id) {
+ EnterInstance enter(instance);
+ if (enter.succeeded()) {
+ enter.functions()->DecoderDeinitializeDone(instance,
+ decoder_type,
+ request_id);
+ }
+}
+
+void DecoderResetDone(PP_Instance instance,
+ PP_DecryptorStreamType 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) {
@@ -92,6 +111,8 @@ const PPB_ContentDecryptor_Private g_ppb_decryption_thunk = {
&KeyError,
&DeliverBlock,
&DecoderInitialized,
+ &DecoderDeinitializeDone,
+ &DecoderResetDone,
&DeliverFrame,
&DeliverSamples
};
« no previous file with comments | « ppapi/proxy/ppp_content_decryptor_private_proxy.cc ('k') | ppapi/thunk/ppb_instance_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698