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

Side by Side Diff: content/renderer/media/renderer_webaudiodevice_impl.cc

Issue 1195633003: Add a silent audio sink to consume WebAudio data on silence detection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove weak_ptr 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 | « content/renderer/media/renderer_webaudiodevice_impl.h ('k') | media/base/audio_bus.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) 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 "content/renderer/media/renderer_webaudiodevice_impl.h" 5 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h"
11 #include "base/time/time.h"
9 #include "content/renderer/media/audio_device_factory.h" 12 #include "content/renderer/media/audio_device_factory.h"
10 #include "content/renderer/render_frame_impl.h" 13 #include "content/renderer/render_frame_impl.h"
11 #include "media/audio/audio_output_device.h" 14 #include "media/audio/audio_output_device.h"
15 #include "media/audio/null_audio_sink.h"
12 #include "media/base/media_switches.h" 16 #include "media/base/media_switches.h"
13 #include "third_party/WebKit/public/web/WebLocalFrame.h" 17 #include "third_party/WebKit/public/web/WebLocalFrame.h"
14 #include "third_party/WebKit/public/web/WebView.h" 18 #include "third_party/WebKit/public/web/WebView.h"
15 19
16 using blink::WebAudioDevice; 20 using blink::WebAudioDevice;
17 using blink::WebLocalFrame; 21 using blink::WebLocalFrame;
18 using blink::WebVector; 22 using blink::WebVector;
19 using blink::WebView; 23 using blink::WebView;
20 24
21 namespace content { 25 namespace content {
22 26
27 static const int kSilenceInSecondsToEnterIdleMode = 30;
28
23 RendererWebAudioDeviceImpl::RendererWebAudioDeviceImpl( 29 RendererWebAudioDeviceImpl::RendererWebAudioDeviceImpl(
24 const media::AudioParameters& params, 30 const media::AudioParameters& params,
25 WebAudioDevice::RenderCallback* callback, 31 WebAudioDevice::RenderCallback* callback,
26 int session_id) 32 int session_id)
27 : params_(params), 33 : params_(params),
28 client_callback_(callback), 34 client_callback_(callback),
29 session_id_(session_id) { 35 session_id_(session_id),
36 task_runner_(base::ThreadTaskRunnerHandle::Get()),
37 null_audio_sink_(new media::NullAudioSink(task_runner_)),
38 is_using_null_audio_sink_(false),
39 first_buffer_after_silence_(media::AudioBus::Create(params_)),
40 is_first_buffer_after_silence_(false),
41 start_null_audio_sink_callback_(
42 base::Bind(&media::NullAudioSink::Play, null_audio_sink_)) {
30 DCHECK(client_callback_); 43 DCHECK(client_callback_);
44 null_audio_sink_->Initialize(params_, this);
31 } 45 }
32 46
33 RendererWebAudioDeviceImpl::~RendererWebAudioDeviceImpl() { 47 RendererWebAudioDeviceImpl::~RendererWebAudioDeviceImpl() {
34 DCHECK(!output_device_.get()); 48 DCHECK(!output_device_);
35 } 49 }
36 50
37 void RendererWebAudioDeviceImpl::start() { 51 void RendererWebAudioDeviceImpl::start() {
38 DCHECK(thread_checker_.CalledOnValidThread()); 52 DCHECK(thread_checker_.CalledOnValidThread());
39 53
40 if (output_device_.get()) 54 if (output_device_)
41 return; // Already started. 55 return; // Already started.
42 56
43 // Assumption: This method is being invoked within a V8 call stack. CHECKs 57 // Assumption: This method is being invoked within a V8 call stack. CHECKs
44 // will fail in the call to frameForCurrentContext() otherwise. 58 // will fail in the call to frameForCurrentContext() otherwise.
45 // 59 //
46 // Therefore, we can perform look-ups to determine which RenderView is 60 // Therefore, we can perform look-ups to determine which RenderView is
47 // starting the audio device. The reason for all this is because the creator 61 // starting the audio device. The reason for all this is because the creator
48 // of the WebAudio objects might not be the actual source of the audio (e.g., 62 // of the WebAudio objects might not be the actual source of the audio (e.g.,
49 // an extension creates a object that is passed and used within a page). 63 // an extension creates a object that is passed and used within a page).
50 WebLocalFrame* const web_frame = WebLocalFrame::frameForCurrentContext(); 64 WebLocalFrame* const web_frame = WebLocalFrame::frameForCurrentContext();
51 RenderFrame* const render_frame = 65 RenderFrame* const render_frame =
52 web_frame ? RenderFrame::FromWebFrame(web_frame) : NULL; 66 web_frame ? RenderFrame::FromWebFrame(web_frame) : NULL;
53 output_device_ = AudioDeviceFactory::NewOutputDevice( 67 output_device_ = AudioDeviceFactory::NewOutputDevice(
54 render_frame ? render_frame->GetRoutingID(): MSG_ROUTING_NONE); 68 render_frame ? render_frame->GetRoutingID(): MSG_ROUTING_NONE);
55 output_device_->InitializeWithSessionId(params_, this, session_id_); 69 output_device_->InitializeWithSessionId(params_, this, session_id_);
56 output_device_->Start(); 70 output_device_->Start();
57 // Note: Default behavior is to auto-play on start. 71 // Note: Default behavior is to auto-play on start.
58 } 72 }
59 73
60 void RendererWebAudioDeviceImpl::stop() { 74 void RendererWebAudioDeviceImpl::stop() {
61 DCHECK(thread_checker_.CalledOnValidThread()); 75 DCHECK(thread_checker_.CalledOnValidThread());
62 76
63 if (output_device_.get()) { 77 if (output_device_) {
64 output_device_->Stop(); 78 output_device_->Stop();
65 output_device_ = NULL; 79 output_device_ = NULL;
66 } 80 }
81 is_using_null_audio_sink_ = false;
DaleCurtis 2015/06/23 16:38:14 Move this below the Stop() since Render() may be i
qinmin 2015/06/23 18:15:57 Done.
82 null_audio_sink_->Stop();
83 is_first_buffer_after_silence_ = false;
84 start_null_audio_sink_callback_.Cancel();
85 start_null_audio_sink_callback_.Reset(
DaleCurtis 2015/06/23 16:38:14 Just call Reset() during ::start() and only call C
qinmin 2015/06/23 18:15:57 Done.
86 base::Bind(&media::NullAudioSink::Play, null_audio_sink_));
67 } 87 }
68 88
69 double RendererWebAudioDeviceImpl::sampleRate() { 89 double RendererWebAudioDeviceImpl::sampleRate() {
70 return params_.sample_rate(); 90 return params_.sample_rate();
71 } 91 }
72 92
73 int RendererWebAudioDeviceImpl::Render(media::AudioBus* dest, 93 int RendererWebAudioDeviceImpl::Render(media::AudioBus* dest,
74 int audio_delay_milliseconds) { 94 int audio_delay_milliseconds) {
75 if (client_callback_) { 95 if (client_callback_) {
DaleCurtis 2015/06/23 16:38:14 Looks like this can never be null, can you remove
qinmin 2015/06/23 18:15:57 Done.
96 #if defined(OS_ANDROID)
97 if (is_first_buffer_after_silence_) {
98 DCHECK(!is_using_null_audio_sink_);
99 first_buffer_after_silence_->CopyTo(dest);
100 is_first_buffer_after_silence_ = false;
101 return dest->frames();
102 }
103 #endif
76 // Wrap the output pointers using WebVector. 104 // Wrap the output pointers using WebVector.
77 WebVector<float*> web_audio_dest_data( 105 WebVector<float*> web_audio_dest_data(
78 static_cast<size_t>(dest->channels())); 106 static_cast<size_t>(dest->channels()));
79 for (int i = 0; i < dest->channels(); ++i) 107 for (int i = 0; i < dest->channels(); ++i)
80 web_audio_dest_data[i] = dest->channel(i); 108 web_audio_dest_data[i] = dest->channel(i);
81 109
82 // TODO(xians): Remove the following |web_audio_source_data| after 110 // TODO(xians): Remove the following |web_audio_source_data| after
83 // changing the blink interface. 111 // changing the blink interface.
84 WebVector<float*> web_audio_source_data(static_cast<size_t>(0)); 112 WebVector<float*> web_audio_source_data(static_cast<size_t>(0));
85 client_callback_->render(web_audio_source_data, 113 client_callback_->render(web_audio_source_data,
86 web_audio_dest_data, 114 web_audio_dest_data,
87 dest->frames()); 115 dest->frames());
88 } 116 }
89 117
118 #if defined(OS_ANDROID)
119 const bool is_zero = dest->AreFramesZero();
120 if (!is_zero) {
121 first_silence_time_ = base::TimeTicks();
122 if (is_using_null_audio_sink_) {
123 // This is called on the main render thread when audio is detected.
124 output_device_->Play();
125 is_using_null_audio_sink_ = false;
126 is_first_buffer_after_silence_ = true;
127 dest->CopyTo(first_buffer_after_silence_.get());
128 task_runner_->PostTask(
129 FROM_HERE,
130 base::Bind(&media::NullAudioSink::Stop, null_audio_sink_));
131 }
132 } else if (!is_using_null_audio_sink_) {
133 // Called on the audio device thread.
134 const base::TimeTicks now = base::TimeTicks::Now();
135 if (first_silence_time_.is_null())
136 first_silence_time_ = now;
137 if (now - first_silence_time_
138 > base::TimeDelta::FromSeconds(kSilenceInSecondsToEnterIdleMode)) {
139 output_device_->Pause();
140 is_using_null_audio_sink_ = true;
141 // If Stop() is called right after the task is posted, need to cancel
142 // this task.
143 task_runner_->PostDelayedTask(
144 FROM_HERE,
145 start_null_audio_sink_callback_.callback(),
146 params_.GetBufferDuration());
147 }
148 }
149 #endif
90 return dest->frames(); 150 return dest->frames();
91 } 151 }
92 152
93 void RendererWebAudioDeviceImpl::OnRenderError() { 153 void RendererWebAudioDeviceImpl::OnRenderError() {
94 // TODO(crogers): implement error handling. 154 // TODO(crogers): implement error handling.
95 } 155 }
96 156
97 } // namespace content 157 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/renderer_webaudiodevice_impl.h ('k') | media/base/audio_bus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698