media/filters/gpu_video_decoder.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: media/filters/gpu_video_decoder.h

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/gpu_video_accelerator_factories.h ('K') | « media/filters/gpu_video_accelerator_factories.cc ('k') | media/filters/gpu_video_decoder.cc » ('j') | media/filters/mock_gpu_video_accelerator_factories.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/filters/gpu_video_decoder.h

diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h

index d155dd6c6d6721eda74297b711af24608c34c985..aacd36c49642ce8617891d1ec58fce4f32596596 100644

--- a/media/filters/gpu_video_decoder.h

+++ b/media/filters/gpu_video_decoder.h

@@ -26,7 +26,7 @@ class SharedMemory;

namespace media {

class DecoderBuffer;

-class GpuVideoDecoderFactories;

+class GpuVideoAcceleratorFactories;

// GPU-accelerated video decoder implementation. Relies on

// AcceleratedVideoDecoderMsg_Decode and friends.

@@ -36,7 +36,7 @@ class MEDIA_EXPORT GpuVideoDecoder

public:

// The message loop of |factories| will be saved to |gvd_loop_proxy_|.

explicit GpuVideoDecoder(

- const scoped_refptr<GpuVideoDecoderFactories>& factories);

+ const scoped_refptr<GpuVideoAcceleratorFactories>& factories);

// VideoDecoder implementation.

virtual void Initialize(const VideoDecoderConfig& config,

@@ -117,7 +117,7 @@ class MEDIA_EXPORT GpuVideoDecoder

base::WeakPtrFactory<GpuVideoDecoder> weak_factory_;

base::WeakPtr<GpuVideoDecoder> weak_this_;

- scoped_refptr<GpuVideoDecoderFactories> factories_;

+ scoped_refptr<GpuVideoAcceleratorFactories> factories_;

// Populated during Initialize() (on success) and unchanged until an error

// occurs.