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

Unified Diff: webrtc/pc/mediasession.cc

Issue 2537343003: Removing "crypto_required" from MediaContentDescription. (Closed)
Patch Set: Merge with master and clean up CreateDataChannel Created 4 years 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 | « webrtc/pc/channelmanager_unittest.cc ('k') | webrtc/pc/mediasession_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/mediasession.cc
diff --git a/webrtc/pc/mediasession.cc b/webrtc/pc/mediasession.cc
index fda38dfdffac330dfa47eca0eb39bd78347d2627..2f973deb7f6476a223d2b8713fa66906d18ba777 100644
--- a/webrtc/pc/mediasession.cc
+++ b/webrtc/pc/mediasession.cc
@@ -749,9 +749,6 @@ static bool CreateMediaContentOffer(
MediaContentDescriptionImpl<C>* offer) {
offer->AddCodecs(codecs);
- if (secure_policy == SEC_REQUIRED) {
- offer->set_crypto_required(CT_SDES);
- }
offer->set_rtcp_mux(options.rtcp_mux_enabled);
if (offer->type() == cricket::MEDIA_TYPE_VIDEO) {
offer->set_rtcp_reduced_size(true);
@@ -777,7 +774,7 @@ static bool CreateMediaContentOffer(
}
#endif
- if (offer->crypto_required() == CT_SDES && offer->cryptos().empty()) {
+ if (secure_policy == SEC_REQUIRED && offer->cryptos().empty()) {
return false;
}
return true;
@@ -1068,8 +1065,7 @@ static bool CreateMediaContentAnswer(
}
}
- if (answer->cryptos().empty() &&
- (offer->crypto_required() == CT_SDES || sdes_policy == SEC_REQUIRED)) {
+ if (answer->cryptos().empty() && sdes_policy == SEC_REQUIRED) {
return false;
}
« no previous file with comments | « webrtc/pc/channelmanager_unittest.cc ('k') | webrtc/pc/mediasession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698