Add CDM video decoder.

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.
 
 {
   'targets': [
     {
       'target_name': 'webkit_media',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 84 matching lines @@
         }, { # OS != "android"'
           'sources/': [
             ['exclude', '^android/'],
           ],
         }],
       ],
     },
     {
       'target_name': 'clearkeycdm',
       'type': 'shared_library',
+      'conditions': [
+      ['OS == "android" or OS == "ios"', {

[ddorwin, 2012/10/23 00:32:30]

indent 2 more

[Tom Finegan, 2012/10/23 00:54:41]

Done.

+          # Android and iOS don't use ffmpeg.
+          'use_ffmpeg%': 0,

[ddorwin, 2012/10/23 00:32:30]

I think we should just do the OS check here then separately have the use_ffmpeg
condition below. See
http://code.google.com/searchframe#OAMlx_jo-ck/src/media/media.gyp&exact_pack....

[Tom Finegan, 2012/10/23 00:54:41]

I might have been doing something wrong, but to use the use_ffmpeg variable I
had to define it in a variables section at the top of this file instead of down
here. Otherwise it was undefined (can't use a variable defined in a conditional
in the same conditional in which it was defined?). It's the same place that
media.gyp has it.

[ddorwin, 2012/10/23 01:02:55]

Looks like the code I linked to, so LG.

+          'defines': ['CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER'],

[ddorwin, 2012/10/23 00:32:30]

Remove. We should just return error in InitializeDecoder, which will cause
Decrypt-only to be used. Right xhwang?

[Tom Finegan, 2012/10/23 00:54:41]

Done.

+        }, {  # 'OS != "android" and OS != "ios"'
+          'use_ffmpeg%': 1,
+          'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
+          'dependencies': [
+            '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+          ],
+          'sources': [
+            'crypto/ppapi/ffmpeg_cdm_video_decoder.cc',
+            'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
+          ],
+        }],
+      ],
       'defines': ['CDM_IMPLEMENTATION'],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/media/media.gyp:media'
+        '<(DEPTH)/media/media.gyp:media',
       ],
       'sources': [
         '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',
       ],
       'sources': [
         'crypto/ppapi/cdm_wrapper.cc',
         'crypto/ppapi/content_decryption_module.h',
         'crypto/ppapi/linked_ptr.h',
       ],
       'conditions': [
-        ['os_posix==1 and OS!="mac"', {
+        # TODO(tomfinegan): Remove this hack that disables this target on
+        # android and ios, and include these targets only in desktop builds.
+        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {

[ddorwin, 2012/10/23 00:32:30]

Do you still need this? Shouldn't it all be fixed now?

[Tom Finegan, 2012/10/23 00:54:41]

Done. Forgot to remove.

           'cflags': ['-fvisibility=hidden'],
           'type': 'loadable_module',
           # -gstabs, used in the official builds, causes an ICE. Simply remove
           # it.
           'cflags!': ['-gstabs'],
           # Allow the plugin wrapper to find the CDM in the same directory.
           'ldflags': ['-Wl,-rpath=\$$ORIGIN']
         }],
         ['OS=="win"', {
           'type': 'shared_library',
         }],
         ['OS=="mac"', {
           'type': 'loadable_module',
           'mac_bundle': 1,
           'product_extension': 'plugin',
           'xcode_settings': {
             'OTHER_LDFLAGS': [
               # Not to strip important symbols by -Wl,-dead_strip.
               '-Wl,-exported_symbol,_PPP_GetInterface',
               '-Wl,-exported_symbol,_PPP_InitializeModule',
               '-Wl,-exported_symbol,_PPP_ShutdownModule'
             ]},
         }],
       ],
     }
   ],
 }