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

webkit/media/webkit_media.gypi

Index: webkit/media/webkit_media.gypi
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 81b770c5af4a0da6cc3cf95f9d3722a43f740a6a..5c679fddf8ed75941bee270d655d3797ac6ce3db 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -12,6 +12,11 @@
         'use_ffmpeg%': 1,
       }],
     ],
+    # Set |use_fake_video_decoder| to 1 to ignore input frames in |clearkeycdm|,
+    # and produce video frames filled with a solid color instead.
+    'use_fake_video_decoder%': 0,
+    # Set |use_libvpx| to 1 to use libvpx for VP8 decoding in |clearkeycdm|.
+    'use_libvpx%': 0,
   },
   'targets': [
     {
@@ -113,6 +118,13 @@
       'target_name': 'clearkeycdm',
       'type': 'none',
       'conditions': [
+        ['use_fake_video_decoder == 1' , {

[ddorwin, 2012/11/17 00:09:09]

What about the fake audio decoder?

[Tom Finegan, 2012/11/17 00:25:46]

I was going to do that in another CL. I thought this one was getting large
enough already. :)

[ddorwin, 2012/11/17 02:56:22]

SG

+          'defines': ['CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER'],

[ddorwin, 2012/11/17 00:09:09]

Should we even need all these defines if we're just replacing source files. It
seems we might need one for FFmpeg init but other than that not.

[Tom Finegan, 2012/11/17 00:25:46]

Probably not if we do source file replacement. Let me know what you think about
my response to your first comment in this file.

+          'sources': [
+            'crypto/ppapi/fake_cdm_video_decoder.cc',
+            'crypto/ppapi/fake_cdm_video_decoder.h',
+          ],
+        }],
         ['use_ffmpeg == 1' , {
           'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
           'dependencies': [
@@ -125,6 +137,16 @@
             'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
           ],
         }],
+        ['use_libvpx == 1' , {

[ddorwin, 2012/11/17 02:56:22]

&& use_fake_video_decoder == 0

[Tom Finegan, 2012/11/17 04:35:06]

Done.

+          'defines': ['CLEAR_KEY_CDM_USE_LIBVPX_DECODER'],
+          'dependencies': [
+            '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
+          ],
+          'sources': [
+            'crypto/ppapi/libvpx_cdm_video_decoder.cc',
+            'crypto/ppapi/libvpx_cdm_video_decoder.h',
+          ],
+        }],
         ['os_posix == 1 and OS != "mac"', {
           'type': 'loadable_module',  # Must be in PRODUCT_DIR for ASAN bots.
         }, {  # 'os_posix != 1 or OS == "mac"'
@@ -137,6 +159,8 @@
         '<(DEPTH)/media/media.gyp:media',
       ],
       'sources': [
+        'crypto/ppapi/cdm_video_decoder.h',
+        'crypto/ppapi/cdm_video_decoder_initializer.cc',
         'crypto/ppapi/clear_key_cdm.cc',
         'crypto/ppapi/clear_key_cdm.h',
       ],