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

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

Issue 1845673002: Removing `preference` field from `cricket::Codec`. (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index cd05f8e6ff5bbe48c820639f10477c8e88dc3306..14393135678a9df057f2cbf875ecf112e38d6f0c 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -757,9 +757,11 @@ bool WebRtcVideoChannel2::GetChangedSendParameters(
return false;
}
- if (!send_codec_ || supported_codecs.front() != *send_codec_) {
- changed_params->codec =
- rtc::Optional<VideoCodecSettings>(supported_codecs.front());
+ VideoCodecSettings new_codec = supported_codecs.front();
+ // Preference doesn't matter at this point and shouldn't impact comparison.
+ new_codec.codec.preference = 0;
pbos-webrtc 2016/04/04 07:58:58 Can we change VideoCodecSettings instead to not co
+ if (!send_codec_ || new_codec != *send_codec_) {
+ changed_params->codec = rtc::Optional<VideoCodecSettings>(new_codec);
}
// Handle RTP header extensions.
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698