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_audio_renderer.h" | 5 #include "content/renderer/media/webrtc_audio_renderer.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
11 #include "content/renderer/media/audio_device_factory.h" | 11 #include "content/renderer/media/audio_device_factory.h" |
| 12 #include "content/renderer/media/media_stream_audio_track.h" |
12 #include "content/renderer/media/media_stream_dispatcher.h" | 13 #include "content/renderer/media/media_stream_dispatcher.h" |
13 #include "content/renderer/media/media_stream_track.h" | 14 #include "content/renderer/media/media_stream_track.h" |
14 #include "content/renderer/media/webrtc_audio_device_impl.h" | 15 #include "content/renderer/media/webrtc_audio_device_impl.h" |
15 #include "content/renderer/media/webrtc_logging.h" | 16 #include "content/renderer/media/webrtc_logging.h" |
16 #include "content/renderer/render_frame_impl.h" | 17 #include "content/renderer/render_frame_impl.h" |
17 #include "media/audio/audio_output_device.h" | 18 #include "media/audio/audio_output_device.h" |
18 #include "media/audio/audio_parameters.h" | 19 #include "media/audio/audio_parameters.h" |
19 #include "media/audio/sample_rates.h" | 20 #include "media/audio/sample_rates.h" |
20 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" | 21 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" |
21 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" | 22 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" |
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 } | 548 } |
548 | 549 |
549 void WebRtcAudioRenderer::OnPlayStateChanged( | 550 void WebRtcAudioRenderer::OnPlayStateChanged( |
550 const blink::WebMediaStream& media_stream, | 551 const blink::WebMediaStream& media_stream, |
551 PlayingState* state) { | 552 PlayingState* state) { |
552 DCHECK(thread_checker_.CalledOnValidThread()); | 553 DCHECK(thread_checker_.CalledOnValidThread()); |
553 blink::WebVector<blink::WebMediaStreamTrack> web_tracks; | 554 blink::WebVector<blink::WebMediaStreamTrack> web_tracks; |
554 media_stream.audioTracks(web_tracks); | 555 media_stream.audioTracks(web_tracks); |
555 | 556 |
556 for (const blink::WebMediaStreamTrack& web_track : web_tracks) { | 557 for (const blink::WebMediaStreamTrack& web_track : web_tracks) { |
557 MediaStreamTrack* track = MediaStreamTrack::GetTrack(web_track); | 558 MediaStreamAudioTrack* track = MediaStreamAudioTrack::GetTrack(web_track); |
558 // WebRtcAudioRenderer can only render audio tracks received from a remote | 559 // WebRtcAudioRenderer can only render audio tracks received from a remote |
559 // peer. Since the actual MediaStream is mutable from JavaScript, we need | 560 // peer. Since the actual MediaStream is mutable from JavaScript, we need |
560 // to make sure |web_track| is actually a remote track. | 561 // to make sure |web_track| is actually a remote track. |
561 if (track->is_local_track()) | 562 if (track->is_local_track()) |
562 continue; | 563 continue; |
563 webrtc::AudioSourceInterface* source = | 564 webrtc::AudioSourceInterface* source = |
564 track->GetAudioAdapter()->GetSource(); | 565 track->GetAudioAdapter()->GetSource(); |
565 DCHECK(source); | 566 DCHECK(source); |
566 if (!state->playing()) { | 567 if (!state->playing()) { |
567 if (RemovePlayingState(source, state)) | 568 if (RemovePlayingState(source, state)) |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 sink_params_ = new_sink_params; | 649 sink_params_ = new_sink_params; |
649 fifo_delay_milliseconds_ = new_fifo_delay_milliseconds; | 650 fifo_delay_milliseconds_ = new_fifo_delay_milliseconds; |
650 if (new_audio_fifo.get()) | 651 if (new_audio_fifo.get()) |
651 audio_fifo_ = new_audio_fifo.Pass(); | 652 audio_fifo_ = new_audio_fifo.Pass(); |
652 } | 653 } |
653 | 654 |
654 sink_->Initialize(new_sink_params, this); | 655 sink_->Initialize(new_sink_params, this); |
655 } | 656 } |
656 | 657 |
657 } // namespace content | 658 } // namespace content |
OLD | NEW |