Migrate content/common/gpu/media code to media/gpu

content/content_common.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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../cc/cc.gyp:cc',
     '../components/tracing.gyp:tracing',
     '../device/bluetooth/bluetooth.gyp:device_bluetooth',
     '../gpu/blink/gpu_blink.gyp:gpu_blink',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../gpu/gpu.gyp:command_buffer_service',
     '../gpu/gpu.gyp:gles2_c_lib',
     '../gpu/gpu.gyp:gles2_implementation',
 
-    # TODO(markdittmer): This should be removed once content/common/gpu/media
-    # is refactored into media/ipc.
-    '../gpu/gpu.gyp:gpu_ipc_service',
-
     # TODO: the dependency on gl_in_process_context should be decoupled from
     # content and moved to android_webview. See crbug.com/365797.
     '../gpu/gpu.gyp:gl_in_process_context',
     '../gpu/gpu.gyp:gpu',
     '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
     '../ipc/ipc.gyp:ipc',
     '../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
     '../media/media.gyp:media',
     '../media/media.gyp:shared_memory_support',
     '../media/gpu/ipc/media_ipc.gyp:media_gpu_ipc_client',
@@ skipping 57 matching lines @@
     '../base/base.gyp:base',
     '../mojo/mojo_public.gyp:mojo_cpp_bindings',
     '../services/shell/shell.gyp:shell_public',
     # The public content API headers directly include Blink API headers, so we
     # have to export the blink header settings so that relative paths in these
     # headers resolve correctly.
     '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
     '../ui/accessibility/accessibility.gyp:ax_gen',
   ],
   'variables': {
-    'use_v4lplugin%': 0,
-    'use_v4l2_codec%': 0,
     'public_common_sources': [
       'public/common/appcache_info.h',
       'public/common/bindings_policy.h',
       'public/common/browser_plugin_guest_mode.cc',
       'public/common/browser_plugin_guest_mode.h',
       'public/common/browser_side_navigation_policy.cc',
       'public/common/browser_side_navigation_policy.h',
       'public/common/child_process_host.h',
       'public/common/child_process_host_delegate.cc',
       'public/common/child_process_host_delegate.h',
@@ skipping 235 matching lines @@
       'common/geofencing_messages.h',
       'common/geofencing_types.cc',
       'common/geofencing_types.h',
       'common/gin_java_bridge_messages.h',
       'common/gpu/client/command_buffer_metrics.cc',
       'common/gpu/client/command_buffer_metrics.h',
       'common/gpu/client/context_provider_command_buffer.cc',
       'common/gpu/client/context_provider_command_buffer.h',
       'common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc',
       'common/gpu/client/webgraphicscontext3d_command_buffer_impl.h',
-      'common/gpu/media/fake_video_decode_accelerator.cc',
-      'common/gpu/media/fake_video_decode_accelerator.h',
-      'common/gpu/media/gpu_jpeg_decode_accelerator.cc',
-      'common/gpu/media/gpu_jpeg_decode_accelerator.h',
-      'common/gpu/media/gpu_video_decode_accelerator.cc',
-      'common/gpu/media/gpu_video_decode_accelerator.h',
-      'common/gpu/media/gpu_video_decode_accelerator_factory_impl.cc',
-      'common/gpu/media/gpu_video_decode_accelerator_factory_impl.h',
-      'common/gpu/media/gpu_video_decode_accelerator_helpers.h',
-      'common/gpu/media/gpu_video_encode_accelerator.cc',
-      'common/gpu/media/gpu_video_encode_accelerator.h',
-      'common/gpu/media/media_channel.cc',
-      'common/gpu/media/media_channel.h',
-      'common/gpu/media/media_service.cc',
-      'common/gpu/media/media_service.h',
-      'common/gpu/media/shared_memory_region.cc',
-      'common/gpu/media/shared_memory_region.h',
       'common/gpu_host_messages.h',
       'common/gpu_process_launch_causes.h',
       'common/host_discardable_shared_memory_manager.cc',
       'common/host_discardable_shared_memory_manager.h',
       'common/host_shared_bitmap_manager.cc',
       'common/host_shared_bitmap_manager.h',
       'common/in_process_child_thread_params.cc',
       'common/in_process_child_thread_params.h',
       'common/indexed_db/indexed_db_constants.h',
       'common/indexed_db/indexed_db_key.cc',
@@ skipping 205 matching lines @@
   'target_conditions': [
     ['OS=="android" and <(use_seccomp_bpf)==1', {
       'sources/': [
         ['include', '^common/sandbox_linux/sandbox_bpf_base_policy_linux\\.cc$'],
         ['include', '^common/sandbox_linux/sandbox_bpf_base_policy_linux\\.h$'],
       ],
     }],
   ],
   'conditions': [
     ['OS=="mac"', {
-      'dependencies': [
-        '../media/media.gyp:media',
-        '../sandbox/sandbox.gyp:seatbelt',
-        'app/resources/content_resources.gyp:content_resources',
-        '../ui/accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_widget_mac'
-      ],
-      'sources': [
-        'common/gpu/media/vt_mac.h',
-        'common/gpu/media/vt_video_decode_accelerator_mac.cc',
-        'common/gpu/media/vt_video_decode_accelerator_mac.h',
-        'common/gpu/media/vt_video_encode_accelerator_mac.cc',
-        'common/gpu/media/vt_video_encode_accelerator_mac.h',
-      ],
-      'link_settings': {
-        'libraries': [
-          '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
-          '$(SDKROOT)/System/Library/Frameworks/CoreMedia.framework',
-          '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
-          '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
-          '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-          '$(SDKROOT)/usr/lib/libsandbox.dylib',
-        ],
-      },
-      'variables': {
-        'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
-        'extra_header': 'common/gpu/media/vt_stubs_header.fragment',
-        'sig_files': ['common/gpu/media/vt.sig'],
-        'outfile_type': 'posix_stubs',
-        'stubs_filename_root': 'vt_stubs',
-        'project_path': 'content/common/gpu/media',
-        'intermediate_dir': '<(INTERMEDIATE_DIR)',
-        'output_root': '<(SHARED_INTERMEDIATE_DIR)/vt_stubs',
-      },
-      'include_dirs': [
-        '<(output_root)',
-      ],
-      'actions': [
-        {
-          'action_name': 'generate_stubs',
-          'inputs': [
-            '<(generate_stubs_script)',
-            '<(extra_header)',
-            '<@(sig_files)',
-          ],
-          'outputs': [
-            '<(intermediate_dir)/<(stubs_filename_root).cc',
-            '<(output_root)/<(project_path)/<(stubs_filename_root).h',
-          ],
-          'action': ['python',
-                     '<(generate_stubs_script)',
-                     '-i', '<(intermediate_dir)',
-                     '-o', '<(output_root)/<(project_path)',
-                     '-t', '<(outfile_type)',
-                     '-e', '<(extra_header)',
-                     '-s', '<(stubs_filename_root)',
-                     '-p', '<(project_path)',
-                     '<@(_inputs)',
-          ],
-          'process_outputs_as_sources': 1,
-          'message': 'Generating VideoToolbox stubs for dynamic loading',
-        },
-      ],
+      'dependencies': [ '../sandbox/sandbox.gyp:seatbelt' ],
+      'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/vt_stubs' ],
     }],
     ['OS=="android"',{
       'link_settings': {
         'libraries': [
           '-landroid',  # ANativeWindow
         ],
       },
      'dependencies': [
         'content.gyp:content_jni_headers',
         'content.gyp:common_aidl',
@@ skipping 27 matching lines @@
         'common/pepper_plugin_list.cc',
         'common/pepper_plugin_list.h',
         'common/pepper_renderer_instance_data.cc',
         'common/pepper_renderer_instance_data.h',
         'common/plugin_list.cc',
         'common/plugin_list.h',
         'public/common/pepper_plugin_info.cc',
         'public/common/pepper_plugin_info.h',
       ],
     }],
-    ['OS=="android"', {
-      'dependencies': [
-        '../media/media.gyp:media',
-      ],
-      'sources': [
-        'common/gpu/media/android_copying_backing_strategy.cc',
-        'common/gpu/media/android_copying_backing_strategy.h',
-        'common/gpu/media/android_deferred_rendering_backing_strategy.cc',
-        'common/gpu/media/android_deferred_rendering_backing_strategy.h',
-        'common/gpu/media/android_video_decode_accelerator.cc',
-        'common/gpu/media/android_video_decode_accelerator.h',
-        'common/gpu/media/avda_codec_image.cc',
-        'common/gpu/media/avda_codec_image.h',
-        'common/gpu/media/avda_return_on_failure.h',
-        'common/gpu/media/avda_shared_state.cc',
-        'common/gpu/media/avda_shared_state.h',
-        'common/gpu/media/avda_state_provider.h',
-      ],
-    }],
-    ['OS=="android" and enable_webrtc==1', {
-      'dependencies': [
-        '../third_party/libyuv/libyuv.gyp:libyuv',
-      ],
-      'sources': [
-        'common/gpu/media/android_video_encode_accelerator.cc',
-        'common/gpu/media/android_video_encode_accelerator.h',
-      ],
-    }],
     ['enable_webrtc==1', {
       'dependencies': [
         '../third_party/libjingle/libjingle.gyp:libjingle',
       ],
       'sources': [
         'public/common/webrtc_ip_handling_policy.cc',
         'public/common/webrtc_ip_handling_policy.h',
       ],
     }],
-    ['use_v4lplugin==1 and chromeos==1', {
-      'defines': [
-        'USE_LIBV4L2'
-      ],
-      'variables': {
-        'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
-        'extra_header': 'common/gpu/media/v4l2_stub_header.fragment',
-        'sig_files': ['common/gpu/media/v4l2.sig'],
-        'outfile_type': 'posix_stubs',
-        'stubs_filename_root': 'v4l2_stubs',
-        'project_path': 'content/common/gpu/media',
-        'intermediate_dir': '<(INTERMEDIATE_DIR)',
-        'output_root': '<(SHARED_INTERMEDIATE_DIR)/v4l2',
-      },
-      'include_dirs': [
-        '<(output_root)',
-      ],
-      'actions': [
-        {
-          'action_name': 'generate_stubs',
-          'inputs': [
-            '<(generate_stubs_script)',
-            '<(extra_header)',
-            '<@(sig_files)',
-          ],
-          'outputs': [
-            '<(intermediate_dir)/<(stubs_filename_root).cc',
-            '<(output_root)/<(project_path)/<(stubs_filename_root).h',
-          ],
-          'action': ['python',
-            '<(generate_stubs_script)',
-            '-i', '<(intermediate_dir)',
-            '-o', '<(output_root)/<(project_path)',
-            '-t', '<(outfile_type)',
-            '-e', '<(extra_header)',
-            '-s', '<(stubs_filename_root)',
-            '-p', '<(project_path)',
-            '<@(_inputs)',
-          ],
-          'process_outputs_as_sources': 1,
-          'message': 'Generating libv4l2 stubs for dynamic loading',
-        },
-      ],
-    }],
-    ['chromeos==1', {
-      'sources': [
-        'common/gpu/media/accelerated_video_decoder.h',
-        'common/gpu/media/h264_decoder.cc',
-        'common/gpu/media/h264_decoder.h',
-        'common/gpu/media/h264_dpb.cc',
-        'common/gpu/media/h264_dpb.h',
-        'common/gpu/media/vp8_decoder.cc',
-        'common/gpu/media/vp8_decoder.h',
-        'common/gpu/media/vp8_picture.cc',
-        'common/gpu/media/vp8_picture.h',
-        'common/gpu/media/vp9_decoder.cc',
-        'common/gpu/media/vp9_decoder.h',
-        'common/gpu/media/vp9_picture.cc',
-        'common/gpu/media/vp9_picture.h',
-      ],
-    }],
-    ['chromeos==1 and use_v4l2_codec==1', {
-      'direct_dependent_settings': {
-        'defines': [
-          'USE_V4L2_CODEC'
-        ],
-      },
-      'defines': [
-        'USE_V4L2_CODEC'
-      ],
-      'dependencies': [
-        '../media/media.gyp:media',
-        '../third_party/libyuv/libyuv.gyp:libyuv',
-      ],
-      'sources': [
-        'common/gpu/media/generic_v4l2_device.cc',
-        'common/gpu/media/generic_v4l2_device.h',
-        'common/gpu/media/v4l2_device.cc',
-        'common/gpu/media/v4l2_device.h',
-        'common/gpu/media/v4l2_image_processor.cc',
-        'common/gpu/media/v4l2_image_processor.h',
-        'common/gpu/media/v4l2_jpeg_decode_accelerator.cc',
-        'common/gpu/media/v4l2_jpeg_decode_accelerator.h',
-        'common/gpu/media/v4l2_slice_video_decode_accelerator.cc',
-        'common/gpu/media/v4l2_slice_video_decode_accelerator.h',
-        'common/gpu/media/v4l2_video_decode_accelerator.cc',
-        'common/gpu/media/v4l2_video_decode_accelerator.h',
-        'common/gpu/media/v4l2_video_encode_accelerator.cc',
-        'common/gpu/media/v4l2_video_encode_accelerator.h',
-      ],
-      'include_dirs': [
-        '<(DEPTH)/third_party/khronos',
-      ],
-    }],
-    ['target_arch == "arm" and chromeos == 1', {
-      'sources': [
-        'common/gpu/media/tegra_v4l2_device.cc',
-        'common/gpu/media/tegra_v4l2_device.h',
-      ],
-    }],
-    ['target_arch != "arm" and chromeos == 1', {
-      'dependencies': [
-        '../media/media.gyp:media',
-        '../third_party/libyuv/libyuv.gyp:libyuv',
-      ],
-      'sources': [
-        'common/gpu/media/va_surface.h',
-        'common/gpu/media/vaapi_jpeg_decode_accelerator.cc',
-        'common/gpu/media/vaapi_jpeg_decode_accelerator.h',
-        'common/gpu/media/vaapi_jpeg_decoder.cc',
-        'common/gpu/media/vaapi_jpeg_decoder.h',
-        'common/gpu/media/vaapi_picture.cc',
-        'common/gpu/media/vaapi_picture.h',
-        'common/gpu/media/vaapi_video_decode_accelerator.cc',
-        'common/gpu/media/vaapi_video_decode_accelerator.h',
-        'common/gpu/media/vaapi_video_encode_accelerator.cc',
-        'common/gpu/media/vaapi_video_encode_accelerator.h',
-        'common/gpu/media/vaapi_wrapper.cc',
-        'common/gpu/media/vaapi_wrapper.h',
-      ],
-      'conditions': [
-        ['use_x11 == 1', {
-          'variables': {
-            'sig_files': [
-              'common/gpu/media/va.sigs',
-              'common/gpu/media/va_x11.sigs',
-            ],
-          },
-          'sources': [
-            'common/gpu/media/vaapi_tfp_picture.cc',
-            'common/gpu/media/vaapi_tfp_picture.h',
-          ],
-        }, {
-          'variables': {
-            'sig_files': [
-              'common/gpu/media/va.sigs',
-              'common/gpu/media/va_drm.sigs',
-            ],
-          },
-          'sources': [
-            'common/gpu/media/vaapi_drm_picture.cc',
-            'common/gpu/media/vaapi_drm_picture.h',
-          ],
-        }],
-      ],
-      'variables': {
-        'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
-        'extra_header': 'common/gpu/media/va_stub_header.fragment',
-        'outfile_type': 'posix_stubs',
-        'stubs_filename_root': 'va_stubs',
-        'project_path': 'content/common/gpu/media',
-        'intermediate_dir': '<(INTERMEDIATE_DIR)',
-        'output_root': '<(SHARED_INTERMEDIATE_DIR)/va',
-      },
-      'include_dirs': [
-        '<(DEPTH)/third_party/libva',
-        '<(DEPTH)/third_party/libyuv',
-        '<(output_root)',
-      ],
-      'actions': [
-        {
-          'action_name': 'generate_stubs',
-          'inputs': [
-            '<(generate_stubs_script)',
-            '<(extra_header)',
-            '<@(sig_files)',
-          ],
-          'outputs': [
-            '<(intermediate_dir)/<(stubs_filename_root).cc',
-            '<(output_root)/<(project_path)/<(stubs_filename_root).h',
-          ],
-          'action': ['python',
-                     '<(generate_stubs_script)',
-                     '-i', '<(intermediate_dir)',
-                     '-o', '<(output_root)/<(project_path)',
-                     '-t', '<(outfile_type)',
-                     '-e', '<(extra_header)',
-                     '-s', '<(stubs_filename_root)',
-                     '-p', '<(project_path)',
-                     '<@(_inputs)',
-          ],
-          'process_outputs_as_sources': 1,
-          'message': 'Generating libva stubs for dynamic loading',
-        },
-     ]
-    }],
-    ['OS=="win"', {
-      'dependencies': [
-        '../media/media.gyp:media',
-        '../ui/gl/gl.gyp:gl',
-      ],
-      'link_settings': {
-        'libraries': [
-           '-ld3d9.lib',
-           '-ld3d11.lib',
-           '-ldxva2.lib',
-           '-lstrmiids.lib',
-           '-lmf.lib',
-           '-lmfplat.lib',
-           '-lmfuuid.lib',
-        ],
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'DelayLoadDLLs': [
-              'd3d9.dll',
-                          'd3d11.dll',
-              'dxva2.dll',
-              'mf.dll',
-              'mfplat.dll',
-            ],
-          },
-        },
-      },
-      'sources': [
-        'common/gpu/media/dxva_video_decode_accelerator_win.cc',
-        'common/gpu/media/dxva_video_decode_accelerator_win.h',
-      ],
-      'include_dirs': [
-        '<(DEPTH)/third_party/khronos',
-      ],
-    }],
     ['use_seccomp_bpf==0', {
       'sources!': [
         'common/sandbox_linux/android/sandbox_bpf_base_policy_android.cc',
         'common/sandbox_linux/android/sandbox_bpf_base_policy_android.h',
         'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc',
         'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.h',
         'common/sandbox_linux/bpf_gpu_policy_linux.cc',
         'common/sandbox_linux/bpf_gpu_policy_linux.h',
         'common/sandbox_linux/bpf_ppapi_policy_linux.cc',
         'common/sandbox_linux/bpf_ppapi_policy_linux.h',
@@ skipping 19 matching lines @@
       'sources!': [
         'common/cursors/webcursor_ozone.cc',
         'common/font_list_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
       ],
     }],
   ],
 }