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

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

Issue 11147032: Fake video decoder in clearkey CDM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops, more fixes 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 | « no previous file | 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 b2680ee924f110eb4067e18d9dca4b7027f4a27b..a1e1b2c59a8a9bcb75e4601fb43165d3b692ea48 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -15,6 +15,9 @@
#include "media/crypto/aes_decryptor.h"
#include "webkit/media/crypto/ppapi/content_decryption_module.h"
+// Enable this to use the fake decoder for testing.
+// #define CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
+
namespace media {
class DecoderBuffer;
}
@@ -98,6 +101,11 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
std::string default_url_;
};
+#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
+ void GenerateFakeVideoFrame(base::TimeDelta timestamp,
+ cdm::VideoFrame* video_frame);
+#endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
+
Client client_;
media::AesDecryptor decryptor_;
@@ -106,6 +114,10 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
base::Lock client_lock_;
cdm::Allocator* const allocator_;
+
+#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
+ cdm::Size video_size_;
+#endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
};
} // namespace webkit_media
« no previous file with comments | « no previous file | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698