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

Side by Side Diff: media/media.gyp

Issue 816353010: Implemented HEVC video demuxing and parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT Created 5 years, 7 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
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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 'filters/ffmpeg_aac_bitstream_converter.h', 637 'filters/ffmpeg_aac_bitstream_converter.h',
638 'filters/ffmpeg_audio_decoder.cc', 638 'filters/ffmpeg_audio_decoder.cc',
639 'filters/ffmpeg_audio_decoder.h', 639 'filters/ffmpeg_audio_decoder.h',
640 'filters/ffmpeg_bitstream_converter.h', 640 'filters/ffmpeg_bitstream_converter.h',
641 'filters/ffmpeg_demuxer.cc', 641 'filters/ffmpeg_demuxer.cc',
642 'filters/ffmpeg_demuxer.h', 642 'filters/ffmpeg_demuxer.h',
643 'filters/ffmpeg_glue.cc', 643 'filters/ffmpeg_glue.cc',
644 'filters/ffmpeg_glue.h', 644 'filters/ffmpeg_glue.h',
645 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 645 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
646 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 646 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
647 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
ddorwin 2015/06/12 00:52:27 Should we block these on a separate hevc variable
servolk 2015/06/12 21:57:31 We had a separate lengthy discussion with rsleevi@
ddorwin 2015/06/19 21:40:14 They didn't want *global* GYP flags. What I'm prop
648 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
647 'filters/ffmpeg_video_decoder.cc', 649 'filters/ffmpeg_video_decoder.cc',
648 'filters/ffmpeg_video_decoder.h', 650 'filters/ffmpeg_video_decoder.h',
649 'filters/in_memory_url_protocol.cc', 651 'filters/in_memory_url_protocol.cc',
650 'filters/in_memory_url_protocol.h', 652 'filters/in_memory_url_protocol.h',
651 ], 653 ],
652 'defines': [ 654 'defines': [
653 'MEDIA_DISABLE_FFMPEG', 655 'MEDIA_DISABLE_FFMPEG',
654 ], 656 ],
655 'direct_dependent_settings': { 657 'direct_dependent_settings': {
656 'defines': [ 658 'defines': [
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 'msvs_disabled_warnings': [ 4267, ], 980 'msvs_disabled_warnings': [ 4267, ],
979 }], 981 }],
980 ], 982 ],
981 }], 983 }],
982 ['proprietary_codecs==1', { 984 ['proprietary_codecs==1', {
983 'sources': [ 985 'sources': [
984 'filters/ffmpeg_aac_bitstream_converter.cc', 986 'filters/ffmpeg_aac_bitstream_converter.cc',
985 'filters/ffmpeg_aac_bitstream_converter.h', 987 'filters/ffmpeg_aac_bitstream_converter.h',
986 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 988 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
987 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 989 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
990 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
991 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
988 'filters/h264_to_annex_b_bitstream_converter.cc', 992 'filters/h264_to_annex_b_bitstream_converter.cc',
989 'filters/h264_to_annex_b_bitstream_converter.h', 993 'filters/h264_to_annex_b_bitstream_converter.h',
994 'filters/h265_parser.cc',
995 'filters/h265_parser.h',
990 'formats/mp2t/es_adapter_video.cc', 996 'formats/mp2t/es_adapter_video.cc',
991 'formats/mp2t/es_adapter_video.h', 997 'formats/mp2t/es_adapter_video.h',
992 'formats/mp2t/es_parser.cc', 998 'formats/mp2t/es_parser.cc',
993 'formats/mp2t/es_parser.h', 999 'formats/mp2t/es_parser.h',
994 'formats/mp2t/es_parser_adts.cc', 1000 'formats/mp2t/es_parser_adts.cc',
995 'formats/mp2t/es_parser_adts.h', 1001 'formats/mp2t/es_parser_adts.h',
996 'formats/mp2t/es_parser_h264.cc', 1002 'formats/mp2t/es_parser_h264.cc',
997 'formats/mp2t/es_parser_h264.h', 1003 'formats/mp2t/es_parser_h264.h',
998 'formats/mp2t/es_parser_mpeg1audio.cc', 1004 'formats/mp2t/es_parser_mpeg1audio.cc',
999 'formats/mp2t/es_parser_mpeg1audio.h', 1005 'formats/mp2t/es_parser_mpeg1audio.h',
(...skipping 18 matching lines...) Expand all
1018 'formats/mp4/avc.cc', 1024 'formats/mp4/avc.cc',
1019 'formats/mp4/avc.h', 1025 'formats/mp4/avc.h',
1020 'formats/mp4/box_definitions.cc', 1026 'formats/mp4/box_definitions.cc',
1021 'formats/mp4/box_definitions.h', 1027 'formats/mp4/box_definitions.h',
1022 'formats/mp4/box_reader.cc', 1028 'formats/mp4/box_reader.cc',
1023 'formats/mp4/box_reader.h', 1029 'formats/mp4/box_reader.h',
1024 'formats/mp4/cenc.cc', 1030 'formats/mp4/cenc.cc',
1025 'formats/mp4/cenc.h', 1031 'formats/mp4/cenc.h',
1026 'formats/mp4/es_descriptor.cc', 1032 'formats/mp4/es_descriptor.cc',
1027 'formats/mp4/es_descriptor.h', 1033 'formats/mp4/es_descriptor.h',
1034 'formats/mp4/hevc.cc',
1035 'formats/mp4/hevc.h',
1028 'formats/mp4/mp4_stream_parser.cc', 1036 'formats/mp4/mp4_stream_parser.cc',
1029 'formats/mp4/mp4_stream_parser.h', 1037 'formats/mp4/mp4_stream_parser.h',
1030 'formats/mp4/sample_to_group_iterator.cc', 1038 'formats/mp4/sample_to_group_iterator.cc',
1031 'formats/mp4/sample_to_group_iterator.h', 1039 'formats/mp4/sample_to_group_iterator.h',
1032 'formats/mp4/track_run_iterator.cc', 1040 'formats/mp4/track_run_iterator.cc',
1033 'formats/mp4/track_run_iterator.h', 1041 'formats/mp4/track_run_iterator.h',
1034 'formats/mpeg/adts_constants.cc', 1042 'formats/mpeg/adts_constants.cc',
1035 'formats/mpeg/adts_constants.h', 1043 'formats/mpeg/adts_constants.h',
1036 'formats/mpeg/adts_stream_parser.cc', 1044 'formats/mpeg/adts_stream_parser.cc',
1037 'formats/mpeg/adts_stream_parser.h', 1045 'formats/mpeg/adts_stream_parser.h',
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1225 'include_dirs': [ 1233 'include_dirs': [
1226 # Needed by media_drm_bridge.cc. 1234 # Needed by media_drm_bridge.cc.
1227 '<(SHARED_INTERMEDIATE_DIR)', 1235 '<(SHARED_INTERMEDIATE_DIR)',
1228 ], 1236 ],
1229 'conditions': [ 1237 'conditions': [
1230 ['arm_neon==1', { 1238 ['arm_neon==1', {
1231 'defines': [ 1239 'defines': [
1232 'USE_NEON' 1240 'USE_NEON'
1233 ], 1241 ],
1234 }], 1242 }],
1243 ['proprietary_codecs==1', {
1244 'sources': [
1245 'filters/h265_parser_unittest.cc',
1246 ],
1247 }],
1235 ['media_use_ffmpeg==1', { 1248 ['media_use_ffmpeg==1', {
1236 'dependencies': [ 1249 'dependencies': [
1237 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1250 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1238 ], 1251 ],
1239 }, { # media_use_ffmpeg== 0 1252 }, { # media_use_ffmpeg== 0
1240 'sources!': [ 1253 'sources!': [
1241 'base/audio_video_metadata_extractor_unittest.cc', 1254 'base/audio_video_metadata_extractor_unittest.cc',
1242 'base/container_names_unittest.cc', 1255 'base/container_names_unittest.cc',
1243 'base/media_file_checker_unittest.cc', 1256 'base/media_file_checker_unittest.cc',
1244 'ffmpeg/ffmpeg_common_unittest.cc', 1257 'ffmpeg/ffmpeg_common_unittest.cc',
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 '../build/isolate.gypi', 1975 '../build/isolate.gypi',
1963 ], 1976 ],
1964 'sources': [ 1977 'sources': [
1965 'audio_unittests.isolate', 1978 'audio_unittests.isolate',
1966 ], 1979 ],
1967 }, 1980 },
1968 ], 1981 ],
1969 }], 1982 }],
1970 ], 1983 ],
1971 } 1984 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698