Add CDM video decoder.

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 9f652e267960f4e1003b29c727aeb302ff57f087..5e3c9e2e0a734876f100f00593d8ecf5799ec818 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -102,10 +102,27 @@
     {
       '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',
@@ -125,7 +142,9 @@
         '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