Move Demuxer::set_host() to Initialize().

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 315 matching lines @@
   while (!read_cbs_.empty()) {
     closures->push_back(base::Bind(read_cbs_.front(), end_of_stream_buffer));
     read_cbs_.pop_front();
   }
 
   ChangeState_Locked(RETURNING_EOS_FOR_READS);
 }
 
 ChunkDemuxer::ChunkDemuxer(ChunkDemuxerClient* client)
     : state_(WAITING_FOR_INIT),
+      host_(NULL),
       client_(client),
       buffered_bytes_(0),
       seek_waits_for_data_(true) {
   DCHECK(client);
 }
 
 ChunkDemuxer::~ChunkDemuxer() {
   DCHECK_NE(state_, INITIALIZED);
 }
 
-void ChunkDemuxer::Initialize(const PipelineStatusCB& cb) {
+void ChunkDemuxer::Initialize(DemuxerHost* host,
+                              const PipelineStatusCB& cb) {
   DVLOG(1) << "Init()";
   {
     base::AutoLock auto_lock(lock_);
     DCHECK_EQ(state_, WAITING_FOR_INIT);
+    host_ = host;
 
     ChangeState_Locked(INITIALIZING);
     init_cb_ = cb;
     stream_parser_.reset(new WebMStreamParser());
 
     stream_parser_->Init(
         base::Bind(&ChunkDemuxer::OnStreamParserInitDone, this),
         this);
   }
 
@@ skipping 169 matching lines @@
 
     if (video_.get() && video_->GetLastBufferTimestamp(&tmp) &&
         tmp > buffered_ts) {
       buffered_ts = tmp;
     }
 
     buffered_bytes = buffered_bytes_;
   }
 
   // Notify the host of 'network activity' because we got data.
-  host()->SetBufferedBytes(buffered_bytes);
+  host_->SetBufferedBytes(buffered_bytes);
 
   if (buffered_ts.InSeconds() >= 0) {
-    host()->SetBufferedTime(buffered_ts);
+    host_->SetBufferedTime(buffered_ts);
   }
 
-  host()->SetNetworkActivity(true);
+  host_->SetNetworkActivity(true);
 
   if (!cb.is_null())
     cb.Run(PIPELINE_OK);
 
   return true;
 }
 
 void ChunkDemuxer::EndOfStream(PipelineStatus status) {
   DVLOG(1) << "EndOfStream(" << status << ")";
   base::AutoLock auto_lock(lock_);
@@ skipping 85 matching lines @@
       video_->Shutdown();
   }
 
   if (!cb.is_null()) {
     base::AutoUnlock auto_unlock(lock_);
     cb.Run(error);
     return;
   }
 
   base::AutoUnlock auto_unlock(lock_);
-  host()->OnDemuxerError(error);
+  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);
+  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