Revert of Re-Reland: Make media/capture gn and gyps produce components

media/media.gyp

 # 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': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 31 matching lines @@
         'enable_hevc_demuxing%': 1,
         'enable_mse_mpeg2ts_stream_parser%': 1,
       }, {
         'enable_ac3_eac3_audio_demuxing%': 0,
         'enable_hevc_demuxing%': 0,
         'enable_mse_mpeg2ts_stream_parser%': 0,
       }],
     ],
   },
   'includes': [
+    'capture/capture.gypi',
     'media_cdm.gypi',
     'media_variables.gypi',
   ],
   'targets': [
     {
       # GN version: //media:media_features
       'target_name': 'media_features',
       'includes': [ '../build/buildflag_header.gypi' ],
       'hard_dependency': 1,
       'variables': {
@@ skipping 32 matching lines @@
         '../third_party/libwebm/libwebm.gyp:libwebm',
         '../third_party/opus/opus.gyp:opus',
         'media_features',
       ],
       'defines': [
         'MEDIA_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
+      'includes': [
+        'capture/capture.gypi',
+      ],
       'sources': [
+        '<@(capture_sources)',
         'audio/agc_audio_stream.h',
         'audio/alsa/alsa_input.cc',
         'audio/alsa/alsa_input.h',
         'audio/alsa/alsa_output.cc',
         'audio/alsa/alsa_output.h',
         'audio/alsa/alsa_util.cc',
         'audio/alsa/alsa_util.h',
         'audio/alsa/alsa_wrapper.cc',
         'audio/alsa/alsa_wrapper.h',
         'audio/alsa/audio_manager_alsa.cc',
@@ skipping 348 matching lines @@
         'base/video_frame_pool.h',
         'base/video_renderer.cc',
         'base/video_renderer.h',
         'base/video_rotation.h',
         'base/video_types.cc',
         'base/video_types.h',
         'base/video_util.cc',
         'base/video_util.h',
         'base/wall_clock_time_source.cc',
         'base/wall_clock_time_source.h',
+        'base/win/mf_initializer.cc',
+        'base/win/mf_initializer.h',
         'base/yuv_convert.cc',
         'base/yuv_convert.h',
         'cdm/aes_decryptor.cc',
         'cdm/aes_decryptor.h',
         'cdm/cdm_adapter.cc',
         'cdm/cdm_adapter.h',
         'cdm/cdm_allocator.cc',
         'cdm/cdm_allocator.h',
         'cdm/cdm_file_io.h',
         'cdm/cdm_file_io.h',
@@ skipping 216 matching lines @@
             ],
           },
           # Exclude the sources that depend on libvpx.
           'sources!': [
             'filters/vpx_video_decoder.cc',
             'filters/vpx_video_decoder.h',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
+            'capture_java',
             'media_android_jni_headers',
             'media_java',
             'player_android',
+            'video_capture_android_jni_headers',
           ],
           'sources!': [
             'base/audio_video_metadata_extractor.cc',
             'base/audio_video_metadata_extractor.h',
             'base/media_file_checker.cc',
             'base/media_file_checker.h',
             'filters/decrypting_audio_decoder.cc',
             'filters/decrypting_audio_decoder.h',
             'filters/decrypting_video_decoder.cc',
             'filters/decrypting_video_decoder.h',
@@ skipping 82 matching lines @@
             }, {  # else: use_cras==0
               'sources!': [
                 'audio/cras/audio_manager_cras.cc',
                 'audio/cras/audio_manager_cras.h',
                 'audio/cras/cras_input.cc',
                 'audio/cras/cras_input.h',
                 'audio/cras/cras_unified.cc',
                 'audio/cras/cras_unified.h',
               ],
             }],
+
+            ['use_udev==1', {
+              'dependencies': [
+                '<(DEPTH)/device/udev_linux/udev.gyp:udev_linux',
+              ],
+            }],
           ],
         }],
         ['OS!="linux"', {
           'sources!': [
             'audio/cras/audio_manager_cras.cc',
             'audio/cras/audio_manager_cras.h',
             'audio/cras/cras_input.cc',
             'audio/cras/cras_input.h',
             'audio/cras/cras_unified.cc',
             'audio/cras/cras_unified.h',
@@ skipping 77 matching lines @@
             'audio/pulse/audio_manager_pulse.h',
             'audio/pulse/pulse_input.cc',
             'audio/pulse/pulse_input.h',
             'audio/pulse/pulse_output.cc',
             'audio/pulse/pulse_output.h',
             'audio/pulse/pulse_util.cc',
             'audio/pulse/pulse_util.h',
           ],
         }],
         ['OS=="mac"', {
+          'dependencies': [
+            '<(DEPTH)/third_party/decklink/decklink.gyp:decklink',
+          ],
+
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
               '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
               '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
             ],
           },
         }],
         ['OS=="win"', {
+          'link_settings':  {
+            'libraries': [
+              '-ldxguid.lib',
+              '-lmf.lib',
+              '-lmfplat.lib',
+              '-lmfreadwrite.lib',
+              '-lmfuuid.lib',
+              '-lsetupapi.lib',
+              '-lwinmm.lib',
+            ],
+          },
+          # Specify delayload for media.dll.
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'DelayLoadDLLs': [
+                'mf.dll',
+                'mfplat.dll',
+                'mfreadwrite.dll',
+              ],
+            },
+          },
+          # Specify delayload for components that link with media.lib.
+          'all_dependent_settings': {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'DelayLoadDLLs': [
+                  'mf.dll',
+                  'mfplat.dll',
+                  'mfreadwrite.dll',
+                ],
+              },
+            },
+          },
           # TODO(wolenetz): Fix size_t to int truncations in win64. See
           # http://crbug.com/171009
           'conditions': [
             ['target_arch=="x64"', {
               'msvs_disabled_warnings': [ 4267, ],
             }],
           ],
         }],
         ['proprietary_codecs==1', {
           'sources': [
@@ skipping 135 matching lines @@
       'dependencies': [
         '../base/base.gyp:base',
       ]
     },
     {
       # GN version: //media:media_unittests
       'target_name': 'media_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'audio_test_config',
-        # TODO(mcasas): Remove this entry after https://crbug.com/618718.
-        'capture/capture.gyp:unittests',
         'cdm_paths',
         'media',
         'media_features',
         'media_test_support',
         'shared_memory_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:command_buffer_common',
         '../gpu/gpu.gyp:gpu_unittest_utils',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libwebm/libwebm.gyp:libwebm',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../url/url.gyp:url_lib',
       ],
       'sources': [
+        '<@(capture_unittests_sources)',
         'base/android/access_unit_queue_unittest.cc',
         'base/android/media_codec_decoder_unittest.cc',
         'base/android/media_drm_bridge_unittest.cc',
         'base/android/media_player_bridge_unittest.cc',
         'base/android/media_source_player_unittest.cc',
         'base/android/sdk_media_codec_bridge_unittest.cc',
         'base/android/test_data_factory.cc',
         'base/android/test_data_factory.h',
         'base/android/test_statistics.h',
         'base/audio_block_fifo_unittest.cc',
@@ skipping 375 matching lines @@
             ],
             'defines': [
               'USE_CRAS',
             ],
           }],
         ],
       },
     },
     {
       # GN version: //media:audio_unittests
-      # For running the subset of tests that might require audio
+      # For running the subset of media_unittests that might require audio
       # hardware separately on GPU bots. media_unittests includes these too.
       'target_name': 'audio_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'audio_test_config',
-        # TODO(mcasas): Remove this entry after https://crbug.com/618718.
-        'capture/capture.gyp:unittests',
         'media_test_support',
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../url/url.gyp:url_lib',
       ],
       'sources': [
         'base/run_all_unittests.cc',
       ],
