Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: media/base/filter_collection.h

Issue 14348007: Reland: Remove reference counting from media::VideoDecoder and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/base/filter_collection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/filter_collection.h
diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h
index e8b62f83770ad1d90a2fd3856f9f31d3cf0c1714..07266c6b836bfad197ef9126c2045fe94e4515ed 100644
--- a/media/base/filter_collection.h
+++ b/media/base/filter_collection.h
@@ -5,8 +5,6 @@
#ifndef MEDIA_BASE_FILTER_COLLECTION_H_
#define MEDIA_BASE_FILTER_COLLECTION_H_
-#include <list>
-
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "media/base/media_export.h"
@@ -15,7 +13,6 @@ namespace media {
class AudioRenderer;
class Demuxer;
-class VideoDecoder;
class VideoRenderer;
// Represents a set of uninitialized demuxer and audio/video decoders and
@@ -25,8 +22,6 @@ class VideoRenderer;
// http://crbug.com/110800
class MEDIA_EXPORT FilterCollection {
public:
- typedef std::list<scoped_refptr<VideoDecoder> > VideoDecoderList;
-
FilterCollection();
~FilterCollection();
@@ -39,11 +34,8 @@ class MEDIA_EXPORT FilterCollection {
void SetVideoRenderer(scoped_ptr<VideoRenderer> video_renderer);
scoped_ptr<VideoRenderer> GetVideoRenderer();
- VideoDecoderList* GetVideoDecoders();
-
private:
scoped_refptr<Demuxer> demuxer_;
- VideoDecoderList video_decoders_;
scoped_ptr<AudioRenderer> audio_renderer_;
scoped_ptr<VideoRenderer> video_renderer_;
« no previous file with comments | « no previous file | media/base/filter_collection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698