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

Side by Side Diff: media/media_gpu.gypi

Issue 2173153002: Reland2: H264 HW encode using MediaFoundation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added static_casts. Created 4 years, 4 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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 ], 321 ],
322 'process_outputs_as_sources': 1, 322 'process_outputs_as_sources': 1,
323 'message': 'Generating libva stubs for dynamic loading', 323 'message': 'Generating libva stubs for dynamic loading',
324 }, 324 },
325 ] 325 ]
326 }], 326 }],
327 ['OS=="win"', { 327 ['OS=="win"', {
328 'dependencies': [ 328 'dependencies': [
329 '../media/media.gyp:media', 329 '../media/media.gyp:media',
330 '../media/media.gyp:mf_initializer', 330 '../media/media.gyp:mf_initializer',
331 '../third_party/libyuv/libyuv.gyp:libyuv',
331 '../ui/gl/gl.gyp:gl', 332 '../ui/gl/gl.gyp:gl',
332 '../ui/gl/init/gl_init.gyp:gl_init', 333 '../ui/gl/init/gl_init.gyp:gl_init',
333 ], 334 ],
334 'link_settings': { 335 'link_settings': {
335 'libraries': [ 336 'libraries': [
336 '-ld3d9.lib', 337 '-ld3d9.lib',
337 '-ld3d11.lib', 338 '-ld3d11.lib',
338 '-ldxva2.lib', 339 '-ldxva2.lib',
339 '-lstrmiids.lib', 340 '-lstrmiids.lib',
340 '-lmf.lib', 341 '-lmf.lib',
(...skipping 10 matching lines...) Expand all
351 'mfplat.dll', 352 'mfplat.dll',
352 ], 353 ],
353 }, 354 },
354 }, 355 },
355 }, 356 },
356 'sources': [ 357 'sources': [
357 'gpu/dxva_picture_buffer_win.cc', 358 'gpu/dxva_picture_buffer_win.cc',
358 'gpu/dxva_picture_buffer_win.h', 359 'gpu/dxva_picture_buffer_win.h',
359 'gpu/dxva_video_decode_accelerator_win.cc', 360 'gpu/dxva_video_decode_accelerator_win.cc',
360 'gpu/dxva_video_decode_accelerator_win.h', 361 'gpu/dxva_video_decode_accelerator_win.h',
362 'gpu/media_foundation_video_encode_accelerator_win.cc',
363 'gpu/media_foundation_video_encode_accelerator_win.h',
361 ], 364 ],
362 'include_dirs': [ 365 'include_dirs': [
363 '<(DEPTH)/third_party/khronos', 366 '<(DEPTH)/third_party/khronos',
364 ], 367 ],
365 }], 368 }],
366 ['OS == "win" and target_arch == "x64"', { 369 ['OS == "win" and target_arch == "x64"', {
367 'msvs_settings': { 370 'msvs_settings': {
368 'VCCLCompilerTool': { 371 'VCCLCompilerTool': {
369 'AdditionalOptions': [ 372 'AdditionalOptions': [
370 '/wd4267', # Conversion from 'size_t' to 'type', possible loss of da ta 373 '/wd4267', # Conversion from 'size_t' to 'type', possible loss of da ta
371 ], 374 ],
372 }, 375 },
373 }, 376 },
374 }], 377 }],
375 ], 378 ],
376 } 379 }
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