OLD | NEW |
---|---|
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 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 } | 44 } |
45 ss << ']'; | 45 ss << ']'; |
46 ss << '}'; | 46 ss << '}'; |
47 return ss.str(); | 47 return ss.str(); |
48 } | 48 } |
49 | 49 |
50 std::string AudioReceiveStream::Config::ToString() const { | 50 std::string AudioReceiveStream::Config::ToString() const { |
51 std::stringstream ss; | 51 std::stringstream ss; |
52 ss << "{rtp: " << rtp.ToString(); | 52 ss << "{rtp: " << rtp.ToString(); |
53 ss << ", rtcp_send_transport: " | 53 ss << ", rtcp_send_transport: " |
54 << (rtcp_send_transport ? "(Transport)" : "nullptr"); | 54 << (rtcp_send_transport ? "(Transport)" : "null"); |
tommi
2017/02/11 09:55:34
in cases like these, I think we should not change
Taylor Brandstetter
2017/02/11 17:48:56
I agree; the script I wrote will use "null" in str
| |
55 ss << ", voe_channel_id: " << voe_channel_id; | 55 ss << ", voe_channel_id: " << voe_channel_id; |
56 if (!sync_group.empty()) { | 56 if (!sync_group.empty()) { |
57 ss << ", sync_group: " << sync_group; | 57 ss << ", sync_group: " << sync_group; |
58 } | 58 } |
59 ss << '}'; | 59 ss << '}'; |
60 return ss.str(); | 60 return ss.str(); |
61 } | 61 } |
62 | 62 |
63 namespace internal { | 63 namespace internal { |
64 AudioReceiveStream::AudioReceiveStream( | 64 AudioReceiveStream::AudioReceiveStream( |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
332 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) { | 332 int AudioReceiveStream::SetVoiceEnginePlayout(bool playout) { |
333 ScopedVoEInterface<VoEBase> base(voice_engine()); | 333 ScopedVoEInterface<VoEBase> base(voice_engine()); |
334 if (playout) { | 334 if (playout) { |
335 return base->StartPlayout(config_.voe_channel_id); | 335 return base->StartPlayout(config_.voe_channel_id); |
336 } else { | 336 } else { |
337 return base->StopPlayout(config_.voe_channel_id); | 337 return base->StopPlayout(config_.voe_channel_id); |
338 } | 338 } |
339 } | 339 } |
340 } // namespace internal | 340 } // namespace internal |
341 } // namespace webrtc | 341 } // namespace webrtc |
OLD | NEW |