media/filters/audio_renderer_base.cc - Issue 164447: Merge 22654 - Renderer busy looping after video (with sound) or audio ends...

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/filters/audio_renderer_base.cc

Issue 164447: Merge 22654 - Renderer busy looping after video (with sound) or audio ends... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/

Patch Set: Created 11 years, 4 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

Index: media/filters/audio_renderer_base.cc

===================================================================

--- media/filters/audio_renderer_base.cc (revision 23263)

+++ media/filters/audio_renderer_base.cc (working copy)

@@ -120,8 +120,11 @@

DCHECK_GT(pending_reads_, 0u);

--pending_reads_;

- // Note: Calling this may schedule more reads.

- algorithm_->EnqueueBuffer(buffer_in);

+ // Don't enqueue an end-of-stream buffer because it has no data.

+ if (!buffer_in->IsEndOfStream()) {

+ // Note: Calling this may schedule more reads.

+ algorithm_->EnqueueBuffer(buffer_in);

+ }

// Check for our preroll complete condition.

if (state_ == kSeeking) {

Property changes on: media\filters\audio_renderer_base.cc

___________________________________________________________________

Modified: svn:mergeinfo

Merged /trunk/src/media/filters/audio_renderer_base.cc:r22654

« no previous file with comments | « no previous file | media/filters/audio_renderer_base_unittest.cc » ('j') | no next file with comments »