Add a libvpx video decoder to ClearKeyCdm and move the fake video decoder to its own class.

webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h

Index: webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
diff --git a/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h b/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
index a835673cbf00b2fbd8cdf2700344a433879d2df6..29ac618c21045874e71f3f4de598efab5c6e7d29 100644
--- a/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
+++ b/webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
 #include "webkit/media/crypto/ppapi/content_decryption_module.h"
 
 struct AVCodecContext;
@@ -14,28 +15,25 @@ struct AVFrame;
 
 namespace webkit_media {
 
-class FFmpegCdmVideoDecoder {
+class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
  public:
   explicit FFmpegCdmVideoDecoder(cdm::Allocator* allocator);
-  ~FFmpegCdmVideoDecoder();
-  bool Initialize(const cdm::VideoDecoderConfig& config);
-  void Deinitialize();
-  void Reset();
+  virtual ~FFmpegCdmVideoDecoder();
+
+  // CdmVideoDecoder implementation.
+  virtual bool Initialize(const cdm::VideoDecoderConfig& config) OVERRIDE;
+  virtual void Deinitialize() OVERRIDE;
+  virtual void Reset() OVERRIDE;
+  virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame,
+                                  int32_t compressed_frame_size,
+                                  int64_t timestamp,
+                                  cdm::VideoFrame* decoded_frame) OVERRIDE;
 
   // Returns true when |format| and |data_size| specify a supported video
   // output configuration.
   static bool IsValidOutputConfig(cdm::VideoFormat format,
                                   const cdm::Size& data_size);

[xhwang, 2012/11/20 06:46:20]

move static method up to line 20?

[Tom Finegan, 2012/12/03 23:48:55]

Is this a style guide thing that I'm unaware of? 

I just want to understand the reasoning behind changing the order. Your comment
also applies to ffmpeg_cdm_video_decoder.h, btw.

[xhwang, 2012/12/04 01:31:03]

That's my mis-interpretation of the style guide. I just found recently what I
was wrong. Please ignore my comment.

 
-  // Decodes |compressed_frame|. Stores output frame in |decoded_frame| and
-  // returns |cdm::kSuccess| when an output frame is available. Returns
-  // |cdm::kNeedMoreData| when |compressed_frame| does not produce an output
-  // frame. Returns |cdm::kDecodeError| when decoding fails.
-  cdm::Status DecodeFrame(const uint8_t* compressed_frame,
-                          int32_t compressed_frame_size,
-                          int64_t timestamp,
-                          cdm::VideoFrame* decoded_frame);
-
  private:
   // Allocates storage, then copies video frame stored in |av_frame_| to
   // |cdm_video_frame|. Returns true when allocation and copy succeed.