media/base/android/media_decoder_job.cc - Issue 2047003003: Rename MediaCodecBridge::Reset() to Flush()

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 2047003003: Rename MediaCodecBridge::Reset() to Flush() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: missed a couple Created 4 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: 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 8b1ccc4ad1f0359979df14436406fc3b4e25ebe9..c1c56042b79dae82dcaf4e75ba6eeceffc2f266b 100644

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

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

@@ -388,9 +388,9 @@ void MediaDecoderJob::DecodeInternal(

input_eos_encountered_ = false;

output_eos_encountered_ = false;

input_buf_index_ = -1;

- MediaCodecStatus reset_status = media_codec_bridge_->Reset();

- if (MEDIA_CODEC_OK != reset_status) {

- callback.Run(reset_status, false, kNoTimestamp(), kNoTimestamp());

+ MediaCodecStatus flush_status = media_codec_bridge_->Flush();

+ if (flush_status != MEDIA_CODEC_OK) {

+ callback.Run(flush_status, false, kNoTimestamp(), kNoTimestamp());

return;

}