webrtc/media/engine/webrtcvideoengine2.cc - Issue 2246313002: If encoding is inactive, don't start sending when stream is reconfigured.

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 2246313002: If encoding is inactive, don't start sending when stream is reconfigured. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Making a test assertion better (don't compare pointer addresses). Created 4 years, 3 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 side-by-side diff with in-line comments

Download patch

Index: webrtc/media/engine/webrtcvideoengine2.cc

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

index b72c4aae747e34488b7f6892535dbeb7624651a9..f053776dea9c724f70e6aed0d0d59eba0808e565 100644

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

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

@@ -2246,9 +2246,8 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::RecreateWebRtcStream() {

parameters_.encoder_config.encoder_specific_settings = NULL;

pending_encoder_reconfiguration_ = false;

- if (sending_) {

- stream_->Start();

- }

+ // Call stream_->Start() if necessary conditions are met.

+ UpdateSendState();

}

WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream(

« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »