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

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

Issue 1928233003: Remove RED support from WebRtcVoiceEngine/MediaChannel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 6 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 | « no previous file | webrtc/audio/audio_send_stream_unittest.cc » ('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
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 ss << '}'; 43 ss << '}';
44 return ss.str(); 44 return ss.str();
45 } 45 }
46 46
47 std::string AudioSendStream::Config::ToString() const { 47 std::string AudioSendStream::Config::ToString() const {
48 std::stringstream ss; 48 std::stringstream ss;
49 ss << "{rtp: " << rtp.ToString(); 49 ss << "{rtp: " << rtp.ToString();
50 ss << ", voe_channel_id: " << voe_channel_id; 50 ss << ", voe_channel_id: " << voe_channel_id;
51 // TODO(solenberg): Encoder config. 51 // TODO(solenberg): Encoder config.
52 ss << ", cng_payload_type: " << cng_payload_type; 52 ss << ", cng_payload_type: " << cng_payload_type;
53 ss << ", red_payload_type: " << red_payload_type;
54 ss << '}'; 53 ss << '}';
55 return ss.str(); 54 return ss.str();
56 } 55 }
57 56
58 namespace internal { 57 namespace internal {
59 AudioSendStream::AudioSendStream( 58 AudioSendStream::AudioSendStream(
60 const webrtc::AudioSendStream::Config& config, 59 const webrtc::AudioSendStream::Config& config,
61 const rtc::scoped_refptr<webrtc::AudioState>& audio_state, 60 const rtc::scoped_refptr<webrtc::AudioState>& audio_state,
62 CongestionController* congestion_controller) 61 CongestionController* congestion_controller)
63 : config_(config), audio_state_(audio_state) { 62 : config_(config), audio_state_(audio_state) {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 224
226 VoiceEngine* AudioSendStream::voice_engine() const { 225 VoiceEngine* AudioSendStream::voice_engine() const {
227 internal::AudioState* audio_state = 226 internal::AudioState* audio_state =
228 static_cast<internal::AudioState*>(audio_state_.get()); 227 static_cast<internal::AudioState*>(audio_state_.get());
229 VoiceEngine* voice_engine = audio_state->voice_engine(); 228 VoiceEngine* voice_engine = audio_state->voice_engine();
230 RTC_DCHECK(voice_engine); 229 RTC_DCHECK(voice_engine);
231 return voice_engine; 230 return voice_engine;
232 } 231 }
233 } // namespace internal 232 } // namespace internal
234 } // namespace webrtc 233 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_send_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698