Add CDM video decoder.

webkit/media/crypto/ppapi/clear_key_cdm.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/decryptor_client.h"
 #include "media/crypto/aes_decryptor.h"
 #include "webkit/media/crypto/ppapi/content_decryption_module.h"
 
 namespace media {
 class DecoderBuffer;
 }
 
 namespace webkit_media {
 
+class FFmpegVideoDecoder;
+
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
 class ClearKeyCdm : public cdm::ContentDecryptionModule {
  public:
   ClearKeyCdm();
   virtual ~ClearKeyCdm();
 
   // ContentDecryptionModule implementation.
   virtual cdm::Status GenerateKeyRequest(const uint8_t* init_data,
                                          int init_data_size,
                                          cdm::KeyMessage* key_request) OVERRIDE;
 
   virtual cdm::Status 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) OVERRIDE;
 
   virtual cdm::Status CancelKeyRequest(const char* session_id,
                                        int session_id_size) OVERRIDE;
 
   virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
                               cdm::OutputBuffer* decrypted_buffer) OVERRIDE;
 
+  virtual cdm::Status InitializeVideoDecoder(
+        const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;
+
+  virtual cdm::Status DecryptAndDecode(const cdm::InputBuffer& encrypted_buffer,
+                                       cdm::VideoFrame* video_frame) OVERRIDE;
+
  private:
   class Client : public media::DecryptorClient {
    public:
     enum Status {
       kKeyAdded,
       kKeyError,
       kKeyMessage,
       kNeedKey
     };
 
@@ skipping 32 matching lines @@
     scoped_array<uint8> key_message_;
     int key_message_length_;
     std::string default_url_;
   };
 
   Client client_;
   media::AesDecryptor decryptor_;
   // Protects the |client_| from being accessed by the |decryptor_|
   // simultaneously.
   base::Lock client_lock_;
+
+  scoped_ptr<FFmpegVideoDecoder> video_decoder_;

[ddorwin, 2012/08/29 17:33:49]

Why do we have a base class if even this header file relies on the concrete
class?

[Tom Finegan, 2012/08/30 17:09:23]

base::scoped_ptr<T> seems to be working fine w/forward declaration, and with
scoped_ptr<T*> clang tells me I'm assigning to FFmpegVideoDecoder** at the
assignment site in clear_key_cdm.cc.

[ddorwin, 2012/09/02 21:39:07]

My point is that we never use the VideoDecoder class, so why does it exist as an
interface? IOW, let's eliminate the base class.

[Tom Finegan, 2012/09/27 22:16:24]

Done.

 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_