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

media/media.gyp

Index: media/media.gyp
===================================================================
--- media/media.gyp	(revision 217687)
+++ media/media.gyp	(working copy)
@@ -153,10 +153,10 @@
         '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',
@@ -183,10 +183,10 @@
         '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',
@@ -217,19 +217,19 @@
         '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',
@@ -247,10 +247,10 @@
         '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',
@@ -348,10 +348,10 @@
         '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',
@@ -372,12 +372,12 @@
         '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',
@@ -416,6 +416,8 @@
         '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',
@@ -1125,8 +1127,8 @@
         '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',
       ],