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

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

Issue 1809093003: Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
« no previous file with comments | « media/audio/null_audio_sink.h ('k') | media/base/BUILD.gn » ('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/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "media/audio/fake_audio_worker.h" 10 #include "media/audio/fake_audio_worker.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 fake_worker_->Stop(); 69 fake_worker_->Stop();
70 playing_ = false; 70 playing_ = false;
71 } 71 }
72 72
73 bool NullAudioSink::SetVolume(double volume) { 73 bool NullAudioSink::SetVolume(double volume) {
74 // Audio is always muted. 74 // Audio is always muted.
75 return volume == 0.0; 75 return volume == 0.0;
76 } 76 }
77 77
78 OutputDevice* NullAudioSink::GetOutputDevice() { 78 OutputDeviceInfo NullAudioSink::GetOutputDeviceInfo() {
79 return nullptr; 79 return OutputDeviceInfo();
80 }
81
82 void NullAudioSink::SwitchOutputDevice(const std::string& device_id,
83 const url::Origin& security_origin,
84 const OutputDeviceStatusCB& callback) {
85 callback.Run(OUTPUT_DEVICE_STATUS_ERROR_INTERNAL);
80 } 86 }
81 87
82 void NullAudioSink::CallRender() { 88 void NullAudioSink::CallRender() {
83 DCHECK(task_runner_->BelongsToCurrentThread()); 89 DCHECK(task_runner_->BelongsToCurrentThread());
84 90
85 int frames_received = callback_->Render(audio_bus_.get(), 0, 0); 91 int frames_received = callback_->Render(audio_bus_.get(), 0, 0);
86 if (!audio_hash_ || frames_received <= 0) 92 if (!audio_hash_ || frames_received <= 0)
87 return; 93 return;
88 94
89 audio_hash_->Update(audio_bus_.get(), frames_received); 95 audio_hash_->Update(audio_bus_.get(), frames_received);
90 } 96 }
91 97
92 void NullAudioSink::StartAudioHashForTesting() { 98 void NullAudioSink::StartAudioHashForTesting() {
93 DCHECK(!initialized_); 99 DCHECK(!initialized_);
94 audio_hash_.reset(new AudioHash()); 100 audio_hash_.reset(new AudioHash());
95 } 101 }
96 102
97 std::string NullAudioSink::GetAudioHashForTesting() { 103 std::string NullAudioSink::GetAudioHashForTesting() {
98 return audio_hash_ ? audio_hash_->ToString() : std::string(); 104 return audio_hash_ ? audio_hash_->ToString() : std::string();
99 } 105 }
100 106
101 } // namespace media 107 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/null_audio_sink.h ('k') | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698