Add CDM video decoder.

webkit/media/crypto/ppapi/clear_key_cdm.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/crypto/ppapi/clear_key_cdm.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #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";
 
 static scoped_refptr<media::DecoderBuffer> CopyDecoderBufferFrom(
     const cdm::InputBuffer& input_buffer) {
   scoped_refptr<media::DecoderBuffer> output_buffer =
       media::DecoderBuffer::CopyFrom(input_buffer.data, input_buffer.data_size);
 
   std::vector<media::SubsampleEntry> subsamples;
   for (uint32_t i = 0; i < input_buffer.num_subsamples; ++i) {
@@ skipping 158 matching lines @@
 
 static void CopyDecryptResults(
     media::Decryptor::Status* status_copy,
     scoped_refptr<media::DecoderBuffer>* buffer_copy,
     media::Decryptor::Status status,
     const scoped_refptr<media::DecoderBuffer>& buffer) {
   *status_copy = status;
   *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) {
   DVLOG(1) << "Decrypt()";
 
   scoped_refptr<media::DecoderBuffer> decoder_buffer =
       CopyDecoderBufferFrom(encrypted_buffer);
 
   // Callback is called synchronously, so we can use variables on the stack.
   media::Decryptor::Status status;
   scoped_refptr<media::DecoderBuffer> buffer;
   decryptor_.Decrypt(decoder_buffer,
                      base::Bind(&CopyDecryptResults, &status, &buffer));
 
   if (status == media::Decryptor::kError)
     return cdm::kErrorUnknown;
 
   if (status == media::Decryptor::kNoKey)
     return cdm::kErrorNoKey;
 
   DCHECK(buffer);
   int data_size = buffer->GetDataSize();
   decrypted_buffer->data = AllocateAndCopy(buffer->GetData(), data_size);
   decrypted_buffer->data_size = data_size;
   decrypted_buffer->timestamp = buffer->GetTimestamp().InMicroseconds();
   return cdm::kSuccess;
 }
 
+cdm::Status ClearKeyCdm::DecryptAndDecode(
+    const cdm::InputBuffer& encrypted_buffer,
+    cdm::VideoFrame* video_frame) {
+  return cdm::kErrorUnknown;
+}
+
 }  // namespace webkit_media