content/common/gpu/media/gpu_video_decode_accelerator.h - Issue 317083003: Merge VideoDecodeAcceleratorImpl with VideoDecodeAccelerator

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/common/gpu/media/gpu_video_decode_accelerator.h

Issue 317083003: Merge VideoDecodeAcceleratorImpl with VideoDecodeAccelerator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add logging include Created 6 years, 6 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:

Index: content/common/gpu/media/gpu_video_decode_accelerator.h

diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h

index a93559ef8dd8f3b473d17cc0f568706330578c56..05d9fb0a1b9322f1c905d31b0a7a2226cf273b3c 100644

--- a/content/common/gpu/media/gpu_video_decode_accelerator.h

+++ b/content/common/gpu/media/gpu_video_decode_accelerator.h

@@ -13,7 +13,6 @@

#include "base/memory/shared_memory.h"

#include "base/synchronization/waitable_event.h"

#include "content/common/gpu/gpu_command_buffer_stub.h"

-#include "content/common/gpu/media/video_decode_accelerator_impl.h"

#include "gpu/command_buffer/service/texture_manager.h"

#include "ipc/ipc_listener.h"

#include "ipc/ipc_sender.h"

@@ -98,7 +97,7 @@ class GpuVideoDecodeAccelerator

GpuCommandBufferStub* stub_;

// The underlying VideoDecodeAccelerator.

- scoped_ptr<VideoDecodeAcceleratorImpl> video_decode_accelerator_;

+ scoped_ptr<media::VideoDecodeAccelerator> video_decode_accelerator_;

// Callback for making the relevant context current for GL calls.

// Returns false if failed.