| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| 11 #include "base/location.h" | 11 #include "base/location.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
| 14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
| 15 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
| 17 #include "content/renderer/media/audio_device_factory.h" | 17 #include "content/renderer/media/audio_device_factory.h" |
| 18 #include "content/renderer/media/media_stream_audio_track.h" | 18 #include "content/renderer/media/media_stream_audio_track.h" |
| 19 #include "content/renderer/media/webrtc/peer_connection_remote_audio_source.h" | 19 #include "content/renderer/media/webrtc/peer_connection_remote_audio_source.h" |
| 20 #include "content/renderer/media/webrtc_logging.h" | 20 #include "content/renderer/media/webrtc_logging.h" |
| 21 #include "media/audio/sample_rates.h" | 21 #include "media/audio/sample_rates.h" |
| 22 #include "media/base/audio_capturer_source.h" | 22 #include "media/base/audio_capturer_source.h" |
| 23 #include "media/base/audio_parameters.h" | 23 #include "media/base/audio_parameters.h" |
| 24 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" | 24 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" |
| 25 #include "third_party/webrtc/api/mediastreaminterface.h" | 25 #include "third_party/webrtc/api/mediastreaminterface.h" |
| 26 #include "third_party/webrtc/media/base/audiorenderer.h" | |
| 27 | 26 |
| 28 #if defined(OS_WIN) | 27 #if defined(OS_WIN) |
| 29 #include "base/win/windows_version.h" | 28 #include "base/win/windows_version.h" |
| 30 #include "media/audio/win/core_audio_util_win.h" | 29 #include "media/audio/win/core_audio_util_win.h" |
| 31 #endif | 30 #endif |
| 32 | 31 |
| 33 namespace content { | 32 namespace content { |
| 34 | 33 |
| 35 namespace { | 34 namespace { |
| 36 | 35 |
| (...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 678 base::Bind(&WebRtcAudioRenderer::SourceCallback, | 677 base::Bind(&WebRtcAudioRenderer::SourceCallback, |
| 679 base::Unretained(this)))); | 678 base::Unretained(this)))); |
| 680 } | 679 } |
| 681 sink_params_ = new_sink_params; | 680 sink_params_ = new_sink_params; |
| 682 } | 681 } |
| 683 | 682 |
| 684 sink_->Initialize(new_sink_params, this); | 683 sink_->Initialize(new_sink_params, this); |
| 685 } | 684 } |
| 686 | 685 |
| 687 } // namespace content | 686 } // namespace content |
| OLD | NEW |