Replace StreamParserHost interface with callbacks.

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 343 matching lines @@
     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);
+        base::Bind(&ChunkDemuxer::OnNewConfigs, this),

[scherkus (not reviewing), 2012/04/25 21:01:17]

just as a precautionary FYI for these types of changes...

before we weren't increasing the ref-count when passing in |this|, but
base::Bind() here is adding a ref

this can lead to circular refs / leaks if we're not careful

[acolwell GONE FROM CHROMIUM, 2012/04/25 22:17:02]

Good point. I've added base::Unretained so the code matches the original
ref-counting.

+        base::Bind(&ChunkDemuxer::OnAudioBuffers, this),
+        base::Bind(&ChunkDemuxer::OnVideoBuffers, this));
   }
 
   client_->DemuxerOpened(this);
 }
 
 void ChunkDemuxer::Stop(const base::Closure& callback) {
   DVLOG(1) << "Stop()";
   Shutdown();
   callback.Run();
 }
@@ skipping 326 matching lines @@
   if (video_config.IsValidConfig()) {
     if (video_.get())
       return false;
 
     video_ = new ChunkDemuxerStream(video_config);
   }
 
   return true;
 }
 
-bool ChunkDemuxer::OnAudioBuffers(const BufferQueue& buffers) {
+bool ChunkDemuxer::OnAudioBuffers(const StreamParser::BufferQueue& buffers) {
   if (!audio_.get())
     return false;
 
   if (!audio_->CanAddBuffers(buffers))
     return false;
 
   audio_->AddBuffers(buffers);
   seek_waits_for_data_ = false;
 
   return true;
 }
 
-bool ChunkDemuxer::OnVideoBuffers(const BufferQueue& buffers) {
+bool ChunkDemuxer::OnVideoBuffers(const StreamParser::BufferQueue& buffers) {
   if (!video_.get())
     return false;
 
   if (!video_->CanAddBuffers(buffers))
     return false;
 
   video_->AddBuffers(buffers);
   seek_waits_for_data_ = false;
 
   return true;
 }
 
 }  // namespace media