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

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

Issue 53126: Demuxer stream now uses a callback instead of Assignable template. Cleaning ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/filters.h ('k') | media/filters/decoder_base.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) 2009 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 #ifndef MEDIA_BASE_MOCK_MEDIA_FILTERS_H_ 5 #ifndef MEDIA_BASE_MOCK_MEDIA_FILTERS_H_
6 #define MEDIA_BASE_MOCK_MEDIA_FILTERS_H_ 6 #define MEDIA_BASE_MOCK_MEDIA_FILTERS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/waitable_event.h" 10 #include "base/waitable_event.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 media_format_.SetAsInteger(MediaFormat::kWidth, config->video_width); 207 media_format_.SetAsInteger(MediaFormat::kWidth, config->video_width);
208 media_format_.SetAsInteger(MediaFormat::kHeight, config->video_height); 208 media_format_.SetAsInteger(MediaFormat::kHeight, config->video_height);
209 } 209 }
210 } 210 }
211 211
212 // Implementation of DemuxerStream. 212 // Implementation of DemuxerStream.
213 virtual const MediaFormat& media_format() { 213 virtual const MediaFormat& media_format() {
214 return media_format_; 214 return media_format_;
215 } 215 }
216 216
217 virtual void Read(Assignable<Buffer>* buffer) { 217 virtual void Read(Callback1<Buffer*>::Type* read_callback) {
218 NOTREACHED(); // TODO(ralphl): fix me!! 218 NOTREACHED(); // TODO(ralphl): fix me!!
219 } 219 }
220 220
221 private: 221 private:
222 virtual ~MockDemuxerStream() {} 222 virtual ~MockDemuxerStream() {}
223 223
224 MediaFormat media_format_; 224 MediaFormat media_format_;
225 225
226 DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream); 226 DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream);
227 }; 227 };
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 base::WaitableEvent event_; 588 base::WaitableEvent event_;
589 bool callback_success_status_; 589 bool callback_success_status_;
590 bool waiting_for_callback_; 590 bool waiting_for_callback_;
591 591
592 DISALLOW_COPY_AND_ASSIGN(InitializationHelper); 592 DISALLOW_COPY_AND_ASSIGN(InitializationHelper);
593 }; 593 };
594 594
595 } // namespace media 595 } // namespace media
596 596
597 #endif // MEDIA_BASE_MOCK_MEDIA_FILTERS_H_ 597 #endif // MEDIA_BASE_MOCK_MEDIA_FILTERS_H_
OLDNEW
« no previous file with comments | « media/base/filters.h ('k') | media/filters/decoder_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698