Remove reference counting from media::Demuxer and friends.

media/filters/chunk_demuxer.h

 // 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.
 
 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 27 matching lines @@
                               int init_data_size)> NeedKeyCB;
 
   // |open_cb| Run when Initialize() is called to signal that the demuxer
   //   is ready to receive media data via AppenData().
   // |need_key_cb| Run when the demuxer determines that an encryption key is
   //   needed to decrypt the content.
   // |log_cb| Run when parsing error messages need to be logged to the error
   //   console.
   ChunkDemuxer(const base::Closure& open_cb, const NeedKeyCB& need_key_cb,
                const LogCB& log_cb);
+  virtual ~ChunkDemuxer();
 
   // Demuxer implementation.
   virtual void Initialize(DemuxerHost* host,
                           const PipelineStatusCB& cb) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time, const PipelineStatusCB&  cb) OVERRIDE;
   virtual void OnAudioRendererDisabled() OVERRIDE;
-  virtual scoped_refptr<DemuxerStream> GetStream(
-      DemuxerStream::Type type) OVERRIDE;
+  virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE;
   virtual base::TimeDelta GetStartTime() const OVERRIDE;
 
   // Methods used by an external object to control this demuxer.
   void StartWaitingForSeek();
   void CancelPendingSeek();
 
   // Registers a new |id| to use for AppendData() calls. |type| indicates
   // the MIME type for the data that we intend to append for this ID.
   // kOk is returned if the demuxer has enough resources to support another ID
   //    and supports the format indicated by |type|.
@@ skipping 30 matching lines @@
   // properly, false if the offset cannot be applied because we're in the
   // middle of parsing a media segment.
   bool SetTimestampOffset(const std::string& id, base::TimeDelta offset);
 
   // Signals an EndOfStream request.
   // Returns false if called in an unexpected state or if there is a gap between
   // the current position and the end of the buffered data.
   bool EndOfStream(PipelineStatus status);
   void Shutdown();
 
- protected:
-  virtual ~ChunkDemuxer();
-
  private:
   enum State {
     WAITING_FOR_INIT,
     INITIALIZING,
     INITIALIZED,
     ENDED,
     PARSE_ERROR,
     SHUTDOWN,
   };
 
@@ skipping 32 matching lines @@
                               base::TimeDelta timestamp_offset);
 
   // Returns true if |source_id| is valid, false otherwise.
   bool IsValidId(const std::string& source_id) const;
 
   // Increases |duration_| if the newly appended |buffers| exceed the current
   // |duration_|. The |duration_| is set to the end buffered timestamp of
   // |stream|.
   void IncreaseDurationIfNecessary(
       const StreamParser::BufferQueue& buffers,
-      const scoped_refptr<ChunkDemuxerStream>& stream);
+      ChunkDemuxerStream* stream);
 
   // Decreases |duration_| if the buffered region is less than |duration_| when
   // EndOfStream() is called.
   void DecreaseDurationIfNecessary();
 
   // Sets |duration_| to |new_duration|, sets |user_specified_duration_| to -1
   // and notifies |host_|.
   void UpdateDuration(base::TimeDelta new_duration);
 
   // Returns the ranges representing the buffered data in the demuxer.
   Ranges<base::TimeDelta> GetBufferedRanges() const;
 
   mutable base::Lock lock_;
   State state_;
 
   DemuxerHost* host_;
   base::Closure open_cb_;
   NeedKeyCB need_key_cb_;
   // Callback used to report error strings that can help the web developer
   // figure out what is wrong with the content.
   LogCB log_cb_;
 
   PipelineStatusCB init_cb_;
   PipelineStatusCB seek_cb_;
 
-  scoped_refptr<ChunkDemuxerStream> audio_;
-  scoped_refptr<ChunkDemuxerStream> video_;
+  scoped_ptr<ChunkDemuxerStream> audio_;
+  scoped_ptr<ChunkDemuxerStream> video_;
 
   base::TimeDelta duration_;
 
   // The duration passed to the last SetDuration(). If
   // SetDuration() is never called or an AppendData() call or
   // a EndOfStream() call changes |duration_|, then this
   // variable is set to < 0 to indicate that the |duration_| represents
   // the actual duration instead of a user specified value.
   double user_specified_duration_;
 
   typedef std::map<std::string, SourceState*> SourceStateMap;
   SourceStateMap source_state_map_;
 
   // Used to ensure that (1) config data matches the type and codec provided in
   // AddId(), (2) only 1 audio and 1 video sources are added, and (3) ids may be
   // removed with RemoveID() but can not be re-added (yet).
   std::string source_id_audio_;
   std::string source_id_video_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_