[Media, Video] Enable the video track for a new renderer.

media/filters/pipeline_controller.cc

 // Copyright 2016 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/pipeline_controller.h"
 
 #include "base/bind.h"
 #include "media/base/demuxer.h"
 
 namespace media {
 
 PipelineController::PipelineController(
     Pipeline* pipeline,
     const RendererFactoryCB& renderer_factory_cb,
     const SeekedCB& seeked_cb,
     const SuspendedCB& suspended_cb,
+    const BeforeResumeCB& before_resume_cb,
+    const ResumedCB& resumed_cb,
     const PipelineStatusCB& error_cb)
     : pipeline_(pipeline),
       renderer_factory_cb_(renderer_factory_cb),
       seeked_cb_(seeked_cb),
       suspended_cb_(suspended_cb),
+      before_resume_cb_(before_resume_cb),
+      resumed_cb_(resumed_cb),
       error_cb_(error_cb),
       weak_factory_(this) {
   DCHECK(pipeline_);
   DCHECK(!renderer_factory_cb_.is_null());
   DCHECK(!seeked_cb_.is_null());
   DCHECK(!suspended_cb_.is_null());
+  DCHECK(!before_resume_cb_.is_null());
+  DCHECK(!resumed_cb_.is_null());
   DCHECK(!error_cb_.is_null());
 }
 
 PipelineController::~PipelineController() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 // TODO(sandersd): If there is a pending suspend, don't call pipeline_.Start()
 // until Resume().
 void PipelineController::Start(Demuxer* demuxer,
@@ skipping 78 matching lines @@
 
 void PipelineController::OnPipelineStatus(State state,
                                           PipelineStatus pipeline_status) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (pipeline_status != PIPELINE_OK) {
     error_cb_.Run(pipeline_status);
     return;
   }
 
+  State old_state = state_;
   state_ = state;
 
   if (state == State::PLAYING) {
     // Start(), Seek(), or Resume() completed; we can be sure that
     // |demuxer_| got the seek it was waiting for.
     waiting_for_seek_ = false;
+
+    // TODO(avayvod): Remove resumed callback after https://crbug.com/678374 is
+    // properly fixed.
+    if (old_state == State::RESUMING)
+      resumed_cb_.Run();
   } else if (state == State::SUSPENDED) {
     // Warning: possibly reentrant. The state may change inside this callback.
     // It must be safe to call Dispatch() twice in a row here.
     suspended_cb_.Run();
   }
 
   Dispatch();
 }
 
 // Note: Dispatch() may be called re-entrantly (by callbacks internally) or
@@ skipping 31 matching lines @@
       pending_time_updated_ = true;
     }
 
     // Tell |demuxer_| to expect our resume.
     DCHECK(!waiting_for_seek_);
     waiting_for_seek_ = true;
     demuxer_->StartWaitingForSeek(seek_time_);
 
     pending_resume_ = false;
     state_ = State::RESUMING;
+    before_resume_cb_.Run();
     pipeline_->Resume(renderer_factory_cb_.Run(), seek_time_,
                       base::Bind(&PipelineController::OnPipelineStatus,
                                  weak_factory_.GetWeakPtr(), State::PLAYING));
     return;
   }
 
   // If we have pending operations, and a seek is ongoing, abort it.
   if ((pending_seek_ || pending_suspend_) && waiting_for_seek_) {
     // If there is no pending seek, return the current seek to pending status.
     if (!pending_seek_) {
@@ skipping 34 matching lines @@
       pending_seeked_cb_ = false;
       bool was_pending_time_updated = pending_time_updated_;
       pending_time_updated_ = false;
       seeked_cb_.Run(was_pending_time_updated);
       return;
     }
   }
 }
 
 }  // namespace media