Add video decoding support in the CDM interface.

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"
@@ skipping 119 matching lines @@
 
 cdm::Status ClearKeyCdm::GenerateKeyRequest(const uint8_t* init_data,
                                             int init_data_size,
                                             cdm::KeyMessage* key_request) {
   DVLOG(1) << "GenerateKeyRequest()";
   base::AutoLock auto_lock(client_lock_);
   ScopedResetter<Client> auto_resetter(&client_);
   decryptor_.GenerateKeyRequest("", init_data, init_data_size);
 
   if (client_.status() != Client::kKeyMessage)
-    return cdm::kErrorUnknown;
+    return cdm::kError;
 
   DCHECK(key_request);
   key_request->session_id = AllocateAndCopy(client_.session_id().data(),
                                             client_.session_id().size());
   key_request->session_id_size = client_.session_id().size();
   key_request->message = AllocateAndCopy(client_.key_message(),
                                              client_.key_message_length());
   key_request->message_size = client_.key_message_length();
   key_request->default_url = AllocateAndCopy(client_.default_url().data(),
                                              client_.default_url().size());
   key_request->default_url_size = client_.default_url().size();
   return cdm::kSuccess;
 }
 
 cdm::Status ClearKeyCdm::AddKey(const char* session_id,
                                 int session_id_size,
                                 const uint8_t* key,
                                 int key_size,
                                 const uint8_t* key_id,
                                 int key_id_size) {
   DVLOG(1) << "AddKey()";
   base::AutoLock auto_lock(client_lock_);
   ScopedResetter<Client> auto_resetter(&client_);
   decryptor_.AddKey("", key, key_size, key_id, key_id_size,
                     std::string(session_id, session_id_size));
 
   if (client_.status() != Client::kKeyAdded)
-    return cdm::kErrorUnknown;
+    return cdm::kError;
 
   return cdm::kSuccess;
 }
 
 cdm::Status ClearKeyCdm::CancelKeyRequest(const char* session_id,
                                           int session_id_size) {
   DVLOG(1) << "CancelKeyRequest()";
   base::AutoLock auto_lock(client_lock_);
   ScopedResetter<Client> auto_resetter(&client_);
   decryptor_.CancelKeyRequest("", std::string(session_id, session_id_size));
@@ skipping 17 matching lines @@
   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;
+    return cdm::kError;
 
   if (status == media::Decryptor::kNoKey)
-    return cdm::kErrorNoKey;
+    return cdm::kNoKey;
 
   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::InitializeVideoDecoder(
+    const cdm::VideoDecoderConfig& video_decoder_config) {
+  NOTIMPLEMENTED();
+  return cdm::kError;
+}
+
+cdm::Status ClearKeyCdm::DecryptAndDecodeVideo(
+    const cdm::InputBuffer& encrypted_buffer,
+    cdm::VideoFrame* video_frame) {
+  NOTIMPLEMENTED();
+  return cdm::kError;
+}
+
+void ClearKeyCdm::ResetVideoDecoder() {
+  NOTIMPLEMENTED();
+}
+
+void ClearKeyCdm::StopVideoDecoder() {
+  NOTIMPLEMENTED();
+}
+
 }  // namespace webkit_media