Merge 217276 "Add media::VideoEncodeAccelerator with WebRTC inte..."

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 135 matching lines @@
         'audio/mac/audio_synchronized_mac.cc',
         'audio/mac/audio_synchronized_mac.h',
         'audio/mac/audio_unified_mac.cc',
         'audio/mac/audio_unified_mac.h',
         'audio/null_audio_sink.cc',
         'audio/null_audio_sink.h',
         'audio/openbsd/audio_manager_openbsd.cc',
         'audio/openbsd/audio_manager_openbsd.h',
         'audio/pulse/audio_manager_pulse.cc',
         '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_input.cc',
-        'audio/pulse/pulse_input.h',
         'audio/pulse/pulse_unified.cc',
         'audio/pulse/pulse_unified.h',
         'audio/pulse/pulse_util.cc',
         'audio/pulse/pulse_util.h',
         'audio/sample_rates.cc',
         'audio/sample_rates.h',
         'audio/scoped_loop_observer.cc',
         'audio/scoped_loop_observer.h',
         'audio/simple_sources.cc',
         'audio/simple_sources.h',
         'audio/virtual_audio_input_stream.cc',
         'audio/virtual_audio_input_stream.h',
         'audio/virtual_audio_output_stream.cc',
         'audio/virtual_audio_output_stream.h',
         'audio/win/audio_device_listener_win.cc',
         'audio/win/audio_device_listener_win.h',
         'audio/win/audio_low_latency_input_win.cc',
         'audio/win/audio_low_latency_input_win.h',
         'audio/win/audio_low_latency_output_win.cc',
         'audio/win/audio_low_latency_output_win.h',
         'audio/win/audio_manager_win.cc',
         'audio/win/audio_manager_win.h',
         'audio/win/audio_unified_win.cc',
         'audio/win/audio_unified_win.h',
         'audio/win/avrt_wrapper_win.cc',
         'audio/win/avrt_wrapper_win.h',
+        'audio/win/core_audio_util_win.cc',
+        'audio/win/core_audio_util_win.h',
         'audio/win/device_enumeration_win.cc',
         'audio/win/device_enumeration_win.h',
-        'audio/win/core_audio_util_win.cc',
-        'audio/win/core_audio_util_win.h',
         'audio/win/wavein_input_win.cc',
         'audio/win/wavein_input_win.h',
         'audio/win/waveout_output_win.cc',
         'audio/win/waveout_output_win.h',
         'base/android/demuxer_stream_player_params.cc',
         'base/android/demuxer_stream_player_params.h',
         'base/android/media_player_manager.h',
         'base/android/media_resource_getter.cc',
         'base/android/media_resource_getter.h',
         'base/audio_buffer.cc',
@@ skipping 10 matching lines @@
         'base/audio_fifo.cc',
         'base/audio_fifo.h',
         'base/audio_hardware_config.cc',
         'base/audio_hardware_config.h',
         'base/audio_hash.cc',
         'base/audio_hash.h',
         'base/audio_pull_fifo.cc',
         'base/audio_pull_fifo.h',
         'base/audio_renderer.cc',
         'base/audio_renderer.h',
-        'base/audio_renderer_sink.h',
         'base/audio_renderer_mixer.cc',
         'base/audio_renderer_mixer.h',
         'base/audio_renderer_mixer_input.cc',
         'base/audio_renderer_mixer_input.h',
+        'base/audio_renderer_sink.h',
         'base/audio_splicer.cc',
         'base/audio_splicer.h',
         'base/audio_timestamp_helper.cc',
         'base/audio_timestamp_helper.h',
         'base/bind_to_loop.h',
-        'base/bitstream_buffer.h',
         'base/bit_reader.cc',
         'base/bit_reader.h',
+        'base/bitstream_buffer.h',
         'base/buffers.h',
         'base/byte_queue.cc',
         'base/byte_queue.h',
         'base/channel_mixer.cc',
         'base/channel_mixer.h',
         'base/clock.cc',
         'base/clock.h',
         'base/container_names.cc',
         'base/container_names.h',
         'base/data_buffer.cc',
         'base/data_buffer.h',
         'base/data_source.cc',
         'base/data_source.h',
         'base/decoder_buffer.cc',
         'base/decoder_buffer.h',
         'base/decoder_buffer_queue.cc',
         'base/decoder_buffer_queue.h',
+        'base/decrypt_config.cc',
+        'base/decrypt_config.h',
         'base/decryptor.cc',
         'base/decryptor.h',
-        'base/decrypt_config.cc',
-        'base/decrypt_config.h',
         'base/demuxer.cc',
         'base/demuxer.h',
         'base/demuxer_stream.cc',
         'base/demuxer_stream.h',
         'base/djb2.cc',
         'base/djb2.h',
         'base/filter_collection.cc',
         'base/filter_collection.h',
         'base/media.cc',
         'base/media.h',
