From 6b9302eb5958b8848d502ed4801788a9be7a5754 Mon Sep 17 00:00:00 2001 From: Tommi Date: Fri, 22 Jul 2022 10:50:42 +0200 Subject: [PATCH] Remove handling in SetRecvParameters that's dead code. `stream_` will always be non-null when SetRecvParameters is called. For the flexfec stream, the condition won't happen since `IsCompleteAndEnabled` doesn't consider `rtp.extension` state. As is, this code just adds apparent complexity to SetRecvParameters. Bug: none Change-Id: Ie2386905bd8a338669629c7bc5f0abb39bd36d22 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/269245 Reviewed-by: Danil Chapovalov Commit-Queue: Danil Chapovalov Auto-Submit: Tomas Gunnarsson Cr-Commit-Position: refs/heads/main@{#37597} --- media/engine/webrtc_video_engine.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index 199d005a10..b449d5e9c4 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -3043,6 +3043,7 @@ void WebRtcVideoChannel::WebRtcVideoReceiveStream::SetFeedbackParameters( void WebRtcVideoChannel::WebRtcVideoReceiveStream::SetRecvParameters( const ChangedRecvParameters& params) { + RTC_DCHECK(stream_); bool video_needs_recreation = false; if (params.codec_settings) { video_needs_recreation = ConfigureCodecs(*params.codec_settings); @@ -3051,19 +3052,13 @@ void WebRtcVideoChannel::WebRtcVideoReceiveStream::SetRecvParameters( if (params.rtp_header_extensions) { if (config_.rtp.extensions != *params.rtp_header_extensions) { config_.rtp.extensions = *params.rtp_header_extensions; - if (stream_) { - stream_->SetRtpExtensions(config_.rtp.extensions); - } else { - video_needs_recreation = true; - } + stream_->SetRtpExtensions(config_.rtp.extensions); } if (flexfec_config_.rtp.extensions != *params.rtp_header_extensions) { flexfec_config_.rtp.extensions = *params.rtp_header_extensions; if (flexfec_stream_) { flexfec_stream_->SetRtpExtensions(flexfec_config_.rtp.extensions); - } else if (flexfec_config_.IsCompleteAndEnabled()) { - video_needs_recreation = true; } } }