Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1196)

Unified Diff: media/filters/audio_renderer_impl.cc

Issue 15872004: Disable preroll duration increase on underflow for MediaSource playback. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address CR comments Created 7 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 | « media/filters/audio_renderer_impl.h ('k') | media/filters/audio_renderer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_renderer_impl.cc
diff --git a/media/filters/audio_renderer_impl.cc b/media/filters/audio_renderer_impl.cc
index 6c7acc3bf3f75aec8cc6298c79c0e7096c300a98..3c10cc9db23fccaf71605a23a7c8411f36dba31d 100644
--- a/media/filters/audio_renderer_impl.cc
+++ b/media/filters/audio_renderer_impl.cc
@@ -42,7 +42,8 @@ AudioRendererImpl::AudioRendererImpl(
const scoped_refptr<base::MessageLoopProxy>& message_loop,
media::AudioRendererSink* sink,
ScopedVector<AudioDecoder> decoders,
- const SetDecryptorReadyCB& set_decryptor_ready_cb)
+ const SetDecryptorReadyCB& set_decryptor_ready_cb,
+ bool increase_preroll_on_underflow)
: message_loop_(message_loop),
weak_factory_(this),
sink_(sink),
@@ -57,6 +58,7 @@ AudioRendererImpl::AudioRendererImpl(
audio_time_buffered_(kNoTimestamp()),
current_time_(kNoTimestamp()),
underflow_disabled_(false),
+ increase_preroll_on_underflow_(increase_preroll_on_underflow),
preroll_aborted_(false),
actual_frames_per_buffer_(0) {
}
@@ -284,7 +286,7 @@ void AudioRendererImpl::OnDecoderSelected(
base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
}
-void AudioRendererImpl::ResumeAfterUnderflow(bool buffer_more_audio) {
+void AudioRendererImpl::ResumeAfterUnderflow() {
DCHECK(message_loop_->BelongsToCurrentThread());
base::AutoLock auto_lock(lock_);
if (state_ == kUnderflow) {
@@ -294,7 +296,7 @@ void AudioRendererImpl::ResumeAfterUnderflow(bool buffer_more_audio) {
// number of bytes that need to be buffered for preroll to complete)
// does not increase due to an aborted preroll.
// TODO(vrk): Fix this bug correctly! (crbug.com/151352)
- if (buffer_more_audio && !preroll_aborted_)
+ if (increase_preroll_on_underflow_ && !preroll_aborted_)
algorithm_->IncreaseQueueCapacity();
state_ = kRebuffering;
« no previous file with comments | « media/filters/audio_renderer_impl.h ('k') | media/filters/audio_renderer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698