summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-07 23:07:27 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-07 23:07:27 +0000
commitaa20e0622a945f94958daa1940385c29779d09e4 (patch)
tree79ba5e11afb6d6edc5a9e4edef95cca4f86467de /media
parent111ca63cacf4cedb65be41fd4cabfa5ad7bb6b86 (diff)
downloadchromium_src-aa20e0622a945f94958daa1940385c29779d09e4.zip
chromium_src-aa20e0622a945f94958daa1940385c29779d09e4.tar.gz
chromium_src-aa20e0622a945f94958daa1940385c29779d09e4.tar.bz2
Move more code from headers to implementation.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5624002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/filter_collection.cc5
-rw-r--r--media/base/filter_collection.h1
-rw-r--r--media/base/pipeline_impl.cc8
-rw-r--r--media/base/pipeline_impl.h9
4 files changed, 13 insertions, 10 deletions
diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc
index bf74b43..b236b02 100644
--- a/media/base/filter_collection.cc
+++ b/media/base/filter_collection.cc
@@ -6,8 +6,9 @@
namespace media {
-FilterCollection::FilterCollection() {
-}
+FilterCollection::FilterCollection() {}
+
+FilterCollection::~FilterCollection() {}
void FilterCollection::AddDataSource(DataSource* filter) {
AddFilter(DATA_SOURCE, filter);
diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h
index 8a396e1..8dd5b04 100644
--- a/media/base/filter_collection.h
+++ b/media/base/filter_collection.h
@@ -17,6 +17,7 @@ namespace media {
class FilterCollection {
public:
FilterCollection();
+ ~FilterCollection();
// Adds a filter to the collection.
void AddDataSource(DataSource* filter);
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index f73d14a..3b27943 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -16,6 +16,14 @@
namespace media {
+class PipelineImpl::PipelineInitState {
+ public:
+ scoped_refptr<DataSource> data_source_;
+ scoped_refptr<Demuxer> demuxer_;
+ scoped_refptr<AudioDecoder> audio_decoder_;
+ scoped_refptr<VideoDecoder> video_decoder_;
+};
+
PipelineImpl::PipelineImpl(MessageLoop* message_loop)
: message_loop_(message_loop),
clock_(new ClockImpl(&base::Time::Now)),
diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h
index 32c1052..aa99f73 100644
--- a/media/base/pipeline_impl.h
+++ b/media/base/pipeline_impl.h
@@ -404,14 +404,7 @@ class PipelineImpl : public Pipeline, public FilterHost {
// Helper class that stores filter references during pipeline
// initialization.
- class PipelineInitState {
- public:
- scoped_refptr<DataSource> data_source_;
- scoped_refptr<Demuxer> demuxer_;
- scoped_refptr<AudioDecoder> audio_decoder_;
- scoped_refptr<VideoDecoder> video_decoder_;
- };
-
+ class PipelineInitState;
scoped_ptr<PipelineInitState> pipeline_init_state_;
FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime);