diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 04:03:38 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 04:03:38 +0000 |
| commit | f5443ef7d206262bdac14b1f7d26d7dc2e753f35 (patch) | |
| tree | 23b8fe828dbd77859b33d2049e33125027871e4b /media/base/demuxer.h | |
| parent | 1f1057f9b20647adae5807c8bde06cef40cd9e42 (diff) | |
| download | chromium_src-f5443ef7d206262bdac14b1f7d26d7dc2e753f35.zip chromium_src-f5443ef7d206262bdac14b1f7d26d7dc2e753f35.tar.gz chromium_src-f5443ef7d206262bdac14b1f7d26d7dc2e753f35.tar.bz2 | |
Remove reference counting from media::Demuxer and friends.
In addition:
* Pipeline no longer owns the demuxer; clients are required to own it and keep it alive until Pipeline::Stop() completes.
BUG=173313
Review URL: https://codereview.chromium.org/13813016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/demuxer.h')
| -rw-r--r-- | media/base/demuxer.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/media/base/demuxer.h b/media/base/demuxer.h index 34150af..0a9a15b 100644 --- a/media/base/demuxer.h +++ b/media/base/demuxer.h @@ -5,7 +5,6 @@ #ifndef MEDIA_BASE_DEMUXER_H_ #define MEDIA_BASE_DEMUXER_H_ -#include "base/memory/ref_counted.h" #include "base/time.h" #include "media/base/data_source.h" #include "media/base/demuxer_stream.h" @@ -28,9 +27,10 @@ class MEDIA_EXPORT DemuxerHost : public DataSourceHost { virtual ~DemuxerHost(); }; -class MEDIA_EXPORT Demuxer : public base::RefCountedThreadSafe<Demuxer> { +class MEDIA_EXPORT Demuxer { public: Demuxer(); + virtual ~Demuxer(); // Completes initialization of the demuxer. // @@ -64,10 +64,6 @@ class MEDIA_EXPORT Demuxer : public base::RefCountedThreadSafe<Demuxer> { // Returns the starting time for the media file. virtual base::TimeDelta GetStartTime() const = 0; - protected: - friend class base::RefCountedThreadSafe<Demuxer>; - virtual ~Demuxer(); - private: DISALLOW_COPY_AND_ASSIGN(Demuxer); }; |