diff options
| author | mcasas <mcasas@chromium.org> | 2016-02-18 12:11:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-18 20:12:55 +0000 |
| commit | 7db2a519b8121924ae9b86599e493a0fd68ad4ea (patch) | |
| tree | 6f72bca7136e63ab3329c2f64aa788af29b91fd5 /media/media.gyp | |
| parent | 724f2baac94ce55ea4d38f5f7efe067bc86590df (diff) | |
| download | chromium_src-7db2a519b8121924ae9b86599e493a0fd68ad4ea.zip chromium_src-7db2a519b8121924ae9b86599e493a0fd68ad4ea.tar.gz chromium_src-7db2a519b8121924ae9b86599e493a0fd68ad4ea.tar.bz2 | |
Move media/capture/webm_muxer* to media/muxers
WebmMuxer is used to multiplex incoming encoded video
and audio into a webm live stream. It is only used from
content's MediaRecorderHandler.
This CL moves WebmMuxer to media/muxers where it
belongs, since it has nothing to do with capture/; that is
made even more relevant in a parallel CL
(http://crrev.com/1699553002) that isolates the said
media/capture.
This CL doesn't modify code (except a minor style
reformatting caught by the presubmit). Narrowed some
DEPS too.
BUG=584797
Review URL: https://codereview.chromium.org/1710713002
Cr-Commit-Position: refs/heads/master@{#376243}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/media.gyp b/media/media.gyp index de4de9d..638f9e8 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -451,10 +451,10 @@ 'capture/content/feedback_signal_accumulator.h', 'capture/content/screen_capture_device_core.cc', 'capture/content/screen_capture_device_core.h', - 'capture/content/thread_safe_capture_oracle.cc', - 'capture/content/thread_safe_capture_oracle.h', 'capture/content/smooth_event_sampler.cc', 'capture/content/smooth_event_sampler.h', + 'capture/content/thread_safe_capture_oracle.cc', + 'capture/content/thread_safe_capture_oracle.h', 'capture/content/video_capture_oracle.cc', 'capture/content/video_capture_oracle.h', 'capture/video/android/video_capture_device_android.cc', @@ -511,8 +511,6 @@ 'capture/video/win/video_capture_device_mf_win.h', 'capture/video/win/video_capture_device_win.cc', 'capture/video/win/video_capture_device_win.h', - 'capture/webm_muxer.cc', - 'capture/webm_muxer.h', 'cdm/aes_decryptor.cc', 'cdm/aes_decryptor.h', 'cdm/cdm_adapter.cc', @@ -580,10 +578,10 @@ 'filters/h264_bit_reader.h', 'filters/h264_parser.cc', 'filters/h264_parser.h', - 'filters/ivf_parser.cc', - 'filters/ivf_parser.h', 'filters/in_memory_url_protocol.cc', 'filters/in_memory_url_protocol.h', + 'filters/ivf_parser.cc', + 'filters/ivf_parser.h', 'filters/jpeg_parser.cc', 'filters/jpeg_parser.h', 'filters/media_source_state.cc', @@ -640,6 +638,8 @@ 'formats/webm/webm_video_client.cc', 'formats/webm/webm_video_client.h', 'formats/webm/webm_webvtt_parser.cc', + 'muxers/webm_muxer.cc', + 'muxers/webm_muxer.h', 'ozone/media_ozone_platform.cc', 'ozone/media_ozone_platform.h', 'renderers/audio_renderer_impl.cc', @@ -1292,7 +1292,6 @@ 'capture/content/video_capture_oracle_unittest.cc', 'capture/video/fake_video_capture_device_unittest.cc', 'capture/video/video_capture_device_unittest.cc', - 'capture/webm_muxer_unittest.cc', 'cdm/aes_decryptor_unittest.cc', 'cdm/external_clear_key_test_helper.cc', 'cdm/external_clear_key_test_helper.h', @@ -1347,14 +1346,15 @@ 'formats/webm/webm_parser_unittest.cc', 'formats/webm/webm_tracks_parser_unittest.cc', 'formats/webm/webm_webvtt_parser_unittest.cc', + 'muxers/webm_muxer_unittest.cc', 'renderers/audio_renderer_impl_unittest.cc', 'renderers/renderer_impl_unittest.cc', 'renderers/skcanvas_video_renderer_unittest.cc', 'renderers/video_renderer_impl_unittest.cc', 'test/pipeline_integration_test.cc', 'test/pipeline_integration_test_base.cc', - 'video/h264_poc_unittest.cc', 'video/gpu_memory_buffer_video_frame_pool_unittest.cc', + 'video/h264_poc_unittest.cc', ], 'include_dirs': [ # Needed by media_drm_bridge.cc. |