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

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

Issue 10899021: Add CDM video decoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compiles, does nothing. Created 8 years, 4 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.cc
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index 835d06258a28020d9ae7612b75ed15c63a2293a9..49b6eaf69363bca385a743dd7f421cc687b88321 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "base/time.h"
#include "media/base/decoder_buffer.h"
+#include "webkit/media/crypto/decoders/ffmpeg_video_decoder.h"
static const char kClearKeyCdmVersion[] = "0.1.0.0";
@@ -188,6 +189,13 @@ static void CopyDecryptResults(
*buffer_copy = buffer;
}
+cdm::Status ClearKeyCdm::InitializeVideoDecoder(
+ const cdm::VideoDecoderConfig& video_decoder_config) {
+ video_decoder_.reset(new webkit_media::FFmpegVideoDecoder);
+ //video_decoder_->Initialize();
+ return cdm::kErrorUnknown;
+}
+
cdm::Status ClearKeyCdm::Decrypt(
const cdm::InputBuffer& encrypted_buffer,
cdm::OutputBuffer* decrypted_buffer) {
@@ -216,4 +224,10 @@ cdm::Status ClearKeyCdm::Decrypt(
return cdm::kSuccess;
}
+cdm::Status ClearKeyCdm::DecryptAndDecode(
+ const cdm::InputBuffer& encrypted_buffer,
+ cdm::VideoFrame* video_frame) {
+ return cdm::kErrorUnknown;
+}
+
} // namespace webkit_media

Powered by Google App Engine
This is Rietveld 408576698