| Index: webrtc/media/engine/webrtcvideoengine2.cc
|
| diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
|
| index cd05f8e6ff5bbe48c820639f10477c8e88dc3306..a57fbc7f5d90ffb616b10ce47560a365c9bb8f92 100644
|
| --- a/webrtc/media/engine/webrtcvideoengine2.cc
|
| +++ b/webrtc/media/engine/webrtcvideoengine2.cc
|
| @@ -1693,10 +1693,13 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetOptions(
|
| const VideoOptions& options) {
|
| rtc::CritScope cs(&lock_);
|
|
|
| + VideoOptions old_options = parameters_.options;
|
| parameters_.options.SetAll(options);
|
| // Reconfigure encoder settings on the next frame or stream
|
| - // recreation.
|
| - pending_encoder_reconfiguration_ = true;
|
| + // recreation if the options changed.
|
| + if (parameters_.options != old_options) {
|
| + pending_encoder_reconfiguration_ = true;
|
| + }
|
| }
|
|
|
| webrtc::VideoCodecType CodecTypeFromName(const std::string& name) {
|
|
|