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

Side by Side Diff: media/media.gyp

Issue 2172703002: Revert of H264 HW encode using MediaFoundation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/gpu/video_encode_accelerator_unittest.cc ('k') | media/media_gpu.gypi » ('j') | 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 1705 matching lines...) Expand 10 before | Expand all | Expand 10 after
1716 }], 1716 }],
1717 ['OS=="win"', { 1717 ['OS=="win"', {
1718 'targets': [ 1718 'targets': [
1719 { 1719 {
1720 # GN version: //media/base/win 1720 # GN version: //media/base/win
1721 'target_name': 'mf_initializer', 1721 'target_name': 'mf_initializer',
1722 'type': '<(component)', 1722 'type': '<(component)',
1723 'include_dirs': [ '..', ], 1723 'include_dirs': [ '..', ],
1724 'defines': [ 'MF_INITIALIZER_IMPLEMENTATION', ], 1724 'defines': [ 'MF_INITIALIZER_IMPLEMENTATION', ],
1725 'sources': [ 1725 'sources': [
1726 'base/win/mf_helpers.cc',
1727 'base/win/mf_helpers.h',
1728 'base/win/mf_initializer_export.h', 1726 'base/win/mf_initializer_export.h',
1729 'base/win/mf_initializer.cc', 1727 'base/win/mf_initializer.cc',
1730 'base/win/mf_initializer.h', 1728 'base/win/mf_initializer.h',
1731 ], 1729 ],
1732 'dependencies': [ 1730 'dependencies': [
1733 '../base/base.gyp:base', 1731 '../base/base.gyp:base',
1734 ], 1732 ],
1735 'link_settings': { 1733 'link_settings': {
1736 'libraries': [ 1734 'libraries': [
1737 '-ldxguid.lib', 1735 '-ldxguid.lib',
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
2111 'sources': [ 2109 'sources': [
2112 'gpu/jpeg_decode_accelerator_unittest.cc', 2110 'gpu/jpeg_decode_accelerator_unittest.cc',
2113 ], 2111 ],
2114 'include_dirs': [ 2112 'include_dirs': [
2115 '<(DEPTH)/third_party/libva', 2113 '<(DEPTH)/third_party/libva',
2116 '<(DEPTH)/third_party/libyuv', 2114 '<(DEPTH)/third_party/libyuv',
2117 ], 2115 ],
2118 } 2116 }
2119 ] 2117 ]
2120 }], 2118 }],
2121 ['chromeos==1 or OS=="mac" or OS=="win"', { 2119 ['chromeos==1 or OS=="mac"', {
2122 'targets': [ 2120 'targets': [
2123 { 2121 {
2124 'target_name': 'video_encode_accelerator_unittest', 2122 'target_name': 'video_encode_accelerator_unittest',
2125 'type': 'executable', 2123 'type': 'executable',
2126 'dependencies': [ 2124 'dependencies': [
2127 '../base/base.gyp:base', 2125 '../base/base.gyp:base',
2128 '../media/media.gyp:media', 2126 '../media/media.gyp:media',
2129 '../media/media.gyp:media_gpu', 2127 '../media/media.gyp:media_gpu',
2130 '../media/media.gyp:media_test_support', 2128 '../media/media.gyp:media_test_support',
2131 '../testing/gtest.gyp:gtest', 2129 '../testing/gtest.gyp:gtest',
(...skipping 11 matching lines...) Expand all
2143 'include_dirs': [ 2141 'include_dirs': [
2144 '<(DEPTH)/third_party/libva', 2142 '<(DEPTH)/third_party/libva',
2145 '<(DEPTH)/third_party/libyuv', 2143 '<(DEPTH)/third_party/libyuv',
2146 ], 2144 ],
2147 'conditions': [ 2145 'conditions': [
2148 ['OS=="mac"', { 2146 ['OS=="mac"', {
2149 'dependencies': [ 2147 'dependencies': [
2150 '../third_party/webrtc/common_video/common_video.gyp:common_vide o', 2148 '../third_party/webrtc/common_video/common_video.gyp:common_vide o',
2151 ], 2149 ],
2152 }], 2150 }],
2153 ['OS=="win"', {
2154 'dependencies': [
2155 '../media/media.gyp:mf_initializer',
2156 ],
2157 }],
2158 ['use_x11==1', { 2151 ['use_x11==1', {
2159 'dependencies': [ 2152 'dependencies': [
2160 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 2153 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
2161 ], 2154 ],
2162 }], 2155 }],
2163 ['use_ozone==1', { 2156 ['use_ozone==1', {
2164 'dependencies': [ 2157 'dependencies': [
2165 '../ui/ozone/ozone.gyp:ozone', 2158 '../ui/ozone/ozone.gyp:ozone',
2166 ], 2159 ],
2167 }], 2160 }],
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2290 'dependencies': [ 2283 'dependencies': [
2291 '../build/linux/system.gyp:libdrm', 2284 '../build/linux/system.gyp:libdrm',
2292 ] 2285 ]
2293 }], 2286 }],
2294 ], 2287 ],
2295 } 2288 }
2296 ] 2289 ]
2297 }], 2290 }],
2298 ], 2291 ],
2299 } 2292 }
OLDNEW
« no previous file with comments | « media/gpu/video_encode_accelerator_unittest.cc ('k') | media/media_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698