| OLD | NEW | 
|---|
| 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 23 matching lines...) Expand all  Loading... | 
| 34         'use_low_memory_buffer%': 0, | 34         'use_low_memory_buffer%': 0, | 
| 35       }], | 35       }], | 
| 36       ['proprietary_codecs==1 and chromecast==1', { | 36       ['proprietary_codecs==1 and chromecast==1', { | 
| 37         # Enable AC3/EAC3 audio demuxing. Actual decoding must be provided by | 37         # Enable AC3/EAC3 audio demuxing. Actual decoding must be provided by | 
| 38         # the platform (or HDMI sink in Chromecast for audio pass-through case). | 38         # the platform (or HDMI sink in Chromecast for audio pass-through case). | 
| 39         'enable_ac3_eac3_audio_demuxing%': 1, | 39         'enable_ac3_eac3_audio_demuxing%': 1, | 
| 40         # Enable HEVC/H265 demuxing. Actual decoding must be provided by the | 40         # Enable HEVC/H265 demuxing. Actual decoding must be provided by the | 
| 41         # platform. | 41         # platform. | 
| 42         'enable_hevc_demuxing%': 1, | 42         'enable_hevc_demuxing%': 1, | 
| 43         'enable_mse_mpeg2ts_stream_parser%': 1, | 43         'enable_mse_mpeg2ts_stream_parser%': 1, | 
|  | 44         'enable_hls_sample_aes%': 1, | 
| 44       }, { | 45       }, { | 
| 45         'enable_ac3_eac3_audio_demuxing%': 0, | 46         'enable_ac3_eac3_audio_demuxing%': 0, | 
| 46         'enable_hevc_demuxing%': 0, | 47         'enable_hevc_demuxing%': 0, | 
| 47         'enable_mse_mpeg2ts_stream_parser%': 0, | 48         'enable_mse_mpeg2ts_stream_parser%': 0, | 
|  | 49         'enable_hls_sample_aes%': 0, | 
|  | 50       }], | 
|  | 51       ['proprietary_codecs==1 and is_cast_desktop_build==1', { | 
|  | 52         'enable_hls_sample_aes%': 1, | 
|  | 53       }, { | 
|  | 54         'enable_hls_sample_aes%': 0, | 
| 48       }], | 55       }], | 
| 49     ], | 56     ], | 
| 50   }, | 57   }, | 
| 51   'includes': [ | 58   'includes': [ | 
| 52     'capture.gypi', | 59     'capture.gypi', | 
| 53     'media_cdm.gypi', | 60     'media_cdm.gypi', | 
| 54     'media_variables.gypi', | 61     'media_variables.gypi', | 
| 55   ], | 62   ], | 
| 56   'targets': [ | 63   'targets': [ | 
| 57     { | 64     { | 
| 58       # GN version: //media:media_features | 65       # GN version: //media:media_features | 
| 59       'target_name': 'media_features', | 66       'target_name': 'media_features', | 
| 60       'includes': [ '../build/buildflag_header.gypi' ], | 67       'includes': [ '../build/buildflag_header.gypi' ], | 
| 61       'variables': { | 68       'variables': { | 
| 62         'buildflag_header_path': 'media/media_features.h', | 69         'buildflag_header_path': 'media/media_features.h', | 
| 63         'buildflag_flags': [ | 70         'buildflag_flags': [ | 
| 64           "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)", | 71           "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)", | 
| 65           "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)", | 72           "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)", | 
| 66           "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)"
      , | 73           "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)"
      , | 
|  | 74           "ENABLE_HLS_SAMPLE_AES=<(enable_hls_sample_aes)", | 
| 67         ], | 75         ], | 
| 68       }, | 76       }, | 
| 69     }, | 77     }, | 
| 70     { | 78     { | 
| 71       # GN version: //media | 79       # GN version: //media | 
| 72       'target_name': 'media', | 80       'target_name': 'media', | 
| 73       'type': '<(component)', | 81       'type': '<(component)', | 
| 74       'dependencies': [ | 82       'dependencies': [ | 
| 75         'media_features', | 83         'media_features', | 
| 76         '../base/base.gyp:base', | 84         '../base/base.gyp:base', | 
| (...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1041             'formats/mpeg/adts_stream_parser.cc', | 1049             'formats/mpeg/adts_stream_parser.cc', | 
| 1042             'formats/mpeg/adts_stream_parser.h', | 1050             'formats/mpeg/adts_stream_parser.h', | 
| 1043             'formats/mpeg/mpeg1_audio_stream_parser.cc', | 1051             'formats/mpeg/mpeg1_audio_stream_parser.cc', | 
| 1044             'formats/mpeg/mpeg1_audio_stream_parser.h', | 1052             'formats/mpeg/mpeg1_audio_stream_parser.h', | 
| 1045             'formats/mpeg/mpeg_audio_stream_parser_base.cc', | 1053             'formats/mpeg/mpeg_audio_stream_parser_base.cc', | 
| 1046             'formats/mpeg/mpeg_audio_stream_parser_base.h', | 1054             'formats/mpeg/mpeg_audio_stream_parser_base.h', | 
| 1047           ], | 1055           ], | 
| 1048         }], | 1056         }], | 
| 1049         ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', { | 1057         ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', { | 
| 1050           'sources': [ | 1058           'sources': [ | 
|  | 1059             'formats/mp2t/descriptors.cc', | 
|  | 1060             'formats/mp2t/descriptors.h', | 
| 1051             'formats/mp2t/es_adapter_video.cc', | 1061             'formats/mp2t/es_adapter_video.cc', | 
| 1052             'formats/mp2t/es_adapter_video.h', | 1062             'formats/mp2t/es_adapter_video.h', | 
| 1053             'formats/mp2t/es_parser.cc', | 1063             'formats/mp2t/es_parser.cc', | 
| 1054             'formats/mp2t/es_parser.h', | 1064             'formats/mp2t/es_parser.h', | 
| 1055             'formats/mp2t/es_parser_adts.cc', | 1065             'formats/mp2t/es_parser_adts.cc', | 
| 1056             'formats/mp2t/es_parser_adts.h', | 1066             'formats/mp2t/es_parser_adts.h', | 
| 1057             'formats/mp2t/es_parser_h264.cc', | 1067             'formats/mp2t/es_parser_h264.cc', | 
| 1058             'formats/mp2t/es_parser_h264.h', | 1068             'formats/mp2t/es_parser_h264.h', | 
| 1059             'formats/mp2t/es_parser_mpeg1audio.cc', | 1069             'formats/mp2t/es_parser_mpeg1audio.cc', | 
| 1060             'formats/mp2t/es_parser_mpeg1audio.h', | 1070             'formats/mp2t/es_parser_mpeg1audio.h', | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 1083             'formats/mp4/hevc.cc', | 1093             'formats/mp4/hevc.cc', | 
| 1084             'formats/mp4/hevc.h', | 1094             'formats/mp4/hevc.h', | 
| 1085           ], | 1095           ], | 
| 1086         }], | 1096         }], | 
| 1087         ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg
      ==1', { | 1097         ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg
      ==1', { | 
