content/common/gpu/media/android_copying_backing_strategy.cc - Issue 1963773003: Merge to M51: Various fixes to prevent playback hang on MotoX.

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_copying_backing_strategy.cc

Issue 1963773003: Merge to M51: Various fixes to prevent playback hang on MotoX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704

Patch Set: Created 4 years, 7 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_copying_backing_strategy.h ('k') | content/common/gpu/media/android_deferred_rendering_backing_strategy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b5216154829559901301d8d3bc9fe32d7c575e8c..b09133454ec115085d44875965225aa405be3c8d 100644

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

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

@@ -56,7 +56,7 @@ gfx::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize(

void AndroidCopyingBackingStrategy::Cleanup(

bool have_context,

- const AndroidVideoDecodeAccelerator::OutputBufferMap&) {

+ const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) {

DCHECK(state_provider_->ThreadChecker().CalledOnValidThread());

if (copier_)

@@ -144,8 +144,7 @@ void AndroidCopyingBackingStrategy::UseCodecBufferForPictureBuffer(

}

void AndroidCopyingBackingStrategy::CodecChanged(

- media::VideoCodecBridge* codec,

- const AndroidVideoDecodeAccelerator::OutputBufferMap&) {

+ media::VideoCodecBridge* codec) {

media_codec_ = codec;

}