| OLD | NEW |
|---|
| 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> |
| 9 |
| 8 #include "base/task.h" | 10 #include "base/task.h" |
| 9 #include "media/base/filter_host.h" | 11 #include "media/base/filter_host.h" |
| 10 #include "media/base/filters.h" | 12 #include "media/base/filters.h" |
| 11 | 13 |
| 12 class MessageLoop; | 14 class MessageLoop; |
| 13 | 15 |
| 14 namespace media { | 16 namespace media { |
| 15 | 17 |
| 16 class CompositeFilter : public Filter { | 18 class CompositeFilter : public Filter { |
| 17 public: | 19 public: |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 PipelineStatus status_; | 144 PipelineStatus status_; |
| 143 | 145 |
| 144 scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_; | 146 scoped_ptr<ScopedRunnableMethodFactory<CompositeFilter> > runnable_factory_; |
| 145 | 147 |
| 146 DISALLOW_COPY_AND_ASSIGN(CompositeFilter); | 148 DISALLOW_COPY_AND_ASSIGN(CompositeFilter); |
| 147 }; | 149 }; |
| 148 | 150 |
| 149 } // namespace media | 151 } // namespace media |
| 150 | 152 |
| 151 #endif // MEDIA_BASE_COMPOSITE_FILTER_H_ | 153 #endif // MEDIA_BASE_COMPOSITE_FILTER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 7452016:
Remove MediaFormat once and for all. (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src