| OLD | NEW |
| 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/webrtc_local_audio_track.h" | 5 #include "content/renderer/media/webrtc_local_audio_track.h" |
| 6 | 6 |
| 7 #include "content/public/renderer/media_stream_audio_sink.h" | 7 #include "content/public/renderer/media_stream_audio_sink.h" |
| 8 #include "content/renderer/media/media_stream_audio_level_calculator.h" | 8 #include "content/renderer/media/media_stream_audio_level_calculator.h" |
| 9 #include "content/renderer/media/media_stream_audio_processor.h" | 9 #include "content/renderer/media/media_stream_audio_processor.h" |
| 10 #include "content/renderer/media/media_stream_audio_sink_owner.h" | 10 #include "content/renderer/media/media_stream_audio_sink_owner.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 35 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
| 36 DVLOG(1) << "WebRtcLocalAudioTrack::~WebRtcLocalAudioTrack()"; | 36 DVLOG(1) << "WebRtcLocalAudioTrack::~WebRtcLocalAudioTrack()"; |
| 37 // Users might not call Stop() on the track. | 37 // Users might not call Stop() on the track. |
| 38 Stop(); | 38 Stop(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 void WebRtcLocalAudioTrack::Capture(const int16* audio_data, | 41 void WebRtcLocalAudioTrack::Capture(const int16* audio_data, |
| 42 base::TimeDelta delay, | 42 base::TimeDelta delay, |
| 43 int volume, | 43 int volume, |
| 44 bool key_pressed, | 44 bool key_pressed, |
| 45 bool need_audio_processing) { | 45 bool need_audio_processing, |
| 46 bool force_report_nonzero_energy) { |
| 46 DCHECK(capture_thread_checker_.CalledOnValidThread()); | 47 DCHECK(capture_thread_checker_.CalledOnValidThread()); |
| 47 | 48 |
| 48 // Calculate the signal level regardless if the track is disabled or enabled. | 49 // Calculate the signal level regardless if the track is disabled or enabled. |
| 49 int signal_level = level_calculator_->Calculate( | 50 int signal_level = level_calculator_->Calculate( |
| 50 audio_data, audio_parameters_.channels(), | 51 audio_data, audio_parameters_.channels(), |
| 51 audio_parameters_.frames_per_buffer()); | 52 audio_parameters_.frames_per_buffer(), force_report_nonzero_energy); |
| 52 adapter_->SetSignalLevel(signal_level); | 53 adapter_->SetSignalLevel(signal_level); |
| 53 | 54 |
| 54 scoped_refptr<WebRtcAudioCapturer> capturer; | 55 scoped_refptr<WebRtcAudioCapturer> capturer; |
| 55 SinkList::ItemList sinks; | 56 SinkList::ItemList sinks; |
| 56 SinkList::ItemList sinks_to_notify_format; | 57 SinkList::ItemList sinks_to_notify_format; |
| 57 { | 58 { |
| 58 base::AutoLock auto_lock(lock_); | 59 base::AutoLock auto_lock(lock_); |
| 59 capturer = capturer_; | 60 capturer = capturer_; |
| 60 sinks = sinks_.Items(); | 61 sinks = sinks_.Items(); |
| 61 sinks_.RetrieveAndClearTags(&sinks_to_notify_format); | 62 sinks_.RetrieveAndClearTags(&sinks_to_notify_format); |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 | 243 |
| 243 for (SinkList::ItemList::const_iterator it = sinks.begin(); | 244 for (SinkList::ItemList::const_iterator it = sinks.begin(); |
| 244 it != sinks.end(); | 245 it != sinks.end(); |
| 245 ++it){ | 246 ++it){ |
| 246 (*it)->OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded); | 247 (*it)->OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded); |
| 247 (*it)->Reset(); | 248 (*it)->Reset(); |
| 248 } | 249 } |
| 249 } | 250 } |
| 250 | 251 |
| 251 } // namespace content | 252 } // namespace content |
| OLD | NEW |