Implement JNI and objc implementation for icecandidateerror event
This CL adds the callback on ICE Candidate Error to the Android and the iOS SDKs. Spec: https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-onicecandidateerror Bug: webrtc:13446 Change-Id: I6e511aaa80f1aa8f4310d8518d1144d97470cd7e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/239460 Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35531}
This commit is contained in:
committed by
WebRTC LUCI CQ
parent
63b97de330
commit
d211098392
@ -0,0 +1,26 @@
|
||||
/*
|
||||
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#import "RTCIceCandidateErrorEvent.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface RTC_OBJC_TYPE (RTCIceCandidateErrorEvent)
|
||||
()
|
||||
|
||||
- (instancetype)initWithAddress : (const std::string&)address port : (const int)port url
|
||||
: (const std::string&)url errorCode : (const int)errorCode errorText
|
||||
: (const std::string&)errorText;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
42
sdk/objc/api/peerconnection/RTCIceCandidateErrorEvent.h
Normal file
42
sdk/objc/api/peerconnection/RTCIceCandidateErrorEvent.h
Normal file
@ -0,0 +1,42 @@
|
||||
/*
|
||||
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#import "RTCMacros.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
RTC_OBJC_EXPORT
|
||||
@interface RTC_OBJC_TYPE (RTCIceCandidateErrorEvent) : NSObject
|
||||
|
||||
/** The local IP address used to communicate with the STUN or TURN server. */
|
||||
@property(nonatomic, readonly) NSString *address;
|
||||
|
||||
/** The port used to communicate with the STUN or TURN server. */
|
||||
@property(nonatomic, readonly) int port;
|
||||
|
||||
/** The STUN or TURN URL that identifies the STUN or TURN server for which the failure occurred. */
|
||||
@property(nonatomic, readonly) NSString *url;
|
||||
|
||||
/** The numeric STUN error code returned by the STUN or TURN server. If no host candidate can reach
|
||||
* the server, errorCode will be set to the value 701 which is outside the STUN error code range.
|
||||
* This error is only fired once per server URL while in the RTCIceGatheringState of "gathering". */
|
||||
@property(nonatomic, readonly) int errorCode;
|
||||
|
||||
/** The STUN reason text returned by the STUN or TURN server. If the server could not be reached,
|
||||
* errorText will be set to an implementation-specific value providing details about the error. */
|
||||
@property(nonatomic, readonly) NSString *errorText;
|
||||
|
||||
- (instancetype)init NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
42
sdk/objc/api/peerconnection/RTCIceCandidateErrorEvent.mm
Normal file
42
sdk/objc/api/peerconnection/RTCIceCandidateErrorEvent.mm
Normal file
@ -0,0 +1,42 @@
|
||||
/*
|
||||
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#import "RTCIceCandidateErrorEvent+Private.h"
|
||||
|
||||
#import "helpers/NSString+StdString.h"
|
||||
|
||||
@implementation RTC_OBJC_TYPE (RTCIceCandidateErrorEvent)
|
||||
|
||||
@synthesize address = _address;
|
||||
@synthesize port = _port;
|
||||
@synthesize url = _url;
|
||||
@synthesize errorCode = _errorCode;
|
||||
@synthesize errorText = _errorText;
|
||||
|
||||
- (instancetype)init {
|
||||
return [super init];
|
||||
}
|
||||
|
||||
- (instancetype)initWithAddress:(const std::string&)address
|
||||
port:(const int)port
|
||||
url:(const std::string&)url
|
||||
errorCode:(const int)errorCode
|
||||
errorText:(const std::string&)errorText {
|
||||
if (self = [self init]) {
|
||||
_address = [NSString stringForStdString:address];
|
||||
_port = port;
|
||||
_url = [NSString stringForStdString:url];
|
||||
_errorCode = errorCode;
|
||||
_errorText = [NSString stringForStdString:errorText];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
@end
|
||||
@ -48,6 +48,12 @@ class PeerConnectionDelegateAdapter : public PeerConnectionObserver {
|
||||
|
||||
void OnIceCandidate(const IceCandidateInterface *candidate) override;
|
||||
|
||||
void OnIceCandidateError(const std::string &address,
|
||||
int port,
|
||||
const std::string &url,
|
||||
int error_code,
|
||||
const std::string &error_text) override;
|
||||
|
||||
void OnIceCandidatesRemoved(const std::vector<cricket::Candidate> &candidates) override;
|
||||
|
||||
void OnIceSelectedCandidatePairChanged(const cricket::CandidatePairChangeEvent &event) override;
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
@class RTC_OBJC_TYPE(RTCDataChannel);
|
||||
@class RTC_OBJC_TYPE(RTCDataChannelConfiguration);
|
||||
@class RTC_OBJC_TYPE(RTCIceCandidate);
|
||||
@class RTC_OBJC_TYPE(RTCIceCandidateErrorEvent);
|
||||
@class RTC_OBJC_TYPE(RTCMediaConstraints);
|
||||
@class RTC_OBJC_TYPE(RTCMediaStream);
|
||||
@class RTC_OBJC_TYPE(RTCMediaStreamTrack);
|
||||
@ -164,6 +165,10 @@ RTC_OBJC_EXPORT
|
||||
lastReceivedMs:(int)lastDataReceivedMs
|
||||
changeReason:(NSString *)reason;
|
||||
|
||||
/** Called when gathering of an ICE candidate failed. */
|
||||
- (void)peerConnection:(RTC_OBJC_TYPE(RTCPeerConnection) *)peerConnection
|
||||
didFailToGatherIceCandidate:(RTC_OBJC_TYPE(RTCIceCandidateErrorEvent) *)event;
|
||||
|
||||
@end
|
||||
|
||||
RTC_OBJC_EXPORT
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
#import "RTCConfiguration+Private.h"
|
||||
#import "RTCDataChannel+Private.h"
|
||||
#import "RTCIceCandidate+Private.h"
|
||||
#import "RTCIceCandidateErrorEvent+Private.h"
|
||||
#import "RTCLegacyStatsReport+Private.h"
|
||||
#import "RTCMediaConstraints+Private.h"
|
||||
#import "RTCMediaStream+Private.h"
|
||||
@ -226,6 +227,21 @@ void PeerConnectionDelegateAdapter::OnIceCandidate(
|
||||
didGenerateIceCandidate:iceCandidate];
|
||||
}
|
||||
|
||||
void PeerConnectionDelegateAdapter::OnIceCandidateError(const std::string &address,
|
||||
int port,
|
||||
const std::string &url,
|
||||
int error_code,
|
||||
const std::string &error_text) {
|
||||
RTC_OBJC_TYPE(RTCPeerConnection) *peer_connection = peer_connection_;
|
||||
RTC_OBJC_TYPE(RTCIceCandidateErrorEvent) *event =
|
||||
[[RTC_OBJC_TYPE(RTCIceCandidateErrorEvent) alloc] initWithAddress:address
|
||||
port:port
|
||||
url:url
|
||||
errorCode:error_code
|
||||
errorText:error_text];
|
||||
[peer_connection.delegate peerConnection:peer_connection didFailToGatherIceCandidate:event];
|
||||
}
|
||||
|
||||
void PeerConnectionDelegateAdapter::OnIceCandidatesRemoved(
|
||||
const std::vector<cricket::Candidate>& candidates) {
|
||||
NSMutableArray* ice_candidates =
|
||||
|
||||
Reference in New Issue
Block a user