content/renderer/media/webmediaplayer_impl.h - 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: content/renderer/media/webmediaplayer_impl.h

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

Patch Set: 9e8f21a0 Comments addressed. 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

« content/renderer/media/rtc_video_encoder.cc ('K') | « content/renderer/media/rtc_video_encoder_factory.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | media/video/video_encode_accelerator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webmediaplayer_impl.h

diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h

index 23b1ddf524ade722b51f9d50990474e8dbe976ce..c386b08f2b067963ece0348355a0ce08eb9a8781 100644

--- a/content/renderer/media/webmediaplayer_impl.h

+++ b/content/renderer/media/webmediaplayer_impl.h

@@ -56,7 +56,7 @@ class MessageLoopProxy;

namespace media {

class ChunkDemuxer;

class FFmpegDemuxer;

-class GpuVideoDecoderFactories;

+class GpuVideoAcceleratorFactories;

class MediaLog;

}

@@ -318,8 +318,8 @@ class WebMediaPlayerImpl

bool incremented_externally_allocated_memory_;

- // Factories for supporting GpuVideoDecoder. May be null.

- scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories_;

+ // Factories for supporting video accelerators. May be null.

+ scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;

// Routes audio playback to either AudioRendererSink or WebAudio.

scoped_refptr<WebAudioSourceProviderImpl> audio_source_provider_;