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

webkit/media/webkit_media.gypi

 # 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.
 
 {
   'variables': {
     'conditions': [
       ['OS == "android" or OS == "ios"', {
         # Android and iOS don't use ffmpeg.
         'use_ffmpeg%': 0,
       }, {  # 'OS != "android" and OS != "ios"'
         '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': [
     {
       'target_name': 'webkit_media',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)',  # Needed by key_systems.cc.
       ],
       'dependencies': [
@@ skipping 80 matching lines @@
         }, { # OS != "android"'
           'sources/': [
             ['exclude', '^android/'],
           ],
         }],
       ],
     },
     {
       'target_name': 'clearkeycdm',
       'type': 'none',
+      # TODO(tomfinegan): Simplify this by unconditionally including all the
+      # decoders, and changing clearkeycdm to select which decoder to use
+      # based on environment variables.
       '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'  , {
           'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
           'dependencies': [
             '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
             'crypto/ppapi/ffmpeg_cdm_audio_decoder.cc',
             'crypto/ppapi/ffmpeg_cdm_audio_decoder.h',
+          ],
+        }],
+        ['use_ffmpeg == 1 and use_fake_video_decoder == 0'  , {
+          'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],

[ddorwin, 2012/12/04 22:38:15]

These 4 lines aren't necessary. Just the additional sources.

[Tom Finegan, 2012/12/04 23:17:39]

Done.

+          'dependencies': [
+            '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+          ],
+          'sources': [
             'crypto/ppapi/ffmpeg_cdm_video_decoder.cc',
             '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"'
           'type': 'shared_library',
         }],
       ],
       'defines': ['CDM_IMPLEMENTATION'],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(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',
       ],
     },
     {
       'target_name': 'clearkeycdmplugin',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
         'clearkeycdm',
@@ skipping 26 matching lines @@
               # Not to strip important symbols by -Wl,-dead_strip.
               '-Wl,-exported_symbol,_PPP_GetInterface',
               '-Wl,-exported_symbol,_PPP_InitializeModule',
               '-Wl,-exported_symbol,_PPP_ShutdownModule'
             ]},
         }],
       ],
     }
   ],
 }