| 1088           'sources': [ | 1098           'sources': [ | 
| 1089             'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', | 1099             'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', | 
| 1090             'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', | 1100             'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', | 
| 1091           ], | 1101           ], | 
| 1092         }], | 1102         }], | 
|  | 1103         ['proprietary_codecs==1 and enable_hls_sample_aes==1', { | 
|  | 1104           'sources': [ | 
|  | 1105             'formats/mp2t/ts_section_cat.cc', | 
|  | 1106             'formats/mp2t/ts_section_cat.h', | 
|  | 1107             'formats/mp2t/ts_section_cets_ecm.cc', | 
|  | 1108             'formats/mp2t/ts_section_cets_ecm.h', | 
|  | 1109             'formats/mp2t/ts_section_cets_pssh.cc', | 
|  | 1110             'formats/mp2t/ts_section_cets_pssh.h', | 
|  | 1111           ], | 
|  | 1112         }], | 
| 1093         ['target_arch=="ia32" or target_arch=="x64"', { | 1113         ['target_arch=="ia32" or target_arch=="x64"', { | 
| 1094           'dependencies': [ | 1114           'dependencies': [ | 
| 1095             'media_asm', | 1115             'media_asm', | 
| 1096           ], | 1116           ], | 
| 1097           'sources': [ | 1117           'sources': [ | 
| 1098             'base/simd/convert_rgb_to_yuv_sse2.cc', | 1118             'base/simd/convert_rgb_to_yuv_sse2.cc', | 
| 1099             'base/simd/convert_rgb_to_yuv_ssse3.cc', | 1119             'base/simd/convert_rgb_to_yuv_ssse3.cc', | 
| 1100             'base/simd/convert_yuv_to_rgb_x86.cc', | 1120             'base/simd/convert_yuv_to_rgb_x86.cc', | 
| 1101             'base/simd/filter_yuv_sse2.cc', | 1121             'base/simd/filter_yuv_sse2.cc', | 
| 1102           ], | 1122           ], | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1145         'media_test_support', | 1165         'media_test_support', | 
| 1146         'shared_memory_support', | 1166         'shared_memory_support', | 
| 1147         '../base/base.gyp:base', | 1167         '../base/base.gyp:base', | 
| 1148         '../base/base.gyp:base_i18n', | 1168         '../base/base.gyp:base_i18n', | 
| 1149         '../base/base.gyp:test_support_base', | 1169         '../base/base.gyp:test_support_base', | 
| 1150         '../gpu/gpu.gyp:command_buffer_common', | 1170         '../gpu/gpu.gyp:command_buffer_common', | 
| 1151         '../gpu/gpu.gyp:gpu_unittest_utils', | 1171         '../gpu/gpu.gyp:gpu_unittest_utils', | 
| 1152         '../skia/skia.gyp:skia', | 1172         '../skia/skia.gyp:skia', | 
| 1153         '../testing/gmock.gyp:gmock', | 1173         '../testing/gmock.gyp:gmock', | 
| 1154         '../testing/gtest.gyp:gtest', | 1174         '../testing/gtest.gyp:gtest', | 
|  | 1175         '../third_party/boringssl/boringssl.gyp:boringssl', | 
| 1155         '../third_party/libwebm/libwebm.gyp:libwebm', | 1176         '../third_party/libwebm/libwebm.gyp:libwebm', | 
| 1156         '../third_party/libyuv/libyuv.gyp:libyuv', | 1177         '../third_party/libyuv/libyuv.gyp:libyuv', | 
| 1157         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', | 1178         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', | 
| 1158         '../ui/gfx/gfx.gyp:gfx', | 1179         '../ui/gfx/gfx.gyp:gfx', | 
| 1159         '../ui/gfx/gfx.gyp:gfx_geometry', | 1180         '../ui/gfx/gfx.gyp:gfx_geometry', | 
| 1160         '../ui/gfx/gfx.gyp:gfx_test_support', | 1181         '../ui/gfx/gfx.gyp:gfx_test_support', | 
| 1161         '../url/url.gyp:url_lib', | 1182         '../url/url.gyp:url_lib', | 
| 1162       ], | 1183       ], | 
| 1163       'sources': [ | 1184       'sources': [ | 
| 1164         '<@(capture_unittests_sources)', | 1185         '<@(capture_unittests_sources)', | 
| (...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2108               'dependencies': [ | 2129               'dependencies': [ | 
| 2109                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2130                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 
| 2110               ], | 2131               ], | 
| 2111             }], | 2132             }], | 
| 2112           ], | 2133           ], | 
| 2113         }, | 2134         }, | 
| 2114       ], | 2135       ], | 
| 2115     }], | 2136     }], | 
| 2116   ], | 2137   ], | 
| 2117 } | 2138 } | 
| OLD | NEW | 
|---|