media/base/android/media_decoder_job.cc - Issue 669623004: Switch to Lollipop APIs for MediaCodec

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/base/android/media_decoder_job.cc

Issue 669623004: Switch to Lollipop APIs for MediaCodec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove getInputBufferCount() call Created 6 years, 2 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: media/base/android/media_decoder_job.cc

diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc

index 2ab5db0069b4e4cc6e8e1d106b417563fb487388..295b3da7420e211075286229fdf28e56efbadb62 100644

--- a/media/base/android/media_decoder_job.cc

+++ b/media/base/android/media_decoder_job.cc

@@ -431,10 +431,6 @@ void MediaDecoderJob::DecodeInternal(

NULL);

if (status != MEDIA_CODEC_OK) {

- if (status == MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED &&

- !media_codec_bridge_->GetOutputBuffers()) {

- status = MEDIA_CODEC_ERROR;

- }

callback.Run(status, kNoTimestamp(), kNoTimestamp());

return;

}