media: scaffolding and plumbing for MojoRenderer{Impl, Service}

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 07a5ae9f82516dfe62d86dc546b10b3a586b6077..dbcbcb8103558ffe61565b5209c49398c161b3fc 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1013,62 +1013,6 @@
       ],  # target_conditions
     },
     {
-      # GN version: //media/mojo/interfaces
-      'target_name': 'mojo_media_bindings',
-      'type': 'static_library',
-      'sources': [
-        'mojo/interfaces/media_types.mojom',
-        'mojo/interfaces/media_renderer.mojom',
-      ],
-      'includes': [ 
-        '../mojo/public/tools/bindings/mojom_bindings_generator.gypi'
-       ],
-      'export_dependent_settings': [
-        '../mojo/mojo_base.gyp:mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        '../mojo/mojo_base.gyp:mojo_cpp_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_media_lib',
-      'type': 'static_library',
-      'includes': [
-        '../mojo/mojo_variables.gypi',
-      ],
-      'dependencies': [
-        'media',
-        'mojo_media_bindings',
-        '../base/base.gyp:base',
-        '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '<(mojo_system_for_component)',
-      ],
-      'export_dependent_settings': [
-        'mojo_media_bindings',
-      ],
-      'sources': [
-        'mojo/services/media_type_converters.cc',
-        'mojo/services/media_type_converters.h',
-      ],
-    },
-    {
-      'target_name': 'mojo_media_lib_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        'media',
-        'mojo_media_bindings',
-        'mojo_media_lib',
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../testing/gtest.gyp:gtest',
-        '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_base.gyp:mojo_run_all_unittests',
-      ],
-      'sources': [
-        'mojo/services/media_type_converters_unittest.cc',
-      ],
-    }, 
-    {
       # GN version: //media:media_unittests
       'target_name': 'media_unittests',
       'type': '<(gtest_target_type)',
@@ -1818,5 +1762,124 @@
         },
       ],
     }],
+    ['OS=="linux"', {

[jamesr, 2014/09/15 22:03:14]

what is linux only about this section?

[tim (not reviewing), 2014/09/15 23:59:42]

I forget exactly but I recall media::AudioParameters not being used / available
on mac, and a separate src/mojo build issue on windows (do we build src/mojo on
windows and mac? my other try runs aren't showing anything).  

Retrying now to refresh my memory on the details.

+      'targets': [
+        {
+          # GN version: //media/mojo/interfaces
+          'target_name': 'media_mojo_bindings',
+          'type': 'static_library',
+          'sources': [
+            'mojo/interfaces/media_types.mojom',
+            'mojo/interfaces/media_renderer.mojom',
+            'mojo/interfaces/demuxer_stream.mojom',
+          ],
+          'includes': [ 
+            '../mojo/public/tools/bindings/mojom_bindings_generator.gypi'
+           ],
+          'export_dependent_settings': [
+            '../mojo/mojo_base.gyp:mojo_cpp_bindings',
+          ],
+          'dependencies': [
+            '../mojo/mojo_base.gyp:mojo_cpp_bindings',
+          ],
+        },
+        {
+          'target_name': 'media_mojo_lib',
+          'type': 'static_library',
+          'includes': [
+            '../mojo/mojo_variables.gypi',
+          ],
+          'dependencies': [
+            'media',
+            'media_mojo_bindings',
+            '../base/base.gyp:base',
+            '../mojo/mojo_base.gyp:mojo_environment_chromium',
+            '<(mojo_system_for_component)',
+          ],
+          'export_dependent_settings': [
+            'media_mojo_bindings',
+          ],
+          'sources': [
+            'mojo/services/media_type_converters.cc',
+            'mojo/services/media_type_converters.h',
+            'mojo/services/mojo_demuxer_stream_impl.cc',
+            'mojo/services/mojo_demuxer_stream_impl.h',
+            'mojo/services/mojo_renderer_impl.cc',
+            'mojo/services/mojo_renderer_impl.h',
+          ],
+        },
+        {
+          'target_name': 'media_mojo_renderer_app',
+          'type': 'loadable_module',
+          'includes': [
+            '../mojo/mojo_variables.gypi',
+          ],
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../mojo/mojo_base.gyp:mojo_application_chromium',
+            '<(mojo_system_for_loadable_module)',
+            'media_mojo_lib',
+          ],
+          'sources': [
+            'mojo/services/mojo_demuxer_stream_adapter.cc',
+            'mojo/services/mojo_demuxer_stream_adapter.h',
+            'mojo/services/mojo_renderer_service.cc',
+            'mojo/services/mojo_renderer_service.h',
+          ],
+        },
+        {
+          'target_name': 'media_mojo_lib_unittests',
+          'type': '<(gtest_target_type)',
+          'dependencies': [
+            'media',
+            'media_mojo_bindings',
+            'media_mojo_lib',
+            '../base/base.gyp:base',
+            '../base/base.gyp:test_support_base',
+            '../testing/gtest.gyp:gtest',
+            '../mojo/mojo_base.gyp:mojo_environment_chromium',
+            '../mojo/mojo_base.gyp:mojo_run_all_unittests',
+          ],
+          'sources': [
+            'mojo/services/media_type_converters_unittest.cc',
+          ],
+        },
+        {
+          'target_name': 'media_mojo_renderer_apptest',
+          'type': 'loadable_module',
+          'includes': [
+            '../mojo/mojo_variables.gypi',
+          ],
+          'dependencies': [
+            'media',
+            'media_mojo_bindings',
+            'media_mojo_lib',
+            'media_mojo_renderer_app',
+            'media_test_support',
+            '../base/base.gyp:base',
+            '../base/base.gyp:test_support_base',
+            '../testing/gtest.gyp:gtest',
+            '../mojo/mojo_base.gyp:mojo_application_chromium',
+            # These tests are run via mojo_shell, so declare a dependency to
+            # avoid undefined behavior.
+            '../mojo/mojo.gyp:mojo_shell',
+            '<(mojo_system_for_loadable_module)',
+          ],
+          'sources': [
+            'mojo/services/renderer_unittest.cc',
+          ],
+        }, 
+        {
+          'target_name': 'media_mojo',
+          'type': 'none',
+          'dependencies': [
+            'media_mojo_lib',
+            'media_mojo_lib_unittests',
+            'media_mojo_renderer_app',
+            'media_mojo_renderer_apptest',
+          ]
+        },
+      ]
+    }],
   ],
 }