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

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: 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 ef74a81cfcc1d54a539d45f9b01cf63d97a17c4d..5429ffba41fcc33bcae49b7a589d81ed43605a96 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_DECODER
+
namespace media {
class DecoderBuffer;
}
@@ -110,7 +113,9 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
cdm::Allocator* const allocator_;
+#if defined(CLEAR_KEY_CDM_USE_FAKE_DECODER)
Tom Finegan 2012/10/15 21:35:28 CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
xhwang 2012/10/15 23:05:22 Done.
cdm::Size video_size_;
+#endif
};
} // 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