Avoid deadlock between Pipeline and RendererImpl.

media/filters/renderer_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/renderer_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 438 matching lines @@
   DCHECK_EQ(interpolation_state_, INTERPOLATION_STOPPED);
   DCHECK(!WaitingForEnoughData());
 
   if (time_source_) {
     // We use audio stream to update the interpolator. So if there is such a
     // stream, we pause the interpolator until we receive a valid time update.
     base::AutoLock auto_lock(interpolator_lock_);
     interpolation_state_ = INTERPOLATION_WAITING_FOR_AUDIO_TIME_UPDATE;
     time_source_->StartTicking();
   } else {
+    base::TimeDelta duration = get_duration_cb_.Run();
     base::AutoLock auto_lock(interpolator_lock_);
     interpolation_state_ = INTERPOLATION_STARTED;
-    interpolator_->SetUpperBound(get_duration_cb_.Run());
+    interpolator_->SetUpperBound(duration);
     interpolator_->StartInterpolating();
   }
 }
 
 void RendererImpl::PauseClockAndStopTicking_Locked() {
   DVLOG(2) << __FUNCTION__;
   interpolator_lock_.AssertAcquired();
   switch (interpolation_state_) {
     case INTERPOLATION_STOPPED:
       return;
@@ skipping 26 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (state_ != STATE_PLAYING)
     return;
 
   DCHECK(!audio_ended_);
   audio_ended_ = true;
 
   // Start clock since there is no more audio to trigger clock updates.
   {
+    base::TimeDelta duration = get_duration_cb_.Run();
     base::AutoLock auto_lock(interpolator_lock_);
-    interpolator_->SetUpperBound(get_duration_cb_.Run());
+    interpolator_->SetUpperBound(duration);
     StartClockIfWaitingForTimeUpdate_Locked();
   }
 
   RunEndedCallbackIfNeeded();
 }
 
 void RendererImpl::OnVideoRendererEnded() {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
@@ skipping 10 matching lines @@
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (audio_renderer_ && !audio_ended_)
     return;
 
   if (video_renderer_ && !video_ended_)
     return;
 
   {
+    base::TimeDelta duration = get_duration_cb_.Run();
     base::AutoLock auto_lock(interpolator_lock_);
     PauseClockAndStopTicking_Locked();
-    base::TimeDelta duration = get_duration_cb_.Run();
     interpolator_->SetBounds(duration, duration);
   }
 
   ended_cb_.Run();
 }
 
 void RendererImpl::OnError(PipelineStatus error) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_NE(PIPELINE_OK, error) << "PIPELINE_OK isn't an error!";
@@ skipping 10 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_ABORT);
 
   if (!flush_cb_.is_null())
     base::ResetAndReturn(&flush_cb_).Run();
 }
 
 }  // namespace media