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

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

Issue 1438183002: Change default SSRC for RTCP receiver reports to not collide with video. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: removed comment Created 5 years, 1 month 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 | no next file » | 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 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 bool nack_enabled_ = false; 308 bool nack_enabled_ = false;
309 bool playout_ = false; 309 bool playout_ = false;
310 SendFlags desired_send_ = SEND_NOTHING; 310 SendFlags desired_send_ = SEND_NOTHING;
311 SendFlags send_ = SEND_NOTHING; 311 SendFlags send_ = SEND_NOTHING;
312 webrtc::Call* const call_ = nullptr; 312 webrtc::Call* const call_ = nullptr;
313 313
314 // SSRC of unsignalled receive stream, or -1 if there isn't one. 314 // SSRC of unsignalled receive stream, or -1 if there isn't one.
315 int64_t default_recv_ssrc_ = -1; 315 int64_t default_recv_ssrc_ = -1;
316 // Volume for unsignalled stream, which may be set before the stream exists. 316 // Volume for unsignalled stream, which may be set before the stream exists.
317 double default_recv_volume_ = 1.0; 317 double default_recv_volume_ = 1.0;
318 // SSRC to use for RTCP receiver reports; default to 1 in case of no signaled 318 // Default SSRC to use for RTCP receiver reports in case of no signaled
319 // send streams. See: https://code.google.com/p/webrtc/issues/detail?id=4740 319 // send streams. See: https://code.google.com/p/webrtc/issues/detail?id=4740
320 uint32_t receiver_reports_ssrc_ = 1; 320 // and https://code.google.com/p/chromium/issues/detail?id=547661
321 uint32_t receiver_reports_ssrc_ = 0xFA17FA17u;
pthatcher1 2015/11/12 20:46:40 Sorry for being late to the bug. Changing the RR
321 322
322 class WebRtcAudioSendStream; 323 class WebRtcAudioSendStream;
323 std::map<uint32_t, WebRtcAudioSendStream*> send_streams_; 324 std::map<uint32_t, WebRtcAudioSendStream*> send_streams_;
324 std::vector<RtpHeaderExtension> send_extensions_; 325 std::vector<RtpHeaderExtension> send_extensions_;
325 326
326 class WebRtcAudioReceiveStream; 327 class WebRtcAudioReceiveStream;
327 std::map<uint32_t, WebRtcAudioReceiveStream*> receive_channels_; 328 std::map<uint32_t, WebRtcAudioReceiveStream*> receive_channels_;
328 std::map<uint32_t, webrtc::AudioReceiveStream*> receive_streams_; 329 std::map<uint32_t, webrtc::AudioReceiveStream*> receive_streams_;
329 std::map<uint32_t, StreamParams> receive_stream_params_; 330 std::map<uint32_t, StreamParams> receive_stream_params_;
330 // receive_channels_ can be read from WebRtc callback thread. Access from 331 // receive_channels_ can be read from WebRtc callback thread. Access from
331 // the WebRtc thread must be synchronized with edits on the worker thread. 332 // the WebRtc thread must be synchronized with edits on the worker thread.
332 // Reads on the worker thread are ok. 333 // Reads on the worker thread are ok.
333 std::vector<RtpHeaderExtension> receive_extensions_; 334 std::vector<RtpHeaderExtension> receive_extensions_;
334 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 335 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
335 336
336 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); 337 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel);
337 }; 338 };
338 } // namespace cricket 339 } // namespace cricket
339 340
340 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 341 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698