content/common/gpu/media/android_video_decode_accelerator_unittest.cc - Issue 1313913003: Begin refactor of AVDA to support zero-copy.

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/android_video_decode_accelerator_unittest.cc

Issue 1313913003: Begin refactor of AVDA to support zero-copy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cl feedback + rebased. Created 5 years, 3 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_state_provider.h ('k') | content/common/gpu/media/avda_return_on_failure.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/android_video_decode_accelerator_unittest.cc

diff --git a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc

index efd5b75a5ca27ae6487f78b40c0c41c3e78dfaf6..98534d41cf2697015a4912979721b8c280641677 100644

--- a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc

+++ b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc

@@ -8,6 +8,7 @@

#include "base/bind.h"

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

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

#include "content/common/gpu/media/android_video_decode_accelerator.h"

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

#include "media/base/android/media_codec_bridge.h"

@@ -63,7 +64,8 @@ class AndroidVideoDecodeAcceleratorTest : public testing::Test {

scoped_ptr<MockVideoDecodeAcceleratorClient> client(

new MockVideoDecodeAcceleratorClient());

accelerator_.reset(new AndroidVideoDecodeAccelerator(

- decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent)));

+ decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent),

+ make_scoped_ptr(new AndroidCopyingBackingStrategy())));

}

bool Configure(media::VideoCodec codec) {