From 4935a2ffdb17da23a2b21957b8e61a493786d703 Mon Sep 17 00:00:00 2001 From: hai007 Date: Wed, 2 Nov 2022 11:59:27 -0700 Subject: [PATCH] Remove usage of deprecated WebRTC APIs PiperOrigin-RevId: 485657180 --- internal/platform/implementation/g3/BUILD | 1 + internal/platform/implementation/g3/webrtc.cc | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/platform/implementation/g3/BUILD b/internal/platform/implementation/g3/BUILD index 242a0e47..9ce7e30d 100644 --- a/internal/platform/implementation/g3/BUILD +++ b/internal/platform/implementation/g3/BUILD @@ -83,6 +83,7 @@ cc_library( "//internal/platform/implementation:comm", "//internal/platform/implementation/shared:count_down_latch", "//internal/proto:credential_cc_proto", + "//third_party/webrtc/files/stable/webrtc/rtc_base:checks", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", diff --git a/internal/platform/implementation/g3/webrtc.cc b/internal/platform/implementation/g3/webrtc.cc index c6bc2387..55da077d 100644 --- a/internal/platform/implementation/g3/webrtc.cc +++ b/internal/platform/implementation/g3/webrtc.cc @@ -18,6 +18,7 @@ #include "internal/platform/medium_environment.h" #include "webrtc/api/task_queue/default_task_queue_factory.h" +#include "webrtc/rtc_base/checks.h" namespace location { namespace nearby { @@ -73,14 +74,16 @@ void WebRtcMedium::CreatePeerConnection( webrtc::CreateDefaultTaskQueueFactory(); factory_dependencies.signaling_thread = signaling_thread.release(); - rtc::scoped_refptr peer_connection = + auto peer_connection_or_error = webrtc::CreateModularPeerConnectionFactory( std::move(factory_dependencies)) - ->CreatePeerConnection(rtc_config, std::move(dependencies)); + ->CreatePeerConnectionOrError(rtc_config, std::move(dependencies)); + RTC_CHECK(peer_connection_or_error.ok()) + << "Failed to create peer connection"; single_thread_executor_.Execute( [&env, callback = std::move(callback), - peer_connection = std::move(peer_connection)]() { + peer_connection = peer_connection_or_error.MoveValue()]() { absl::SleepFor(env.GetPeerConnectionLatency()); callback(peer_connection); });