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

Side by Side Diff: webrtc/audio/audio_receive_stream.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 | « webrtc/audio/audio_receive_stream.h ('k') | webrtc/audio/audio_send_stream.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 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/audio/audio_receive_stream.h" 11 #include "webrtc/audio/audio_receive_stream.h"
12 12
13 #include <string> 13 #include <string>
14 #include <utility> 14 #include <utility>
15 15
16 #include "webrtc/api/call/audio_sink.h" 16 #include "webrtc/api/call/audio_sink.h"
17 #include "webrtc/audio/audio_send_stream.h" 17 #include "webrtc/audio/audio_send_stream.h"
18 #include "webrtc/audio/audio_state.h" 18 #include "webrtc/audio/audio_state.h"
19 #include "webrtc/audio/conversion.h" 19 #include "webrtc/audio/conversion.h"
20 #include "webrtc/base/checks.h"
21 #include "webrtc/base/logging.h"
22 #include "webrtc/base/timeutils.h"
23 #include "webrtc/call/rtp_stream_receiver_controller_interface.h" 20 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
24 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h" 21 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h"
25 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" 22 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
26 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
24 #include "webrtc/rtc_base/checks.h"
25 #include "webrtc/rtc_base/logging.h"
26 #include "webrtc/rtc_base/timeutils.h"
27 #include "webrtc/voice_engine/channel_proxy.h" 27 #include "webrtc/voice_engine/channel_proxy.h"
28 #include "webrtc/voice_engine/include/voe_base.h" 28 #include "webrtc/voice_engine/include/voe_base.h"
29 #include "webrtc/voice_engine/voice_engine_impl.h" 29 #include "webrtc/voice_engine/voice_engine_impl.h"
30 30
31 namespace webrtc { 31 namespace webrtc {
32 32
33 std::string AudioReceiveStream::Config::Rtp::ToString() const { 33 std::string AudioReceiveStream::Config::Rtp::ToString() const {
34 std::stringstream ss; 34 std::stringstream ss;
35 ss << "{remote_ssrc: " << remote_ssrc; 35 ss << "{remote_ssrc: " << remote_ssrc;
36 ss << ", local_ssrc: " << local_ssrc; 36 ss << ", local_ssrc: " << local_ssrc;
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) { 339 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) {
340 ScopedVoEInterface<VoEBase> base(voice_engine()); 340 ScopedVoEInterface<VoEBase> base(voice_engine());
341 if (playout) { 341 if (playout) {
342 return base->StartPlayout(config_.voe_channel_id); 342 return base->StartPlayout(config_.voe_channel_id);
343 } else { 343 } else {
344 return base->StopPlayout(config_.voe_channel_id); 344 return base->StopPlayout(config_.voe_channel_id);
345 } 345 }
346 } 346 }
347 } // namespace internal 347 } // namespace internal
348 } // namespace webrtc 348 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream.h ('k') | webrtc/audio/audio_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698