Separate DemuxerHost from DataSourceHost.

media/base/pipeline.cc

 // Copyright (c) 2012 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/base/pipeline.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 356 matching lines @@
           MediaLogEvent::DURATION_SET, "duration", duration));
   UMA_HISTOGRAM_LONG_TIMES("Media.Duration", duration);
 
   base::AutoLock auto_lock(lock_);
   clock_->SetDuration(duration);
   if (!duration_change_cb_.is_null())
     duration_change_cb_.Run();
 }
 
 void Pipeline::SetTotalBytes(int64 total_bytes) {
-  DCHECK(IsRunning());

[scherkus (not reviewing), 2014/03/26 21:50:12]

I'm assuming these DCHECKs were getting hit, right?

[sandersd (OOO until July 31), 2014/03/26 22:11:12]

I didn't check. Before these calls were delayed until after
Pipeline::InitializeDemuxer() (that's where the host gets passed), but now it
happens as soon as the BufferedDataSource's Loader starts (which I believe
happens strictly before the pipeline is started for FFmpeg, in parallel for
MSE).

   media_log_->AddEvent(
       media_log_->CreateStringEvent(
           MediaLogEvent::TOTAL_BYTES_SET, "total_bytes",
           base::Int64ToString(total_bytes)));
   int64 total_mbytes = total_bytes >> 20;
   if (total_mbytes > kint32max)
     total_mbytes = kint32max;
   UMA_HISTOGRAM_CUSTOM_COUNTS(
       "Media.TotalMBytes", static_cast<int32>(total_mbytes), 1, kint32max, 50);
 
@@ skipping 290 matching lines @@
     // executing |stop_cb_|.
     return;
   }
   if (!error_cb_.is_null()) {
     DCHECK_NE(status_, PIPELINE_OK);
     base::ResetAndReturn(&error_cb_).Run(status_);
   }
 }
 
 void Pipeline::AddBufferedByteRange(int64 start, int64 end) {
-  DCHECK(IsRunning());
   base::AutoLock auto_lock(lock_);
   buffered_byte_ranges_.Add(start, end);
   did_loading_progress_ = true;
 }
 
 void Pipeline::AddBufferedTimeRange(base::TimeDelta start,
                                     base::TimeDelta end) {
   DCHECK(IsRunning());
   base::AutoLock auto_lock(lock_);
   buffered_time_ranges_.Add(start, end);
@@ skipping 289 matching lines @@
 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() {
   lock_.AssertAcquired();
   if (!waiting_for_clock_update_)
     return;
 
   waiting_for_clock_update_ = false;
   clock_->Play();
 }
 
 }  // namespace media