@@ skipping 177 matching lines @@
               'base/simd/scale_yuv_to_rgb_mmx.inc',
             ],
           },
           'msvs_2010_disable_uldi_when_referenced': 1,
           'includes': [
             '../third_party/yasm/yasm_compile.gypi',
           ],
         },
       ], # targets
     }],
-    ['OS=="win"', {
-      'targets': [
-        {
-          # GN version: //media/base/win
-          'target_name': 'mf_initializer',
-          'type': '<(component)',
-          'include_dirs': [ '..', ],
-          'defines': [ 'MF_INITIALIZER_IMPLEMENTATION', ],
-          'sources': [
-            'base/win/mf_initializer_export.h',
-            'base/win/mf_initializer.cc',
-            'base/win/mf_initializer.h',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base',
-          ],
-          'link_settings':  {
-            'libraries': [
-              '-ldxguid.lib',
-              '-lmf.lib',
-              '-lmfplat.lib',
-              '-lmfreadwrite.lib',
-              '-lmfuuid.lib',
-              '-lsetupapi.lib',
-              '-lwinmm.lib',
-            ],
-          },
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'DelayLoadDLLs': [
-                'mf.dll',
-                'mfplat.dll',
-                'mfreadwrite.dll',
-              ],
-            },
-          },
-          'all_dependent_settings': {
-            'msvs_settings': {
-              'VCLinkerTool': {
-                'DelayLoadDLLs': [
-                  'mf.dll',
-                  'mfplat.dll',
-                  'mfreadwrite.dll',
-                ],
-              },
-            },
-          },
-        },
-      ],
-    }],
     ['OS=="android"', {
       'targets': [
         {
           # TODO(GN)
           'target_name': 'media_unittests_apk',
           'type': 'none',
           'dependencies': [
+            'capture_java',
             'media_java',
             'media_unittests',
           ],
           'variables': {
             'test_suite_name': 'media_unittests',
             'isolate_file': 'media_unittests.isolate',
           },
           'includes': ['../build/apk_test.gypi'],
         },
         {
           # TODO(GN)
           'target_name': 'media_perftests_apk',
           'type': 'none',
           'dependencies': [
+            'capture_java',
             'media_java',
             'media_perftests',
           ],
           'variables': {
             'test_suite_name': 'media_perftests',
             'isolate_file': 'media_perftests.isolate',
           },
           'includes': ['../build/apk_test.gypi'],
         },
         {
           # GN: //media/base/android:media_jni_headers
           'target_name': 'media_android_jni_headers',
           'type': 'none',
           'sources': [
             'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
             'base/android/java/src/org/chromium/media/AudioRecordInput.java',
             'base/android/java/src/org/chromium/media/MediaCodecBridge.java',
             'base/android/java/src/org/chromium/media/MediaCodecUtil.java',
             'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
           ],
           'variables': {
             'jni_gen_package': 'media',
+          },
+          'includes': ['../build/jni_generator.gypi'],
+        },
+        {
+          # GN: //media/capture/video/android:capture_jni_headers
+          'target_name': 'video_capture_android_jni_headers',
+          'type': 'none',
+          'sources': [
+            'capture/video/android/java/src/org/chromium/media/VideoCapture.java',
+            'capture/video/android/java/src/org/chromium/media/VideoCaptureFactory.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'media',
           },
           'includes': ['../build/jni_generator.gypi'],
         },
         {
           # GN: //media/base/android:android
           'target_name': 'player_android',
           'type': 'static_library',
           'sources': [
             'base/android/access_unit_queue.cc',
             'base/android/access_unit_queue.h',
@@ skipping 73 matching lines @@
           ],
           'include_dirs': [
             # Needed by media_drm_bridge.cc.
             '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'defines': [
             'MEDIA_IMPLEMENTATION',
           ],
         },
         {
+          # GN: //media/capture/video/android:capture_java
+          'target_name': 'capture_java',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'media_android_captureapitype',
+            'media_android_imageformat',
+          ],
+          'export_dependent_settings': [
+            '../base/base.gyp:base',
+          ],
+          'variables': {
+            'java_in_dir': 'capture/video/android/java',
+          },
+          'includes': ['../build/java.gypi'],
+        },
+        {
           # GN: //media/base/android:media_java
           'target_name': 'media_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
           ],
           'export_dependent_settings': [
             '../base/base.gyp:base',
           ],
           'variables': {
             'java_in_dir': 'base/android/java',
           },
           'includes': ['../build/java.gypi'],
         },
+        {
+          # GN: //media/base/android:media_android_captureapitype
+          'target_name': 'media_android_captureapitype',
+          'type': 'none',
+          'variables': {
+            'source_file': 'capture/video/video_capture_device.h',
+          },
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
+        },
+        {
+          # GN: //media/base/android:media_android_imageformat
+          'target_name': 'media_android_imageformat',
+          'type': 'none',
+          'variables': {
+            'source_file': 'capture/video/android/video_capture_device_android.h',
+          },
+          'includes': [ '../build/android/java_cpp_enum.gypi' ],
+        },
       ],
       'conditions': [
         ['test_isolation_mode != "noop"',
           {
             'targets': [
               {
                 'target_name': 'media_unittests_apk_run',
                 'type': 'none',
                 'dependencies': [
                   'media_unittests_apk',
@@ skipping 354 matching lines @@
                 'dependencies': [
                   '../build/linux/system.gyp:libdrm',
                 ]
               }],
             ],
           }
         ]
     }],
   ],
 }