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..b8059af3f54a2cae881b09b73623153595a0d2e0 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,7 +118,14 @@
       'target_name': 'clearkeycdm',
       'type': 'none',
       'conditions': [
-        ['use_ffmpeg == 1' , {
+        ['use_fake_video_decoder == 1' , {
+          'defines': ['CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER'],
+          'sources': [
+            'crypto/ppapi/fake_cdm_video_decoder.cc',
+            'crypto/ppapi/fake_cdm_video_decoder.h',
+          ],
+        }],
+        ['use_ffmpeg == 1 and use_fake_video_decoder == 0'  , {

[ddorwin, 2012/12/04 04:22:37]

'and use_fake_video_decoder == 0' only applies to ffmpeg_cdm_video_decoder.*.

[Tom Finegan, 2012/12/04 20:59:41]

Yeah... this section is a mess now. I addressed your comment, and added a TODO.

           'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
           'dependencies': [
             '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
@@ -125,6 +137,16 @@
             'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
           ],
         }],
+        ['use_libvpx == 1 and use_fake_video_decoder == 0' , {
+          '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.cc',
+        'crypto/ppapi/cdm_video_decoder.h',
         'crypto/ppapi/clear_key_cdm.cc',
         'crypto/ppapi/clear_key_cdm.h',
       ],