webrtc/media/engine/webrtcvideoengine2.cc - Issue 1811373002: Fix broken CVO header extension

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 1811373002: Fix broken CVO header extension (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 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:

Index: webrtc/media/engine/webrtcvideoengine2.cc

diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc

index e34056d905257371b6f9c0db015f38a3bdcf3a85..2d915d9ed3cf824ac4c7f81d867d0d9529df6ea6 100644

--- a/webrtc/media/engine/webrtcvideoengine2.cc

+++ b/webrtc/media/engine/webrtcvideoengine2.cc

@@ -1800,10 +1800,10 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetSendParameters(

// Set codecs and options.

if (params.codec) {

SetCodec(*params.codec);

- return;

+ recreate_stream = false; // SetCodec has already recreated the stream.

} else if (params.conference_mode && parameters_.codec_settings) {

SetCodec(*parameters_.codec_settings);

- return;

+ recreate_stream = false; // SetCodec has already recreated the stream.

}

if (recreate_stream) {

LOG(LS_INFO)