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

Side by Side Diff: media/base/composite_filter.h

Issue 7601002: Revert r95841 due to failing media_unittests on linux_shared bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/composite_data_source_factory.h ('k') | media/base/data_buffer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_BASE_COMPOSITE_FILTER_H_ 5 #ifndef MEDIA_BASE_COMPOSITE_FILTER_H_
6 #define MEDIA_BASE_COMPOSITE_FILTER_H_ 6 #define MEDIA_BASE_COMPOSITE_FILTER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/task.h" 10 #include "base/task.h"
11 #include "media/base/filter_host.h" 11 #include "media/base/filter_host.h"
12 #include "media/base/filters.h" 12 #include "media/base/filters.h"
13 13
14 class MessageLoop; 14 class MessageLoop;
15 15
16 namespace media { 16 namespace media {
17 17
18 class MEDIA_EXPORT CompositeFilter : public Filter { 18 class CompositeFilter : public Filter {
19 public: 19 public:
20 explicit CompositeFilter(MessageLoop* message_loop); 20 explicit CompositeFilter(MessageLoop* message_loop);
21 21
22 // Adds a filter to the composite. This is only allowed after set_host() 22 // Adds a filter to the composite. This is only allowed after set_host()
23 // is called and before the first state changing operation such as Play(), 23 // is called and before the first state changing operation such as Play(),
24 // Flush(), Stop(), or Seek(). True is returned if the filter was successfully 24 // Flush(), Stop(), or Seek(). True is returned if the filter was successfully
25 // added to the composite. False is returned if the filter couldn't be added 25 // added to the composite. False is returned if the filter couldn't be added
26 // because the composite is in the wrong state. 26 // because the composite is in the wrong state.
27 bool AddFilter(scoped_refptr<Filter> filter); 27 bool AddFilter(scoped_refptr<Filter> filter);
28 28
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 PipelineStatus status_; 144 PipelineStatus status_;
145 145
146 scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_; 146 scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_;
147 147
148 DISALLOW_COPY_AND_ASSIGN(CompositeFilter); 148 DISALLOW_COPY_AND_ASSIGN(CompositeFilter);
149 }; 149 };
150 150
151 } // namespace media 151 } // namespace media
152 152
153 #endif // MEDIA_BASE_COMPOSITE_FILTER_H_ 153 #endif // MEDIA_BASE_COMPOSITE_FILTER_H_
OLDNEW
« no previous file with comments | « media/base/composite_data_source_factory.h ('k') | media/base/data_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698