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

Side by Side Diff: media/base/filters.cc

Issue 4991003: Revert 66125 -- Broke Windows build - Move FilterType into MediaFilterCollect... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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/filters.h ('k') | media/base/media_filter_collection.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "media/base/filters.h" 5 #include "media/base/filters.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 9
10 namespace media { 10 namespace media {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 void MediaFilter::OnAudioRendererDisabled() { 87 void MediaFilter::OnAudioRendererDisabled() {
88 } 88 }
89 89
90 MediaFilter::~MediaFilter() {} 90 MediaFilter::~MediaFilter() {}
91 91
92 bool DataSource::IsUrlSupported(const std::string& url) { 92 bool DataSource::IsUrlSupported(const std::string& url) {
93 return true; 93 return true;
94 } 94 }
95 95
96 FilterType DataSource::filter_type() const {
97 return static_filter_type();
98 }
99
100 FilterType Demuxer::filter_type() const {
101 return static_filter_type();
102 }
103
96 bool Demuxer::requires_message_loop() const { 104 bool Demuxer::requires_message_loop() const {
97 return true; 105 return true;
98 } 106 }
99 107
100 const char* Demuxer::message_loop_name() const { 108 const char* Demuxer::message_loop_name() const {
101 return "DemuxerThread"; 109 return "DemuxerThread";
102 } 110 }
103 111
112 FilterType AudioDecoder::filter_type() const {
113 return static_filter_type();
114 }
115
104 const char* AudioDecoder::major_mime_type() const { 116 const char* AudioDecoder::major_mime_type() const {
105 return mime_type::kMajorTypeAudio; 117 return mime_type::kMajorTypeAudio;
106 } 118 }
107 119
108 bool AudioDecoder::requires_message_loop() const { 120 bool AudioDecoder::requires_message_loop() const {
109 return true; 121 return true;
110 } 122 }
111 123
112 const char* AudioDecoder::message_loop_name() const { 124 const char* AudioDecoder::message_loop_name() const {
113 return "AudioDecoderThread"; 125 return "AudioDecoderThread";
114 } 126 }
115 127
128 FilterType AudioRenderer::filter_type() const {
129 return static_filter_type();
130 }
131
116 const char* AudioRenderer::major_mime_type() const { 132 const char* AudioRenderer::major_mime_type() const {
117 return mime_type::kMajorTypeAudio; 133 return mime_type::kMajorTypeAudio;
118 } 134 }
119 135
136 FilterType VideoDecoder::filter_type() const {
137 return static_filter_type();
138 }
139
120 const char* VideoDecoder::major_mime_type() const { 140 const char* VideoDecoder::major_mime_type() const {
121 return mime_type::kMajorTypeVideo; 141 return mime_type::kMajorTypeVideo;
122 } 142 }
123 143
124 bool VideoDecoder::requires_message_loop() const { 144 bool VideoDecoder::requires_message_loop() const {
125 return true; 145 return true;
126 } 146 }
127 147
128 const char* VideoDecoder::message_loop_name() const { 148 const char* VideoDecoder::message_loop_name() const {
129 return "VideoDecoderThread"; 149 return "VideoDecoderThread";
130 } 150 }
131 151
152 FilterType VideoRenderer::filter_type() const {
153 return static_filter_type();
154 }
155
132 const char* VideoRenderer::major_mime_type() const { 156 const char* VideoRenderer::major_mime_type() const {
133 return mime_type::kMajorTypeVideo; 157 return mime_type::kMajorTypeVideo;
134 } 158 }
135 159
136 DemuxerStream::~DemuxerStream() {} 160 DemuxerStream::~DemuxerStream() {}
137 161
138 VideoDecoder::VideoDecoder() {} 162 VideoDecoder::VideoDecoder() {}
139 163
140 VideoDecoder::~VideoDecoder() {} 164 VideoDecoder::~VideoDecoder() {}
141 165
142 AudioDecoder::AudioDecoder() {} 166 AudioDecoder::AudioDecoder() {}
143 167
144 AudioDecoder::~AudioDecoder() {} 168 AudioDecoder::~AudioDecoder() {}
145 169
146 } // namespace media 170 } // namespace media
OLDNEW
« no previous file with comments | « media/base/filters.h ('k') | media/base/media_filter_collection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698