Remove reference counting from media::DemuxerStream and friends.

media/filters/ffmpeg_video_decoder.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/ffmpeg_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 43 matching lines @@
   decode_threads = std::min(decode_threads, kMaxDecodeThreads);
   return decode_threads;
 }
 
 FFmpegVideoDecoder::FFmpegVideoDecoder(
     const scoped_refptr<base::MessageLoopProxy>& message_loop)
     : message_loop_(message_loop),
       weak_factory_(this),
       state_(kUninitialized),
       codec_context_(NULL),
-      av_frame_(NULL) {
+      av_frame_(NULL),
+      demuxer_stream_(NULL) {
 }
 
 int FFmpegVideoDecoder::GetVideoBuffer(AVCodecContext* codec_context,
                                        AVFrame* frame) {
   // Don't use |codec_context_| here! With threaded decoding,
   // it will contain unsynchronized width/height/pix_fmt values,
   // whereas |codec_context| contains the current threads's
   // updated width/height/pix_fmt, which can change for adaptive
   // content.
   VideoFrame::Format format = PixelFormatToVideoFormat(codec_context->pix_fmt);
@@ skipping 48 matching lines @@
 static void ReleaseVideoBufferImpl(AVCodecContext* s, AVFrame* frame) {
   scoped_refptr<VideoFrame> video_frame;
   video_frame.swap(reinterpret_cast<VideoFrame**>(&frame->opaque));
 
   // The FFmpeg API expects us to zero the data pointers in
   // this callback
   memset(frame->data, 0, sizeof(frame->data));
   frame->opaque = NULL;
 }
 
-void FFmpegVideoDecoder::Initialize(const scoped_refptr<DemuxerStream>& stream,
+void FFmpegVideoDecoder::Initialize(DemuxerStream* stream,
                                     const PipelineStatusCB& status_cb,
                                     const StatisticsCB& statistics_cb) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   PipelineStatusCB initialize_cb = BindToCurrentLoop(status_cb);
   weak_this_ = weak_factory_.GetWeakPtr();
 
   FFmpegGlue::InitializeFFmpeg();
   DCHECK(!demuxer_stream_) << "Already initialized.";
 
   if (!stream) {
@@ skipping 343 matching lines @@
   if (!codec || avcodec_open2(codec_context_, codec, NULL) < 0) {
     ReleaseFFmpegResources();
     return false;
   }
 
   av_frame_ = avcodec_alloc_frame();
   return true;
 }
 
 }  // namespace media