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

Side by Side Diff: webrtc/media/engine/webrtcvoiceengine.h

Issue 2686043006: WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType (Closed)
Patch Set: Discard packets when updating payload type map Created 3 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 bool ValidateRtpParameters(const webrtc::RtpParameters& parameters); 244 bool ValidateRtpParameters(const webrtc::RtpParameters& parameters);
245 void SetupRecording(); 245 void SetupRecording();
246 // Check if 'ssrc' is an unsignaled stream, and if so mark it as not being 246 // Check if 'ssrc' is an unsignaled stream, and if so mark it as not being
247 // unsignaled anymore (i.e. it is now removed, or signaled), and return true. 247 // unsignaled anymore (i.e. it is now removed, or signaled), and return true.
248 bool MaybeDeregisterUnsignaledRecvStream(uint32_t ssrc); 248 bool MaybeDeregisterUnsignaledRecvStream(uint32_t ssrc);
249 249
250 rtc::ThreadChecker worker_thread_checker_; 250 rtc::ThreadChecker worker_thread_checker_;
251 251
252 WebRtcVoiceEngine* const engine_ = nullptr; 252 WebRtcVoiceEngine* const engine_ = nullptr;
253 std::vector<AudioCodec> send_codecs_; 253 std::vector<AudioCodec> send_codecs_;
254
255 // TODO(kwiberg): decoder_map_ and recv_codecs_ store the exact same
ossu 2017/03/20 17:01:41 In WebRtcVoiceEngine, the ordering of codecs in re
256 // information, in slightly different formats. Eliminate recv_codecs_.
257 std::map<int, webrtc::SdpAudioFormat> decoder_map_;
254 std::vector<AudioCodec> recv_codecs_; 258 std::vector<AudioCodec> recv_codecs_;
259
255 int max_send_bitrate_bps_ = 0; 260 int max_send_bitrate_bps_ = 0;
256 AudioOptions options_; 261 AudioOptions options_;
257 rtc::Optional<int> dtmf_payload_type_; 262 rtc::Optional<int> dtmf_payload_type_;
258 int dtmf_payload_freq_ = -1; 263 int dtmf_payload_freq_ = -1;
259 bool recv_transport_cc_enabled_ = false; 264 bool recv_transport_cc_enabled_ = false;
260 bool recv_nack_enabled_ = false; 265 bool recv_nack_enabled_ = false;
261 bool desired_playout_ = false; 266 bool desired_playout_ = false;
262 bool playout_ = false; 267 bool playout_ = false;
263 bool send_ = false; 268 bool send_ = false;
264 webrtc::Call* const call_ = nullptr; 269 webrtc::Call* const call_ = nullptr;
(...skipping 19 matching lines...) Expand all
284 std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_; 289 std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_;
285 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 290 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
286 291
287 webrtc::AudioSendStream::Config::SendCodecSpec send_codec_spec_; 292 webrtc::AudioSendStream::Config::SendCodecSpec send_codec_spec_;
288 293
289 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); 294 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel);
290 }; 295 };
291 } // namespace cricket 296 } // namespace cricket
292 297
293 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ 298 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698