Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1038)

Side by Side Diff: media/media.gyp

Issue 153103003: Move offset_byte_queue.* from media/mp4 to media/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/formats/mp4/offset_byte_queue_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 'video/capture/win/video_capture_device_mf_win.cc', 472 'video/capture/win/video_capture_device_mf_win.cc',
473 'video/capture/win/video_capture_device_mf_win.h', 473 'video/capture/win/video_capture_device_mf_win.h',
474 'video/capture/win/video_capture_device_win.cc', 474 'video/capture/win/video_capture_device_win.cc',
475 'video/capture/win/video_capture_device_win.h', 475 'video/capture/win/video_capture_device_win.h',
476 'video/picture.cc', 476 'video/picture.cc',
477 'video/picture.h', 477 'video/picture.h',
478 'video/video_decode_accelerator.cc', 478 'video/video_decode_accelerator.cc',
479 'video/video_decode_accelerator.h', 479 'video/video_decode_accelerator.h',
480 'video/video_encode_accelerator.cc', 480 'video/video_encode_accelerator.cc',
481 'video/video_encode_accelerator.h', 481 'video/video_encode_accelerator.h',
482 'formats/common/offset_byte_queue.cc',
483 'formats/common/offset_byte_queue.h',
482 'formats/webm/webm_audio_client.cc', 484 'formats/webm/webm_audio_client.cc',
483 'formats/webm/webm_audio_client.h', 485 'formats/webm/webm_audio_client.h',
484 'formats/webm/webm_cluster_parser.cc', 486 'formats/webm/webm_cluster_parser.cc',
485 'formats/webm/webm_cluster_parser.h', 487 'formats/webm/webm_cluster_parser.h',
486 'formats/webm/webm_constants.cc', 488 'formats/webm/webm_constants.cc',
487 'formats/webm/webm_constants.h', 489 'formats/webm/webm_constants.h',
488 'formats/webm/webm_content_encodings.cc', 490 'formats/webm/webm_content_encodings.cc',
489 'formats/webm/webm_content_encodings.h', 491 'formats/webm/webm_content_encodings.h',
490 'formats/webm/webm_content_encodings_client.cc', 492 'formats/webm/webm_content_encodings_client.cc',
491 'formats/webm/webm_content_encodings_client.h', 493 'formats/webm/webm_content_encodings_client.h',
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 'formats/mp4/box_definitions.cc', 856 'formats/mp4/box_definitions.cc',
855 'formats/mp4/box_definitions.h', 857 'formats/mp4/box_definitions.h',
856 'formats/mp4/box_reader.cc', 858 'formats/mp4/box_reader.cc',
857 'formats/mp4/box_reader.h', 859 'formats/mp4/box_reader.h',
858 'formats/mp4/cenc.cc', 860 'formats/mp4/cenc.cc',
859 'formats/mp4/cenc.h', 861 'formats/mp4/cenc.h',
860 'formats/mp4/es_descriptor.cc', 862 'formats/mp4/es_descriptor.cc',
861 'formats/mp4/es_descriptor.h', 863 'formats/mp4/es_descriptor.h',
862 'formats/mp4/mp4_stream_parser.cc', 864 'formats/mp4/mp4_stream_parser.cc',
863 'formats/mp4/mp4_stream_parser.h', 865 'formats/mp4/mp4_stream_parser.h',
864 'formats/mp4/offset_byte_queue.cc',
865 'formats/mp4/offset_byte_queue.h',
866 'formats/mp4/track_run_iterator.cc', 866 'formats/mp4/track_run_iterator.cc',
867 'formats/mp4/track_run_iterator.h', 867 'formats/mp4/track_run_iterator.h',
868 ], 868 ],
869 }], 869 }],
870 ['toolkit_uses_gtk==1', { 870 ['toolkit_uses_gtk==1', {
871 'dependencies': [ 871 'dependencies': [
872 '../build/linux/system.gyp:gtk', 872 '../build/linux/system.gyp:gtk',
873 ], 873 ],
874 }], 874 }],
875 ['target_arch=="ia32" or target_arch=="x64"', { 875 ['target_arch=="ia32" or target_arch=="x64"', {
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 'filters/source_buffer_stream_unittest.cc', 1019 'filters/source_buffer_stream_unittest.cc',
1020 'filters/video_decoder_selector_unittest.cc', 1020 'filters/video_decoder_selector_unittest.cc',
1021 'filters/video_frame_stream_unittest.cc', 1021 'filters/video_frame_stream_unittest.cc',
1022 'filters/video_renderer_impl_unittest.cc', 1022 'filters/video_renderer_impl_unittest.cc',
1023 'midi/midi_message_queue_unittest.cc', 1023 'midi/midi_message_queue_unittest.cc',
1024 'midi/midi_message_util_unittest.cc', 1024 'midi/midi_message_util_unittest.cc',
1025 'midi/usb_midi_descriptor_parser_unittest.cc', 1025 'midi/usb_midi_descriptor_parser_unittest.cc',
1026 'midi/usb_midi_input_stream_unittest.cc', 1026 'midi/usb_midi_input_stream_unittest.cc',
1027 'midi/usb_midi_output_stream_unittest.cc', 1027 'midi/usb_midi_output_stream_unittest.cc',
1028 'video/capture/video_capture_device_unittest.cc', 1028 'video/capture/video_capture_device_unittest.cc',
1029 'formats/common/offset_byte_queue_unittest.cc',
1029 'formats/webm/cluster_builder.cc', 1030 'formats/webm/cluster_builder.cc',
1030 'formats/webm/cluster_builder.h', 1031 'formats/webm/cluster_builder.h',
1031 'formats/webm/tracks_builder.cc', 1032 'formats/webm/tracks_builder.cc',
1032 'formats/webm/tracks_builder.h', 1033 'formats/webm/tracks_builder.h',
1033 'formats/webm/webm_cluster_parser_unittest.cc', 1034 'formats/webm/webm_cluster_parser_unittest.cc',
1034 'formats/webm/webm_content_encodings_client_unittest.cc', 1035 'formats/webm/webm_content_encodings_client_unittest.cc',
1035 'formats/webm/webm_parser_unittest.cc', 1036 'formats/webm/webm_parser_unittest.cc',
1036 'formats/webm/webm_tracks_parser_unittest.cc', 1037 'formats/webm/webm_tracks_parser_unittest.cc',
1037 'formats/webm/webm_webvtt_parser_unittest.cc', 1038 'formats/webm/webm_webvtt_parser_unittest.cc',
1038 ], 1039 ],
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 }], 1122 }],
1122 ['proprietary_codecs==1', { 1123 ['proprietary_codecs==1', {
1123 'sources': [ 1124 'sources': [
1124 'formats/mp2t/mp2t_stream_parser_unittest.cc', 1125 'formats/mp2t/mp2t_stream_parser_unittest.cc',
1125 'formats/mp3/mp3_stream_parser_unittest.cc', 1126 'formats/mp3/mp3_stream_parser_unittest.cc',
1126 'formats/mp4/aac_unittest.cc', 1127 'formats/mp4/aac_unittest.cc',
1127 'formats/mp4/avc_unittest.cc', 1128 'formats/mp4/avc_unittest.cc',
1128 'formats/mp4/box_reader_unittest.cc', 1129 'formats/mp4/box_reader_unittest.cc',
1129 'formats/mp4/es_descriptor_unittest.cc', 1130 'formats/mp4/es_descriptor_unittest.cc',
1130 'formats/mp4/mp4_stream_parser_unittest.cc', 1131 'formats/mp4/mp4_stream_parser_unittest.cc',
1131 'formats/mp4/offset_byte_queue_unittest.cc',
1132 'formats/mp4/track_run_iterator_unittest.cc', 1132 'formats/mp4/track_run_iterator_unittest.cc',
1133 ], 1133 ],
1134 }], 1134 }],
1135 # TODO(wolenetz): Fix size_t to int truncations in win64. See 1135 # TODO(wolenetz): Fix size_t to int truncations in win64. See
1136 # http://crbug.com/171009 1136 # http://crbug.com/171009
1137 ['OS=="win" and target_arch=="x64"', { 1137 ['OS=="win" and target_arch=="x64"', {
1138 'msvs_disabled_warnings': [ 4267, ], 1138 'msvs_disabled_warnings': [ 4267, ],
1139 }], 1139 }],
1140 ], 1140 ],
1141 }, 1141 },
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 ], 1661 ],
1662 }], 1662 }],
1663 ], 1663 ],
1664 }], 1664 }],
1665 ], 1665 ],
1666 }, 1666 },
1667 ], 1667 ],
1668 }], 1668 }],
1669 ], 1669 ],
1670 } 1670 }
OLDNEW
« no previous file with comments | « media/formats/mp4/offset_byte_queue_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698