Remove DemuxerFactory and URL parameter from Pipeline.

media/filters/chunk_demuxer.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/filters/chunk_demuxer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/base/audio_decoder_config.h"
@@ skipping 317 matching lines @@
     read_cbs_.pop_front();
   }
 
   ChangeState_Locked(RETURNING_EOS_FOR_READS);
 }
 
 ChunkDemuxer::ChunkDemuxer(ChunkDemuxerClient* client)
     : state_(WAITING_FOR_INIT),
       client_(client),
       buffered_bytes_(0),
-      seek_waits_for_data_(true),
-      deferred_error_(PIPELINE_OK) {
+      seek_waits_for_data_(true) {
   DCHECK(client);
 }
 
 ChunkDemuxer::~ChunkDemuxer() {
   DCHECK_NE(state_, INITIALIZED);
 }
 
-void ChunkDemuxer::Init(const PipelineStatusCB& cb) {
+void ChunkDemuxer::Initialize(const PipelineStatusCB& cb) {
   DVLOG(1) << "Init()";
   {
     base::AutoLock auto_lock(lock_);
     DCHECK_EQ(state_, WAITING_FOR_INIT);
 
     ChangeState_Locked(INITIALIZING);
     init_cb_ = cb;
     stream_parser_.reset(new WebMStreamParser());
 
     stream_parser_->Init(
         base::Bind(&ChunkDemuxer::OnStreamParserInitDone, this),
         this);
   }
 
   client_->DemuxerOpened(this);
 }
 
 void ChunkDemuxer::set_host(DemuxerHost* host) {
-  DCHECK(state_ == INITIALIZED || state_ == PARSE_ERROR);
+  // XXXXXXX can we tighten up the set_host() requirements to be done before
+  // Initialize() is called?

[scherkus (not reviewing), 2012/03/27 16:51:11]

NOTE: I did precisely that. It's crazy that you should have to write code to
handle a late set_host() call + remember to propagate any calls

the question is -- do you still need to override this method for a DCHECK? I say
no because we'll get null ptr exceptions instead

[acolwell GONE FROM CHROMIUM, 2012/03/27 20:11:35]

I'm fine with you removing this method.

On 2012/03/27 16:51:11, scherkus wrote:

[scherkus (not reviewing), 2012/03/27 20:44:09]

Done.

+  DCHECK_EQ(state_, WAITING_FOR_INIT);
   Demuxer::set_host(host);
-  host->SetDuration(duration_);
-  host->SetCurrentReadPosition(0);
-  if (deferred_error_ != PIPELINE_OK) {
-    host->OnDemuxerError(deferred_error_);
-    deferred_error_ = PIPELINE_OK;
-  }
 }
 
 void ChunkDemuxer::Stop(const base::Closure& callback) {
   DVLOG(1) << "Stop()";
   Shutdown();
   callback.Run();
 }
 
 void ChunkDemuxer::Seek(base::TimeDelta time, const PipelineStatusCB& cb) {
   DVLOG(1) << "Seek(" << time.InSecondsF() << ")";
@@ skipping 271 matching lines @@
     if (video_.get())
       video_->Shutdown();
   }
 
   if (!cb.is_null()) {
     base::AutoUnlock auto_unlock(lock_);
     cb.Run(error);
     return;
   }
 
-  DemuxerHost* demuxer_host = host();
-  if (demuxer_host) {
-    base::AutoUnlock auto_unlock(lock_);
-    demuxer_host->OnDemuxerError(error);
-    return;
-  }
-
-  deferred_error_ = error;
+  base::AutoUnlock auto_unlock(lock_);
+  host()->OnDemuxerError(error);
 }
 
 void ChunkDemuxer::OnStreamParserInitDone(bool success,
                                           base::TimeDelta duration) {
   lock_.AssertAcquired();
   DCHECK_EQ(state_, INITIALIZING);
   if (!success || (!audio_.get() && !video_.get())) {
     ReportError_Locked(DEMUXER_ERROR_COULD_NOT_OPEN);
     return;
   }
 
   duration_ = duration;
+  host()->SetDuration(duration_);
+  host()->SetCurrentReadPosition(0);
 
   ChangeState_Locked(INITIALIZED);
   PipelineStatusCB cb;
   std::swap(cb, init_cb_);
   cb.Run(PIPELINE_OK);
 }
 
 bool ChunkDemuxer::OnNewAudioConfig(const AudioDecoderConfig& config) {
   lock_.AssertAcquired();
   // Only allow a single audio config for now.
@@ skipping 34 matching lines @@
   if (!video_->CanAddBuffers(buffers))
     return false;
 
   video_->AddBuffers(buffers);
   seek_waits_for_data_ = false;
 
   return true;
 }
 
 }  // namespace media