From 278df3052aa195ee1a865e470877ece21edce2ec Mon Sep 17 00:00:00 2001
From: "dalecurtis@chromium.org"
<dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 23 Jan 2014 03:40:36 +0000
Subject: Move MSE parsers under "formats" root directory.
Changes made programatically:
find -name \*.cc -o -name \*.h | xargs sed -r -i 's,media/(mp2t|mp3|mp4|webm)/,media/formats/\1/,g'
find -name \*.cc -o -name \*.h | xargs sed -r -i 's,MEDIA_(MP2T|MP3|MP4|WEBM)_,MEDIA_FORMATS_\1_,g'
find -name \*.gyp | xargs sed -r -i "s,'(mp2t|mp3|mp4|webm)/,'formats/\1/,g"
BUG=none
TEST=compiles
Review URL: https://codereview.chromium.org/136053003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246512 0039d316-1c4b-4281-b951-d872f2087c98
---
media/media.gyp | 170 ++++++++++++++++++++++++++++----------------------------
1 file changed, 85 insertions(+), 85 deletions(-)
(limited to 'media/media.gyp')
diff --git a/media/media.gyp b/media/media.gyp
index 373e8af..76d11af 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -479,30 +479,30 @@
'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',
- 'webm/webm_crypto_helpers.cc',
- 'webm/webm_crypto_helpers.h',
- 'webm/webm_info_parser.cc',
- 'webm/webm_info_parser.h',
- 'webm/webm_parser.cc',
- 'webm/webm_parser.h',
- 'webm/webm_stream_parser.cc',
- 'webm/webm_stream_parser.h',
- 'webm/webm_tracks_parser.cc',
- 'webm/webm_tracks_parser.h',
- 'webm/webm_video_client.cc',
- 'webm/webm_video_client.h',
- 'webm/webm_webvtt_parser.cc',
- 'webm/webm_webvtt_parser.h'
+ 'formats/webm/webm_audio_client.cc',
+ 'formats/webm/webm_audio_client.h',
+ 'formats/webm/webm_cluster_parser.cc',
+ 'formats/webm/webm_cluster_parser.h',
+ 'formats/webm/webm_constants.cc',
+ 'formats/webm/webm_constants.h',
+ 'formats/webm/webm_content_encodings.cc',
+ 'formats/webm/webm_content_encodings.h',
+ 'formats/webm/webm_content_encodings_client.cc',
+ 'formats/webm/webm_content_encodings_client.h',
+ 'formats/webm/webm_crypto_helpers.cc',
+ 'formats/webm/webm_crypto_helpers.h',
+ 'formats/webm/webm_info_parser.cc',
+ 'formats/webm/webm_info_parser.h',
+ 'formats/webm/webm_parser.cc',
+ 'formats/webm/webm_parser.h',
+ 'formats/webm/webm_stream_parser.cc',
+ 'formats/webm/webm_stream_parser.h',
+ 'formats/webm/webm_tracks_parser.cc',
+ 'formats/webm/webm_tracks_parser.h',
+ 'formats/webm/webm_video_client.cc',
+ 'formats/webm/webm_video_client.h',
+ 'formats/webm/webm_webvtt_parser.cc',
+ 'formats/webm/webm_webvtt_parser.h'
],
'direct_dependent_settings': {
'include_dirs': [
@@ -596,10 +596,10 @@
'../third_party/libyuv/libyuv.gyp:libyuv',
],
'sources': [
- 'webm/chromeos/ebml_writer.cc',
- 'webm/chromeos/ebml_writer.h',
- 'webm/chromeos/webm_encoder.cc',
- 'webm/chromeos/webm_encoder.h',
+ 'formats/webm/chromeos/ebml_writer.cc',
+ 'formats/webm/chromeos/ebml_writer.h',
+ 'formats/webm/chromeos/webm_encoder.cc',
+ 'formats/webm/chromeos/webm_encoder.h',
],
}],
['use_alsa==1', {
@@ -826,45 +826,45 @@
}],
['proprietary_codecs==1', {
'sources': [
- 'mp2t/es_parser.h',
- 'mp2t/es_parser_adts.cc',
- 'mp2t/es_parser_adts.h',
- 'mp2t/es_parser_h264.cc',
- 'mp2t/es_parser_h264.h',
- 'mp2t/mp2t_common.h',
- 'mp2t/mp2t_stream_parser.cc',
- 'mp2t/mp2t_stream_parser.h',
- 'mp2t/ts_packet.cc',
- 'mp2t/ts_packet.h',
- 'mp2t/ts_section.h',
- 'mp2t/ts_section_pat.cc',
- 'mp2t/ts_section_pat.h',
- 'mp2t/ts_section_pes.cc',
- 'mp2t/ts_section_pes.h',
- 'mp2t/ts_section_pmt.cc',
- 'mp2t/ts_section_pmt.h',
- 'mp2t/ts_section_psi.cc',
- 'mp2t/ts_section_psi.h',
- 'mp3/mp3_stream_parser.cc',
- 'mp3/mp3_stream_parser.h',
- 'mp4/aac.cc',
- 'mp4/aac.h',
- 'mp4/avc.cc',
- 'mp4/avc.h',
- 'mp4/box_definitions.cc',
- 'mp4/box_definitions.h',
- 'mp4/box_reader.cc',
- 'mp4/box_reader.h',
- 'mp4/cenc.cc',
- 'mp4/cenc.h',
- 'mp4/es_descriptor.cc',
- 'mp4/es_descriptor.h',
- 'mp4/mp4_stream_parser.cc',
- 'mp4/mp4_stream_parser.h',
- 'mp4/offset_byte_queue.cc',
- 'mp4/offset_byte_queue.h',
- 'mp4/track_run_iterator.cc',
- 'mp4/track_run_iterator.h',
+ 'formats/mp2t/es_parser.h',
+ 'formats/mp2t/es_parser_adts.cc',
+ 'formats/mp2t/es_parser_adts.h',
+ 'formats/mp2t/es_parser_h264.cc',
+ 'formats/mp2t/es_parser_h264.h',
+ 'formats/mp2t/mp2t_common.h',
+ 'formats/mp2t/mp2t_stream_parser.cc',
+ 'formats/mp2t/mp2t_stream_parser.h',
+ 'formats/mp2t/ts_packet.cc',
+ 'formats/mp2t/ts_packet.h',
+ 'formats/mp2t/ts_section.h',
+ 'formats/mp2t/ts_section_pat.cc',
+ 'formats/mp2t/ts_section_pat.h',
+ 'formats/mp2t/ts_section_pes.cc',
+ 'formats/mp2t/ts_section_pes.h',
+ 'formats/mp2t/ts_section_pmt.cc',
+ 'formats/mp2t/ts_section_pmt.h',
+ 'formats/mp2t/ts_section_psi.cc',
+ 'formats/mp2t/ts_section_psi.h',
+ 'formats/mp3/mp3_stream_parser.cc',
+ 'formats/mp3/mp3_stream_parser.h',
+ 'formats/mp4/aac.cc',
+ 'formats/mp4/aac.h',
+ 'formats/mp4/avc.cc',
+ 'formats/mp4/avc.h',
+ 'formats/mp4/box_definitions.cc',
+ 'formats/mp4/box_definitions.h',
+ 'formats/mp4/box_reader.cc',
+ 'formats/mp4/box_reader.h',
+ 'formats/mp4/cenc.cc',
+ 'formats/mp4/cenc.h',
+ 'formats/mp4/es_descriptor.cc',
+ 'formats/mp4/es_descriptor.h',
+ 'formats/mp4/mp4_stream_parser.cc',
+ 'formats/mp4/mp4_stream_parser.h',
+ 'formats/mp4/offset_byte_queue.cc',
+ 'formats/mp4/offset_byte_queue.h',
+ 'formats/mp4/track_run_iterator.cc',
+ 'formats/mp4/track_run_iterator.h',
],
}],
['toolkit_uses_gtk==1', {
@@ -1026,15 +1026,15 @@
'midi/usb_midi_input_stream_unittest.cc',
'midi/usb_midi_output_stream_unittest.cc',
'video/capture/video_capture_device_unittest.cc',
- 'webm/cluster_builder.cc',
- 'webm/cluster_builder.h',
- 'webm/tracks_builder.cc',
- 'webm/tracks_builder.h',
- 'webm/webm_cluster_parser_unittest.cc',
- 'webm/webm_content_encodings_client_unittest.cc',
- 'webm/webm_parser_unittest.cc',
- 'webm/webm_tracks_parser_unittest.cc',
- 'webm/webm_webvtt_parser_unittest.cc',
+ 'formats/webm/cluster_builder.cc',
+ 'formats/webm/cluster_builder.h',
+ 'formats/webm/tracks_builder.cc',
+ 'formats/webm/tracks_builder.h',
+ 'formats/webm/webm_cluster_parser_unittest.cc',
+ 'formats/webm/webm_content_encodings_client_unittest.cc',
+ 'formats/webm/webm_parser_unittest.cc',
+ 'formats/webm/webm_tracks_parser_unittest.cc',
+ 'formats/webm/webm_webvtt_parser_unittest.cc',
],
'conditions': [
['arm_neon==1', {
@@ -1121,15 +1121,15 @@
}],
['proprietary_codecs==1', {
'sources': [
- 'mp2t/mp2t_stream_parser_unittest.cc',
- 'mp3/mp3_stream_parser_unittest.cc',
- 'mp4/aac_unittest.cc',
- 'mp4/avc_unittest.cc',
- 'mp4/box_reader_unittest.cc',
- 'mp4/es_descriptor_unittest.cc',
- 'mp4/mp4_stream_parser_unittest.cc',
- 'mp4/offset_byte_queue_unittest.cc',
- 'mp4/track_run_iterator_unittest.cc',
+ 'formats/mp2t/mp2t_stream_parser_unittest.cc',
+ 'formats/mp3/mp3_stream_parser_unittest.cc',
+ 'formats/mp4/aac_unittest.cc',
+ 'formats/mp4/avc_unittest.cc',
+ 'formats/mp4/box_reader_unittest.cc',
+ 'formats/mp4/es_descriptor_unittest.cc',
+ 'formats/mp4/mp4_stream_parser_unittest.cc',
+ 'formats/mp4/offset_byte_queue_unittest.cc',
+ 'formats/mp4/track_run_iterator_unittest.cc',
],
}],
# TODO(wolenetz): Fix size_t to int truncations in win64. See
--
cgit v1.1