content/common/gpu/media/dxva_video_decode_accelerator.h - Issue 319323002: Revert of 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/dxva_video_decode_accelerator.h

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

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/common/gpu/media/android_video_decode_accelerator.cc ('k') | content/common/gpu/media/dxva_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 74ca5990b47cb33069c5727bdf05df4d1e84a034..7bff907ece3e3eae2cd516b2ab7036ba9537911b 100644

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

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

@@ -18,6 +18,7 @@

#include "base/threading/non_thread_safe.h"

#include "base/win/scoped_comptr.h"

#include "content/common/content_export.h"

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

#include "media/video/video_decode_accelerator.h"

interface IMFSample;

@@ -30,7 +31,7 @@

// This class lives on a single thread and DCHECKs that it is never accessed

// from any other.

class CONTENT_EXPORT DXVAVideoDecodeAccelerator

- : public media::VideoDecodeAccelerator,

+ : public VideoDecodeAcceleratorImpl,

NON_EXPORTED_BASE(public base::NonThreadSafe) {

public:

enum State {

@@ -56,7 +57,6 @@

virtual void Flush() OVERRIDE;

virtual void Reset() OVERRIDE;

virtual void Destroy() OVERRIDE;

- virtual bool CanDecodeOnIOThread() OVERRIDE;

private:

typedef void* EGLConfig;