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

Side by Side Diff: media/audio/null_audio_sink.cc

Issue 66183002: Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win and audio tests Created 6 years, 11 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/audio/null_audio_sink.h ('k') | media/audio/pulse/pulse_output.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/audio/null_audio_sink.h" 5 #include "media/audio/null_audio_sink.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop_proxy.h" 8 #include "base/single_thread_task_runner.h"
9 #include "media/audio/fake_audio_consumer.h" 9 #include "media/audio/fake_audio_consumer.h"
10 #include "media/base/audio_hash.h" 10 #include "media/base/audio_hash.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 NullAudioSink::NullAudioSink( 14 NullAudioSink::NullAudioSink(
15 const scoped_refptr<base::MessageLoopProxy>& message_loop) 15 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
16 : initialized_(false), 16 : initialized_(false),
17 playing_(false), 17 playing_(false),
18 callback_(NULL), 18 callback_(NULL),
19 message_loop_(message_loop) { 19 task_runner_(task_runner) {
20 } 20 }
21 21
22 NullAudioSink::~NullAudioSink() {} 22 NullAudioSink::~NullAudioSink() {}
23 23
24 void NullAudioSink::Initialize(const AudioParameters& params, 24 void NullAudioSink::Initialize(const AudioParameters& params,
25 RenderCallback* callback) { 25 RenderCallback* callback) {
26 DCHECK(!initialized_); 26 DCHECK(!initialized_);
27 fake_consumer_.reset(new FakeAudioConsumer(message_loop_, params)); 27 fake_consumer_.reset(new FakeAudioConsumer(task_runner_, params));
28 callback_ = callback; 28 callback_ = callback;
29 initialized_ = true; 29 initialized_ = true;
30 } 30 }
31 31
32 void NullAudioSink::Start() { 32 void NullAudioSink::Start() {
33 DCHECK(message_loop_->BelongsToCurrentThread()); 33 DCHECK(task_runner_->BelongsToCurrentThread());
34 DCHECK(!playing_); 34 DCHECK(!playing_);
35 } 35 }
36 36
37 void NullAudioSink::Stop() { 37 void NullAudioSink::Stop() {
38 DCHECK(message_loop_->BelongsToCurrentThread()); 38 DCHECK(task_runner_->BelongsToCurrentThread());
39 39
40 // Stop may be called at any time, so we have to check before stopping. 40 // Stop may be called at any time, so we have to check before stopping.
41 if (fake_consumer_) 41 if (fake_consumer_)
42 fake_consumer_->Stop(); 42 fake_consumer_->Stop();
43 } 43 }
44 44
45 void NullAudioSink::Play() { 45 void NullAudioSink::Play() {
46 DCHECK(message_loop_->BelongsToCurrentThread()); 46 DCHECK(task_runner_->BelongsToCurrentThread());
47 DCHECK(initialized_); 47 DCHECK(initialized_);
48 48
49 if (playing_) 49 if (playing_)
50 return; 50 return;
51 51
52 fake_consumer_->Start(base::Bind( 52 fake_consumer_->Start(base::Bind(
53 &NullAudioSink::CallRender, base::Unretained(this))); 53 &NullAudioSink::CallRender, base::Unretained(this)));
54 playing_ = true; 54 playing_ = true;
55 } 55 }
56 56
57 void NullAudioSink::Pause() { 57 void NullAudioSink::Pause() {
58 DCHECK(message_loop_->BelongsToCurrentThread()); 58 DCHECK(task_runner_->BelongsToCurrentThread());
59 59
60 if (!playing_) 60 if (!playing_)
61 return; 61 return;
62 62
63 fake_consumer_->Stop(); 63 fake_consumer_->Stop();
64 playing_ = false; 64 playing_ = false;
65 } 65 }
66 66
67 bool NullAudioSink::SetVolume(double volume) { 67 bool NullAudioSink::SetVolume(double volume) {
68 // Audio is always muted. 68 // Audio is always muted.
69 return volume == 0.0; 69 return volume == 0.0;
70 } 70 }
71 71
72 void NullAudioSink::CallRender(AudioBus* audio_bus) { 72 void NullAudioSink::CallRender(AudioBus* audio_bus) {
73 DCHECK(message_loop_->BelongsToCurrentThread()); 73 DCHECK(task_runner_->BelongsToCurrentThread());
74 74
75 int frames_received = callback_->Render(audio_bus, 0); 75 int frames_received = callback_->Render(audio_bus, 0);
76 if (!audio_hash_ || frames_received <= 0) 76 if (!audio_hash_ || frames_received <= 0)
77 return; 77 return;
78 78
79 audio_hash_->Update(audio_bus, frames_received); 79 audio_hash_->Update(audio_bus, frames_received);
80 } 80 }
81 81
82 void NullAudioSink::StartAudioHashForTesting() { 82 void NullAudioSink::StartAudioHashForTesting() {
83 DCHECK(!initialized_); 83 DCHECK(!initialized_);
84 audio_hash_.reset(new AudioHash()); 84 audio_hash_.reset(new AudioHash());
85 } 85 }
86 86
87 std::string NullAudioSink::GetAudioHashForTesting() { 87 std::string NullAudioSink::GetAudioHashForTesting() {
88 return audio_hash_ ? audio_hash_->ToString() : std::string(); 88 return audio_hash_ ? audio_hash_->ToString() : std::string();
89 } 89 }
90 90
91 } // namespace media 91 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/null_audio_sink.h ('k') | media/audio/pulse/pulse_output.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698