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

Unified Diff: webkit/media/crypto/ppapi/clear_key_cdm.h

Issue 10900007: Add video decoding support in the CDM interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve comments. 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
« no previous file with comments | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/ppapi/clear_key_cdm.h
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h
index eaad45d9b2e095ba2e765f95e410523ade03de8f..44b3110e315dcc17353d302d724d80a125238f98 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -31,19 +31,23 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
virtual cdm::Status GenerateKeyRequest(const uint8_t* init_data,
int init_data_size,
cdm::KeyMessage* key_request) OVERRIDE;
-
virtual cdm::Status AddKey(const char* session_id,
int session_id_size,
const uint8_t* key,
int key_size,
const uint8_t* key_id,
int key_id_size) OVERRIDE;
-
virtual cdm::Status CancelKeyRequest(const char* session_id,
int session_id_size) OVERRIDE;
-
virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
cdm::OutputBuffer* decrypted_buffer) OVERRIDE;
+ virtual cdm::Status InitializeVideoDecoder(
+ const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;
+ virtual cdm::Status DecryptAndDecodeVideo(
+ const cdm::InputBuffer& encrypted_buffer,
+ cdm::VideoFrame* video_frame) OVERRIDE;
+ virtual void ResetVideoDecoder() OVERRIDE;
+ virtual void StopVideoDecoder() OVERRIDE;
private:
class Client : public media::DecryptorClient {
« no previous file with comments | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698