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

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

Issue 1186943003: Revert of Add support for the audio-output-device switching IPC mechanism to the renderer lower... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/base/fake_audio_renderer_sink.h ('k') | media/base/mock_audio_renderer_sink.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/fake_audio_renderer_sink.h" 5 #include "media/base/fake_audio_renderer_sink.h"
6 6
7 #include "base/bind.h"
8 #include "base/location.h"
9 #include "base/logging.h" 7 #include "base/logging.h"
10 #include "base/single_thread_task_runner.h"
11 8
12 namespace media { 9 namespace media {
13 10
14 FakeAudioRendererSink::FakeAudioRendererSink() 11 FakeAudioRendererSink::FakeAudioRendererSink()
15 : state_(kUninitialized), 12 : state_(kUninitialized),
16 callback_(NULL) { 13 callback_(NULL) {
17 } 14 }
18 15
19 FakeAudioRendererSink::~FakeAudioRendererSink() { 16 FakeAudioRendererSink::~FakeAudioRendererSink() {
20 DCHECK(!callback_); 17 DCHECK(!callback_);
(...skipping 27 matching lines...) Expand all
48 void FakeAudioRendererSink::Play() { 45 void FakeAudioRendererSink::Play() {
49 DCHECK(state_ == kStarted || state_ == kPaused) << "state_ " << state_; 46 DCHECK(state_ == kStarted || state_ == kPaused) << "state_ " << state_;
50 DCHECK_EQ(state_, kPaused); 47 DCHECK_EQ(state_, kPaused);
51 ChangeState(kPlaying); 48 ChangeState(kPlaying);
52 } 49 }
53 50
54 bool FakeAudioRendererSink::SetVolume(double volume) { 51 bool FakeAudioRendererSink::SetVolume(double volume) {
55 return true; 52 return true;
56 } 53 }
57 54
58 void FakeAudioRendererSink::SwitchOutputDevice(
59 const std::string& device_id,
60 const GURL& security_origin,
61 const SwitchOutputDeviceCB& callback) {
62 callback.Run(SWITCH_OUTPUT_DEVICE_RESULT_SUCCESS);
63 }
64
65 bool FakeAudioRendererSink::Render(AudioBus* dest, int audio_delay_milliseconds, 55 bool FakeAudioRendererSink::Render(AudioBus* dest, int audio_delay_milliseconds,
66 int* frames_written) { 56 int* frames_written) {
67 if (state_ != kPlaying) 57 if (state_ != kPlaying)
68 return false; 58 return false;
69 59
70 *frames_written = callback_->Render(dest, audio_delay_milliseconds); 60 *frames_written = callback_->Render(dest, audio_delay_milliseconds);
71 return true; 61 return true;
72 } 62 }
73 63
74 void FakeAudioRendererSink::OnRenderError() { 64 void FakeAudioRendererSink::OnRenderError() {
(...skipping 12 matching lines...) Expand all
87 "kPlaying", 77 "kPlaying",
88 "kStopped" 78 "kStopped"
89 }; 79 };
90 80
91 DVLOG(1) << __FUNCTION__ << " : " 81 DVLOG(1) << __FUNCTION__ << " : "
92 << kStateNames[state_] << " -> " << kStateNames[new_state]; 82 << kStateNames[state_] << " -> " << kStateNames[new_state];
93 state_ = new_state; 83 state_ = new_state;
94 } 84 }
95 85
96 } // namespace media 86 } // namespace media
OLDNEW
« no previous file with comments | « media/base/fake_audio_renderer_sink.h ('k') | media/base/mock_audio_renderer_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698