Chromium Code Reviews| Index: webrtc/media/engine/webrtcvideoengine2.cc |
| diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc |
| index 9e36697a6155b2c68ad355d89b892639b12488a5..96c60f93d1e4f09b666c548154566bbcdfaa4f24 100644 |
| --- a/webrtc/media/engine/webrtcvideoengine2.cc |
| +++ b/webrtc/media/engine/webrtcvideoengine2.cc |
| @@ -1560,6 +1560,11 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::WebRtcVideoSendStream( |
| sp.GetPrimarySsrcs(¶meters_.config.rtp.ssrcs); |
| + // ValidateStreamParams should prevent this from happening. |
| + RTC_CHECK(!parameters_.config.rtp.ssrcs.empty()); |
|
pthatcher1
2016/12/14 19:01:38
This might happen down the road when we support MI
Taylor Brandstetter
2016/12/15 00:04:26
When that change occurs, we can update this RTC_CH
|
| + rtp_parameters_.encodings[0].ssrc = |
| + rtc::Optional<uint32_t>(parameters_.config.rtp.ssrcs[0]); |
| + |
| // RTX. |
| sp.GetFidSsrcs(parameters_.config.rtp.ssrcs, |
| ¶meters_.config.rtp.rtx.ssrcs); |
| @@ -1862,11 +1867,16 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::GetRtpParameters() const { |
| bool WebRtcVideoChannel2::WebRtcVideoSendStream::ValidateRtpParameters( |
| const webrtc::RtpParameters& rtp_parameters) { |
| + RTC_DCHECK_RUN_ON(&thread_checker_); |
| if (rtp_parameters.encodings.size() != 1) { |
| LOG(LS_ERROR) |
| << "Attempted to set RtpParameters without exactly one encoding"; |
| return false; |
| } |
| + if (rtp_parameters.encodings[0].ssrc != rtp_parameters_.encodings[0].ssrc) { |
| + LOG(LS_ERROR) << "Attempted to set RtpParameters with modified SSRC"; |
|
pthatcher1
2016/12/14 19:01:38
You might as well use a for-loop here that will be
|
| + return false; |
| + } |
| return true; |
| } |