Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 1870283002: Don't reconfigure the encoder if the video options aren't changing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@50
Patch Set: Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 1650 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 } 1661 }
1662 1662
1663 const std::vector<uint32_t>& 1663 const std::vector<uint32_t>&
1664 WebRtcVideoChannel2::WebRtcVideoSendStream::GetSsrcs() const { 1664 WebRtcVideoChannel2::WebRtcVideoSendStream::GetSsrcs() const {
1665 return ssrcs_; 1665 return ssrcs_;
1666 } 1666 }
1667 1667
1668 void WebRtcVideoChannel2::WebRtcVideoSendStream::SetOptions( 1668 void WebRtcVideoChannel2::WebRtcVideoSendStream::SetOptions(
1669 const VideoOptions& options) { 1669 const VideoOptions& options) {
1670 rtc::CritScope cs(&lock_); 1670 rtc::CritScope cs(&lock_);
1671
1672 VideoOptions old_options = parameters_.options;
1673 parameters_.options.SetAll(options);
1674 // No need to do anything if the options aren't changing.
1675 if (parameters_.options == old_options) {
1676 return;
1677 }
1678
1671 if (parameters_.codec_settings) { 1679 if (parameters_.codec_settings) {
1672 LOG(LS_INFO) << "SetCodecAndOptions because of SetOptions; options=" 1680 LOG(LS_INFO) << "SetCodecAndOptions because of SetOptions; options="
1673 << options.ToString(); 1681 << options.ToString();
1674 SetCodecAndOptions(*parameters_.codec_settings, options); 1682 SetCodecAndOptions(*parameters_.codec_settings, options);
1675 } else { 1683 } else {
1676 parameters_.options = options; 1684 parameters_.options = options;
1677 } 1685 }
1678 } 1686 }
1679 1687
1680 webrtc::VideoCodecType CodecTypeFromName(const std::string& name) { 1688 webrtc::VideoCodecType CodecTypeFromName(const std::string& name) {
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
2504 rtx_mapping[video_codecs[i].codec.id] != 2512 rtx_mapping[video_codecs[i].codec.id] !=
2505 fec_settings.red_payload_type) { 2513 fec_settings.red_payload_type) {
2506 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2514 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2507 } 2515 }
2508 } 2516 }
2509 2517
2510 return video_codecs; 2518 return video_codecs;
2511 } 2519 }
2512 2520
2513 } // namespace cricket 2521 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.cc ('k') | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698