Add CDM video decoder.

webkit/media/crypto/ppapi/clear_key_cdm.cc

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 6f7ea09284167abe3222a513dddd72c095a7a06e..58062a2eea72f96cfce5bf1e1476fb1135197d9e 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -6,13 +6,41 @@
 
 #include <vector>
 
+#include "base/at_exit.h"
+#include "base/file_path.h"
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/path_service.h"
 #include "base/time.h"
 #include "media/base/decoder_buffer.h"
+#include "media/base/media.h"
+
+#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
+#include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"

[ddorwin, 2012/10/23 00:32:30]

I think 9, 10, 13, and 16 go in here too.

[Tom Finegan, 2012/10/23 00:54:41]

Done.

+#endif

[ddorwin, 2012/10/23 00:32:30]

Move to line 43 then put line 22 after it.

[Tom Finegan, 2012/10/23 00:54:41]

Done.

 
 static const char kClearKeyCdmVersion[] = "0.1.0.0";
 
+// TODO(tomfinegan): When COMPONENT_BUILD is not defined an AtExitManager must
+// exist before the call to InitializeFFmpegLibraries(). This should no longer
+// be required after http://crbug.com/91970 because we'll be able to get rid of
+// InitializeFFmpegLibraries().
+#if !defined COMPONENT_BUILD
+static base::AtExitManager g_at_exit_manager;
+#endif
+
+// TODO(tomfinegan): InitializeFFmpegLibraries() and |g_cdm_module_initialized|
+// are required for running in the sandbox, and should no longer be required
+// after http://crbug.com/91970 is fixed.
+static bool InitializeFFmpegLibraries() {
+  FilePath file_path;
+  CHECK(PathService::Get(base::DIR_EXE, &file_path));
+  CHECK(media::InitializeMediaLibrary(file_path));
+  return true;
+}
+
+static bool g_cdm_module_initialized = InitializeFFmpegLibraries();
+
 static scoped_refptr<media::DecoderBuffer> CopyDecoderBufferFrom(
     const cdm::InputBuffer& input_buffer) {
   DCHECK(input_buffer.data);
@@ -65,10 +93,12 @@ static Type* AllocateAndCopy(const Type* data, int size) {
 
 cdm::ContentDecryptionModule* CreateCdmInstance(
     cdm::Allocator* allocator, cdm::CdmHost* host) {
+  DVLOG(1) << "CreateCdmInstance()";
   return new webkit_media::ClearKeyCdm(allocator, host);
 }
 
 void DestroyCdmInstance(cdm::ContentDecryptionModule* instance) {
+  DVLOG(1) << "DestroyCdmInstance()";
   delete instance;
 }
 
@@ -244,28 +274,43 @@ cdm::Status ClearKeyCdm::InitializeAudioDecoder(
 
 cdm::Status ClearKeyCdm::InitializeVideoDecoder(
     const cdm::VideoDecoderConfig& video_decoder_config) {
-#if !defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
-  NOTIMPLEMENTED();
-  return cdm::kSessionError;
-#else
+#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
+  if (!video_decoder_)
+    video_decoder_.reset(new webkit_media::FFmpegCdmVideoDecoder(allocator_));
+
+  if (!video_decoder_->Initialize(video_decoder_config))
+    return cdm::kSessionError;
+
+  return cdm::kSuccess;
+#elif defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)

[ddorwin, 2012/10/23 00:32:30]

This code will never get hit on FFmpeg platforms.

Either each of these needs to check both FAKE and FFMPEG or you need to undefine
FFMPEG in the .h file below where FAKE can be uncommented.

[Tom Finegan, 2012/10/23 00:54:41]

Added ifdef in clear_key_cdm.h that undefs USE_FFMPEG_DECODER.

   video_size_ = video_decoder_config.coded_size;
   return cdm::kSuccess;
-#endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
+#else
+  NOTIMPLEMENTED();
+  return cdm::kSessionError;
+#endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
+
 }
 
-void ClearKeyCdm::ResetDecoder(cdm::StreamType) {
-  NOTIMPLEMENTED();
+void ClearKeyCdm::ResetDecoder(cdm::StreamType decoder_type) {
+#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
+  DCHECK(decoder_type == cdm::kStreamTypeVideo);
+  video_decoder_->Reset();
+#endif
 }
 
-void ClearKeyCdm::DeinitializeDecoder(cdm::StreamType) {
-  NOTIMPLEMENTED();
+void ClearKeyCdm::DeinitializeDecoder(cdm::StreamType decoder_type) {
+#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
+  DCHECK(decoder_type == cdm::kStreamTypeVideo);
+  video_decoder_->Deinitialize();
+#endif
 }
 
 cdm::Status ClearKeyCdm::DecryptAndDecodeFrame(
     const cdm::InputBuffer& encrypted_buffer,
-    cdm::VideoFrame* video_frame) {
+    cdm::VideoFrame* decoded_frame) {
   if (!encrypted_buffer.data) {
-    video_frame->set_format(cdm::kEmptyVideoFrame);
+    decoded_frame->set_format(cdm::kEmptyVideoFrame);
     return cdm::kSuccess;
   }
 
@@ -285,13 +330,20 @@ cdm::Status ClearKeyCdm::DecryptAndDecodeFrame(
   if (status == media::Decryptor::kNoKey)
     return cdm::kNoKey;
 
-#if !defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
+#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
+  DCHECK(status == media::Decryptor::kSuccess);
+  DCHECK(buffer);
+  return video_decoder_->DecodeFrame(buffer.get()->GetData(),
+                                     buffer->GetDataSize(),
+                                     encrypted_buffer.timestamp,
+                                     decoded_frame);
+#elif defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
+  GenerateFakeVideoFrame(decoder_buffer->GetTimestamp(), decoded_frame);
+  return cdm::kSuccess;
+#else
   NOTIMPLEMENTED();
   return cdm::kDecodeError;
-#else
-  GenerateFakeVideoFrame(decoder_buffer->GetTimestamp(), video_frame);
-  return cdm::kSuccess;
-#endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
+#endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 }
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)