@@ skipping 77 matching lines @@
         'filters/ffmpeg_demuxer.cc',
         'filters/ffmpeg_demuxer.h',
         'filters/ffmpeg_glue.cc',
         'filters/ffmpeg_glue.h',
         'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
         'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
         'filters/ffmpeg_video_decoder.cc',
         'filters/ffmpeg_video_decoder.h',
         'filters/file_data_source.cc',
         'filters/file_data_source.h',
+        'filters/gpu_video_accelerator_factories.cc',
+        'filters/gpu_video_accelerator_factories.h',
         'filters/gpu_video_decoder.cc',
         'filters/gpu_video_decoder.h',
-        'filters/gpu_video_decoder_factories.cc',
-        'filters/gpu_video_decoder_factories.h',
         'filters/h264_to_annex_b_bitstream_converter.cc',
         'filters/h264_to_annex_b_bitstream_converter.h',
         'filters/in_memory_url_protocol.cc',
         'filters/in_memory_url_protocol.h',
         'filters/opus_audio_decoder.cc',
         'filters/opus_audio_decoder.h',
         'filters/skcanvas_video_renderer.cc',
         'filters/skcanvas_video_renderer.h',
         'filters/source_buffer_stream.cc',
         'filters/source_buffer_stream.h',
         'filters/stream_parser_factory.cc',
         'filters/stream_parser_factory.h',
         'filters/video_decoder_selector.cc',
         'filters/video_decoder_selector.h',
         'filters/video_frame_stream.cc',
         'filters/video_frame_stream.h',
         'filters/video_renderer_base.cc',
         'filters/video_renderer_base.h',
         'filters/vpx_video_decoder.cc',
         'filters/vpx_video_decoder.h',
+        'midi/midi_manager.cc',
         'midi/midi_manager.h',
-        'midi/midi_manager.cc',
+        'midi/midi_manager_mac.cc',
         'midi/midi_manager_mac.h',
-        'midi/midi_manager_mac.cc',
+        'midi/midi_port_info.cc',
         'midi/midi_port_info.h',
-        'midi/midi_port_info.cc',
         'video/capture/android/video_capture_device_android.cc',
         'video/capture/android/video_capture_device_android.h',
         'video/capture/fake_video_capture_device.cc',
         'video/capture/fake_video_capture_device.h',
         'video/capture/linux/video_capture_device_linux.cc',
         'video/capture/linux/video_capture_device_linux.h',
         'video/capture/mac/video_capture_device_mac.h',
         'video/capture/mac/video_capture_device_mac.mm',
         'video/capture/mac/video_capture_device_qtkit_mac.h',
         'video/capture/mac/video_capture_device_qtkit_mac.mm',
@@ skipping 18 matching lines @@
         'video/capture/win/sink_input_pin_win.cc',
         'video/capture/win/sink_input_pin_win.h',
         'video/capture/win/video_capture_device_mf_win.cc',
         'video/capture/win/video_capture_device_mf_win.h',
         'video/capture/win/video_capture_device_win.cc',
         'video/capture/win/video_capture_device_win.h',
         'video/picture.cc',
         'video/picture.h',
         'video/video_decode_accelerator.cc',
         'video/video_decode_accelerator.h',
+        'video/video_encode_accelerator.cc',
+        'video/video_encode_accelerator.h',
         'webm/webm_audio_client.cc',
         'webm/webm_audio_client.h',
         'webm/webm_cluster_parser.cc',
         'webm/webm_cluster_parser.h',
         'webm/webm_constants.cc',
         'webm/webm_constants.h',
         'webm/webm_content_encodings.cc',
         'webm/webm_content_encodings.h',
         'webm/webm_content_encodings_client.cc',
         'webm/webm_content_encodings_client.h',
@@ skipping 689 matching lines @@
         'base/mock_audio_renderer_sink.cc',
         'base/mock_audio_renderer_sink.h',
         'base/mock_data_source_host.cc',
         'base/mock_data_source_host.h',
         'base/mock_demuxer_host.cc',
         'base/mock_demuxer_host.h',
         'base/mock_filters.cc',
         'base/mock_filters.h',
         'base/test_helpers.cc',
         'base/test_helpers.h',
-        'filters/mock_gpu_video_decoder_factories.cc',
-        'filters/mock_gpu_video_decoder_factories.h',
+        'filters/mock_gpu_video_accelerator_factories.cc',
+        'filters/mock_gpu_video_accelerator_factories.h',
         'video/mock_video_decode_accelerator.cc',
         'video/mock_video_decode_accelerator.h',
       ],
     },
   ],
   'conditions': [
     ['OS!="ios" and target_arch!="arm"', {
       'targets': [
        {
           'target_name': 'media_asm',
@@ skipping 502 matching lines @@
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
       ],
     }],
   ],
 }