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

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

Issue 6969026: Convert Filter::Seek() to use new callback system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More CR fixes Created 9 years, 7 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/base/mock_callback.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 #include "media/base/filters.h" 5 #include "media/base/filters.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media { 9 namespace media {
10 10
11 void ResetAndRunCB(FilterStatusCB* cb, PipelineStatus status) {
12 DCHECK(cb);
13 FilterStatusCB tmp_cb(*cb);
14 cb->Reset();
15 tmp_cb.Run(status);
16 }
17
11 Filter::Filter() : host_(NULL) {} 18 Filter::Filter() : host_(NULL) {}
12 19
13 Filter::~Filter() {} 20 Filter::~Filter() {}
14 21
15 void Filter::set_host(FilterHost* host) { 22 void Filter::set_host(FilterHost* host) {
16 DCHECK(host); 23 DCHECK(host);
17 DCHECK(!host_); 24 DCHECK(!host_);
18 host_ = host; 25 host_ = host;
19 } 26 }
20 27
21 FilterHost* Filter::host() { 28 FilterHost* Filter::host() {
22 return host_; 29 return host_;
23 } 30 }
24 31
25 void Filter::Play(FilterCallback* callback) { 32 void Filter::Play(FilterCallback* callback) {
26 DCHECK(callback); 33 DCHECK(callback);
27 if (callback) { 34 callback->Run();
28 callback->Run(); 35 delete callback;
29 delete callback;
30 }
31 } 36 }
32 37
33 void Filter::Pause(FilterCallback* callback) { 38 void Filter::Pause(FilterCallback* callback) {
34 DCHECK(callback); 39 DCHECK(callback);
35 if (callback) { 40 callback->Run();
36 callback->Run(); 41 delete callback;
37 delete callback;
38 }
39 } 42 }
40 43
41 void Filter::Flush(FilterCallback* callback) { 44 void Filter::Flush(FilterCallback* callback) {
42 DCHECK(callback); 45 DCHECK(callback);
43 if (callback) { 46 callback->Run();
44 callback->Run(); 47 delete callback;
45 delete callback;
46 }
47 } 48 }
48 49
49 void Filter::Stop(FilterCallback* callback) { 50 void Filter::Stop(FilterCallback* callback) {
50 DCHECK(callback); 51 DCHECK(callback);
51 if (callback) { 52 callback->Run();
52 callback->Run(); 53 delete callback;
53 delete callback;
54 }
55 } 54 }
56 55
57 void Filter::SetPlaybackRate(float playback_rate) {} 56 void Filter::SetPlaybackRate(float playback_rate) {}
58 57
59 void Filter::Seek(base::TimeDelta time, FilterCallback* callback) { 58 void Filter::Seek(base::TimeDelta time, const FilterStatusCB& callback) {
60 scoped_ptr<FilterCallback> seek_callback(callback); 59 DCHECK(!callback.is_null());
61 if (seek_callback.get()) { 60 callback.Run(PIPELINE_OK);
62 seek_callback->Run();
63 }
64 } 61 }
65 62
66 void Filter::OnAudioRendererDisabled() { 63 void Filter::OnAudioRendererDisabled() {
67 } 64 }
68 65
69 AVStream* DemuxerStream::GetAVStream() { 66 AVStream* DemuxerStream::GetAVStream() {
70 return NULL; 67 return NULL;
71 } 68 }
72 69
73 DemuxerStream::~DemuxerStream() {} 70 DemuxerStream::~DemuxerStream() {}
74 71
75 VideoDecoder::VideoDecoder() {} 72 VideoDecoder::VideoDecoder() {}
76 73
77 VideoDecoder::~VideoDecoder() {} 74 VideoDecoder::~VideoDecoder() {}
78 75
79 AudioDecoder::AudioDecoder() {} 76 AudioDecoder::AudioDecoder() {}
80 77
81 AudioDecoder::~AudioDecoder() {} 78 AudioDecoder::~AudioDecoder() {}
82 79
83 void AudioDecoder::ConsumeAudioSamples(scoped_refptr<Buffer> buffer) { 80 void AudioDecoder::ConsumeAudioSamples(scoped_refptr<Buffer> buffer) {
84 consume_audio_samples_callback_.Run(buffer); 81 consume_audio_samples_callback_.Run(buffer);
85 } 82 }
86 83
87 } // namespace media 84 } // namespace media
OLDNEW
« no previous file with comments | « media/base/filters.h ('k') | media/base/mock_callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698