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

Side by Side Diff: media/media_gpu.gypi

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/media.gyp ('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 { 1 {
2 'variables': { 2 'variables': {
3 'use_v4lplugin%': 0, 3 'use_v4lplugin%': 0,
4 'use_v4l2_codec%': 0, 4 'use_v4l2_codec%': 0,
5 }, 5 },
6 'defines': [ 6 'defines': [
7 'MEDIA_GPU_IMPLEMENTATION' 7 'MEDIA_GPU_IMPLEMENTATION'
8 ], 8 ],
9 'dependencies': [ 9 'dependencies': [
10 '../base/base.gyp:base', 10 '../base/base.gyp:base',
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 ], 318 ],
319 'process_outputs_as_sources': 1, 319 'process_outputs_as_sources': 1,
320 'message': 'Generating libva stubs for dynamic loading', 320 'message': 'Generating libva stubs for dynamic loading',
321 }, 321 },
322 ] 322 ]
323 }], 323 }],
324 ['OS=="win"', { 324 ['OS=="win"', {
325 'dependencies': [ 325 'dependencies': [
326 '../media/media.gyp:media', 326 '../media/media.gyp:media',
327 '../media/media.gyp:mf_initializer', 327 '../media/media.gyp:mf_initializer',
328 '../third_party/libyuv/libyuv.gyp:libyuv',
329 '../ui/gl/gl.gyp:gl', 328 '../ui/gl/gl.gyp:gl',
330 '../ui/gl/init/gl_init.gyp:gl_init', 329 '../ui/gl/init/gl_init.gyp:gl_init',
331 ], 330 ],
332 'link_settings': { 331 'link_settings': {
333 'libraries': [ 332 'libraries': [
334 '-ld3d9.lib', 333 '-ld3d9.lib',
335 '-ld3d11.lib', 334 '-ld3d11.lib',
336 '-ldxva2.lib', 335 '-ldxva2.lib',
337 '-lstrmiids.lib', 336 '-lstrmiids.lib',
338 '-lmf.lib', 337 '-lmf.lib',
(...skipping 10 matching lines...) Expand all
349 'mfplat.dll', 348 'mfplat.dll',
350 ], 349 ],
351 }, 350 },
352 }, 351 },
353 }, 352 },
354 'sources': [ 353 'sources': [
355 'gpu/dxva_picture_buffer_win.cc', 354 'gpu/dxva_picture_buffer_win.cc',
356 'gpu/dxva_picture_buffer_win.h', 355 'gpu/dxva_picture_buffer_win.h',
357 'gpu/dxva_video_decode_accelerator_win.cc', 356 'gpu/dxva_video_decode_accelerator_win.cc',
358 'gpu/dxva_video_decode_accelerator_win.h', 357 'gpu/dxva_video_decode_accelerator_win.h',
359 'gpu/media_foundation_video_encode_accelerator_win.cc',
360 'gpu/media_foundation_video_encode_accelerator_win.h',
361 ], 358 ],
362 'include_dirs': [ 359 'include_dirs': [
363 '<(DEPTH)/third_party/khronos', 360 '<(DEPTH)/third_party/khronos',
364 ], 361 ],
365 }], 362 }],
366 ['OS == "win" and target_arch == "x64"', { 363 ['OS == "win" and target_arch == "x64"', {
367 'msvs_settings': { 364 'msvs_settings': {
368 'VCCLCompilerTool': { 365 'VCCLCompilerTool': {
369 'AdditionalOptions': [ 366 'AdditionalOptions': [
370 '/wd4267', # Conversion from 'size_t' to 'type', possible loss of da ta 367 '/wd4267', # Conversion from 'size_t' to 'type', possible loss of da ta
371 ], 368 ],
372 }, 369 },
373 }, 370 },
374 }], 371 }],
375 ], 372 ],
376 } 373 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698