media/renderers/audio_renderer_impl.cc - Issue 1868403002: Fix incorrect merge of security fix.

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/renderers/audio_renderer_impl.cc

Issue 1868403002: Fix incorrect merge of security fix. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661

Patch Set: Created 4 years, 8 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/renderers/audio_renderer_impl.cc

diff --git a/media/renderers/audio_renderer_impl.cc b/media/renderers/audio_renderer_impl.cc

index 6ce392f7cbda9bb6058db1d801a8902f20b6ad02..3cf7a91a83f33074b0b98c1cc6d3d8242beb9c5d 100644

--- a/media/renderers/audio_renderer_impl.cc

+++ b/media/renderers/audio_renderer_impl.cc

@@ -553,7 +553,7 @@ void AudioRendererImpl::DecodedAudioReady(

<< audio_parameters_.sample_rate()

<< ", Channels: " << buffer->channel_count() << " vs "

<< audio_parameters_.channels();

- HandleAbortedReadOrDecodeError(PIPELINE_ERROR_DECODE);

+ HandleAbortedReadOrDecodeError(true);

return;

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »