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

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

Issue 10899021: Add CDM video decoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add media library initialization. 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: 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 8d185ffa5ca96b54ddfeb424acc3fdd8f5715a7d..86a5e9c657c03481bbb77e8a08c196e159663e97 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "media/base/decryptor_client.h"
#include "media/crypto/aes_decryptor.h"
@@ -24,6 +25,8 @@ class DecoderBuffer;
namespace webkit_media {
+class FFmpegCdmVideoDecoder;
+
// Clear key implementation of the cdm::ContentDecryptionModule interface.
class ClearKeyCdm : public cdm::ContentDecryptionModule {
public:
@@ -119,7 +122,7 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
base::Lock client_lock_;
cdm::Allocator* const allocator_;
-
+ scoped_ptr<FFmpegCdmVideoDecoder> video_decoder_;
#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
cdm::Size video_size_;
#endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER

Powered by Google App Engine
This is Rietveld 408576698