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

Unified Diff: webrtc/ortc/ortcfactory.cc

Issue 2714813004: Create the SrtpTransportInterface. (Closed)
Patch Set: Use rtc::Optional for SRTP send and receive keys. Created 3 years, 10 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 | « webrtc/ortc/ortcfactory.h ('k') | webrtc/ortc/ortcfactory_integrationtest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/ortc/ortcfactory.cc
diff --git a/webrtc/ortc/ortcfactory.cc b/webrtc/ortc/ortcfactory.cc
index c0d54d16f05d43d57c92d5b6a8526026f6c73b4f..8af61918afe283f31214b0a186e37de0eb5bcc6b 100644
--- a/webrtc/ortc/ortcfactory.cc
+++ b/webrtc/ortc/ortcfactory.cc
@@ -11,11 +11,11 @@
#include "webrtc/ortc/ortcfactory.h"
#include <sstream>
-#include <vector>
#include <utility> // For std::move.
+#include <vector>
-#include "webrtc/api/proxy.h"
#include "webrtc/api/mediastreamtrackproxy.h"
+#include "webrtc/api/proxy.h"
#include "webrtc/api/rtcerror.h"
#include "webrtc/api/videosourceproxy.h"
#include "webrtc/base/asyncpacketsocket.h"
@@ -33,9 +33,9 @@
#include "webrtc/ortc/rtptransportcontrolleradapter.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/udptransport.h"
+#include "webrtc/pc/audiotrack.h"
#include "webrtc/pc/channelmanager.h"
#include "webrtc/pc/localaudiosource.h"
-#include "webrtc/pc/audiotrack.h"
#include "webrtc/pc/videocapturertracksource.h"
#include "webrtc/pc/videotrack.h"
@@ -78,6 +78,14 @@ PROXY_METHOD4(RTCErrorOr<std::unique_ptr<RtpTransportInterface>>,
PacketTransportInterface*,
PacketTransportInterface*,
RtpTransportControllerInterface*)
+
+PROXY_METHOD4(RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>,
+ CreateSrtpTransport,
+ const RtcpParameters&,
+ PacketTransportInterface*,
+ PacketTransportInterface*,
+ RtpTransportControllerInterface*)
+
PROXY_CONSTMETHOD1(RtpCapabilities,
GetRtpSenderCapabilities,
cricket::MediaType)
@@ -250,6 +258,43 @@ OrtcFactory::CreateRtpTransport(
}
}
+RTCErrorOr<std::unique_ptr<SrtpTransportInterface>>
+OrtcFactory::CreateSrtpTransport(
+ const RtcpParameters& rtcp_parameters,
+ PacketTransportInterface* rtp,
+ PacketTransportInterface* rtcp,
+ RtpTransportControllerInterface* transport_controller) {
+ RTC_DCHECK_RUN_ON(signaling_thread_);
+ RtcpParameters copied_parameters = rtcp_parameters;
+ if (copied_parameters.cname.empty()) {
+ copied_parameters.cname = default_cname_;
+ }
+ if (transport_controller) {
+ return transport_controller->GetInternal()->CreateProxiedSrtpTransport(
+ copied_parameters, rtp, rtcp);
+ } else {
+ // If |transport_controller| is null, create one automatically, which the
+ // returned SrtpTransport will own.
+ auto controller_result = CreateRtpTransportController();
+ if (!controller_result.ok()) {
+ return controller_result.MoveError();
+ }
+ auto controller = controller_result.MoveValue();
+ auto transport_result =
+ controller->GetInternal()->CreateProxiedSrtpTransport(copied_parameters,
+ rtp, rtcp);
+ // If SrtpTransport was successfully created, transfer ownership of
+ // |rtp_transport_controller|. Otherwise it will go out of scope and be
+ // deleted automatically.
+ if (transport_result.ok()) {
+ transport_result.value()
+ ->GetInternal()
+ ->TakeOwnershipOfRtpTransportController(std::move(controller));
+ }
+ return transport_result;
+ }
+}
+
RtpCapabilities OrtcFactory::GetRtpSenderCapabilities(
cricket::MediaType kind) const {
RTC_DCHECK_RUN_ON(signaling_thread_);
« no previous file with comments | « webrtc/ortc/ortcfactory.h ('k') | webrtc/ortc/ortcfactory_integrationtest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698