Avoid creating a new description and converting

Author: jim-signal

pc/media_session.cc

@@ -1222,10 +1222,6 @@ RTCError MediaSessionDescriptionFactory::AddRtpContentForOffer(
   } else {
     content_description = std::make_unique<VideoContentDescription>();
   }
-  // RingRTC: Allow out-of-band / "manual" key negotiation.
-  if (manually_specify_keys()) {
-    content_description->set_manually_specify_keys(true);
-  }
 
   // RFC 8888 support.
   content_description->set_rtcp_fb_ack_ccfb(
@@ -1404,11 +1400,6 @@ RTCError MediaSessionDescriptionFactory::AddRtpContentForAnswer(
     answer_content = std::make_unique<VideoContentDescription>();
   }
 
-  // RingRTC: Allow out-of-band / "manual" key negotiation.
-  if (manually_specify_keys()) {
-    answer_content->set_manually_specify_keys(true);
-  }
-
   // RFC 8888 support. Only answer with "ack ccfb" if offer has it and
   // experiment is enabled.
   if (offer_content_description->rtcp_fb_ack_ccfb()) {

ringrtc/rffi/src/sdp_observer.cc

@@ -28,18 +28,7 @@ void CreateSessionDescriptionObserverRffi::OnSuccess(
     SessionDescriptionInterface* session_description) {
   // OnSuccess transfers ownership of the description
   RTC_LOG(LS_INFO) << "CreateSessionDescriptionObserverRffi:OnSuccess(): ";
-
-  std::string sdp;
-  if (session_description->ToString(&sdp)) {
-    std::unique_ptr<SessionDescriptionInterface> session_description2 =
-        CreateSessionDescription(session_description->GetType(), sdp);
-    delete session_description;
-    this->csd_observer_cbs_.onSuccess(this->csd_observer_,
-                                      session_description2.release());
-  } else {
-    RTC_LOG(LS_ERROR)
-        << "Unable to convert SessionDescriptionInterface to std::string";
-  }
+  this->csd_observer_cbs_.onSuccess(this->csd_observer_, session_description);
 }
 
 void CreateSessionDescriptionObserverRffi::OnFailure(RTCError error) {