Add video decoding methods in Decryptor and add DecryptingVideoDecoder.

webkit/media/crypto/proxy_decryptor.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[ddorwin, 2012/09/21 00:36:08]

Does this class eventually go away?

[xhwang, 2012/09/25 23:52:32]

Not. This class is handling the kNoKey logic which is shared by all other
Decryptor implementations.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 #define WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 38 matching lines @@
                       const uint8* key,
                       int key_length,
                       const uint8* init_data,
                       int init_data_length,
                       const std::string& session_id) OVERRIDE;
   virtual void CancelKeyRequest(const std::string& key_system,
                                 const std::string& session_id) OVERRIDE;
   virtual void Decrypt(const scoped_refptr<media::DecoderBuffer>& encrypted,
                        const DecryptCB& decrypt_cb) OVERRIDE;
   virtual void Stop() OVERRIDE;
+  virtual void InitializeVideoDecoder(const media::VideoDecoderConfig& config,
+                                      const InitializeCB& init_cb) OVERRIDE;
+  virtual void DecryptAndDecodeVideo(
+      const scoped_refptr<media::DecoderBuffer>& encrypted,
+      const VideoDecodeCB& video_decode_cb) OVERRIDE;
+  virtual void ResetVideoDecoder() OVERRIDE;
+  virtual void StopVideoDecoder() OVERRIDE;
 
  private:
   scoped_ptr<media::Decryptor> CreatePpapiDecryptor(
       const std::string& key_system);
   scoped_ptr<media::Decryptor> CreateDecryptor(const std::string& key_system);
 
   // Helper function that makes sure decryptor_->Decrypt() runs on the
   // |message_loop|.
   void DecryptOnMessageLoop(
       const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy,
@@ skipping 20 matching lines @@
   scoped_ptr<media::Decryptor> decryptor_;
   std::vector<base::Closure> pending_decrypt_closures_;
   bool stopped_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_