media/media.gyp - Issue 20632002: Add media::VideoEncodeAccelerator with WebRTC integration

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: media/media.gyp

Issue 20632002: Add media::VideoEncodeAccelerator with WebRTC integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn

Patch Set: 7fd9dbd5 More debugging statements, some fixes Created 7 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 side-by-side diff with in-line comments

Download patch

« media/filters/mock_gpu_video_accelerator_factories.h ('K') | « media/filters/mock_gpu_video_decoder_factories.cc ('k') | media/video/video_encode_accelerator.h » ('j') | media/video/video_encode_accelerator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index cb77036f9a6a0bbf9f0cb221b02b8048eb0e157e..b72bfb00f810d2553fadb1acebf5ab612ba7fece 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -350,8 +350,8 @@

'filters/file_data_source.h',

'filters/gpu_video_decoder.cc',

'filters/gpu_video_decoder.h',

- 'filters/gpu_video_decoder_factories.cc',

- 'filters/gpu_video_decoder_factories.h',

+ 'filters/gpu_video_accelerator_factories.cc',

+ 'filters/gpu_video_accelerated_factories.h',

'filters/h264_to_annex_b_bitstream_converter.cc',

'filters/h264_to_annex_b_bitstream_converter.h',

'filters/in_memory_url_protocol.cc',

@@ -417,6 +417,8 @@

'video/picture.h',

'video/video_decode_accelerator.cc',

'video/video_decode_accelerator.h',

+ 'video/video_encode_accelerator.cc',

+ 'video/video_encode_accelerator.h',

'video/video_encode_types.h',

'webm/webm_audio_client.cc',

'webm/webm_audio_client.h',

@@ -1120,8 +1122,8 @@

'base/mock_filters.h',

'base/test_helpers.cc',

'base/test_helpers.h',

- 'filters/mock_gpu_video_decoder_factories.cc',

- 'filters/mock_gpu_video_decoder_factories.h',

+ 'filters/mock_gpu_video_accelerator_factories.cc',

+ 'filters/mock_gpu_video_accelerator_factories.h',

'video/mock_video_decode_accelerator.cc',

'video/mock_video_decode_accelerator.h',