content/content_common.gypi - Issue 1636083003: H264 HW encode using VideoToolbox

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_common.gypi

Issue 1636083003: H264 HW encode using VideoToolbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: miu@ and jfroy@ comments Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« content/common/gpu/media/vt_video_encode_accelerator_mac.cc ('K') | « content/common/gpu/media/vt_video_encode_accelerator_mac.cc ('k') | content/content_tests.gypi » ('j') | media/base/mac/videotoolbox_helpers.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 45809cd735344612fc2b4296de9f349bbd3b86c8..23b1f806645287ac7be4366547cc949c7b67a3c9 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -164,8 +164,8 @@

'public/common/webplugininfo.h',

'public/common/window_container_type.cc',

'public/common/window_container_type.h',

- 'public/common/zygote_handle.h',

'public/common/zygote_fork_delegate_linux.h',

+ 'public/common/zygote_handle.h',

'private_common_sources': [

'common/accessibility_messages.h',

@@ -287,6 +287,12 @@

'common/geofencing_types.cc',

'common/geofencing_types.h',

'common/gin_java_bridge_messages.h',

+ 'common/gpu/ca_layer_partial_damage_tree_mac.h',

+ 'common/gpu/ca_layer_partial_damage_tree_mac.mm',

+ 'common/gpu/ca_layer_tree_mac.h',

+ 'common/gpu/ca_layer_tree_mac.mm',

+ 'common/gpu/child_window_surface_win.cc',

+ 'common/gpu/child_window_surface_win.h',

'common/gpu/client/command_buffer_metrics.cc',

'common/gpu/client/command_buffer_metrics.h',

'common/gpu/client/command_buffer_proxy_impl.cc',

@@ -317,12 +323,6 @@

'common/gpu/client/grcontext_for_webgraphicscontext3d.h',

'common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc',

'common/gpu/client/webgraphicscontext3d_command_buffer_impl.h',

- 'common/gpu/ca_layer_partial_damage_tree_mac.h',

- 'common/gpu/ca_layer_partial_damage_tree_mac.mm',

- 'common/gpu/ca_layer_tree_mac.h',

- 'common/gpu/ca_layer_tree_mac.mm',

- 'common/gpu/child_window_surface_win.cc',

- 'common/gpu/child_window_surface_win.h',

'common/gpu/gpu_channel.cc',

'common/gpu/gpu_channel.h',

'common/gpu/gpu_channel_manager.cc',

@@ -688,6 +688,8 @@

'common/gpu/media/vt_mac.h',

'common/gpu/media/vt_video_decode_accelerator_mac.cc',

'common/gpu/media/vt_video_decode_accelerator_mac.h',

+ 'common/gpu/media/vt_video_encode_accelerator_mac.cc',

+ 'common/gpu/media/vt_video_encode_accelerator_mac.h',

'sources!': [

'common/plugin_list_posix.cc',

@@ -888,10 +890,10 @@

'common/gpu/media/h264_dpb.h',

'common/gpu/media/vp8_decoder.cc',

'common/gpu/media/vp8_decoder.h',

- 'common/gpu/media/vp9_decoder.cc',

- 'common/gpu/media/vp9_decoder.h',

'common/gpu/media/vp8_picture.cc',

'common/gpu/media/vp8_picture.h',

+ 'common/gpu/media/vp9_decoder.cc',

+ 'common/gpu/media/vp9_decoder.h',

'common/gpu/media/vp9_picture.cc',

'common/gpu/media/vp9_picture.h',