Skip to content

Commit 481a740

Browse files
davidliudavidliu
committed
format
1 parent 6a63354 commit 481a740

File tree

8 files changed

+155
-88
lines changed

8 files changed

+155
-88
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ jobs:
2929
- uses: jidicula/clang-format-action@v4.15.0
3030
with:
3131
clang-format-version: '17'
32+
check-path: ${{ matrix.path }}
3233
include-regex: '^.*(\.h|\.m|\.java)'

‎android/src/main/java/com/oney/WebRTCModule/CameraCaptureController.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
import androidx.annotation.Nullable;
99
import androidx.core.util.Consumer;
1010

11-
import androidx.annotation.Nullable;
12-
import androidx.core.util.Consumer;
13-
1411
import com.facebook.react.bridge.ReadableMap;
1512
import com.facebook.react.bridge.WritableMap;
1613

‎android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ public WebRTCModule(ReactApplicationContext reactContext) {
9191
String fieldTrials = options.fieldTrials;
9292

9393
PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(reactContext)
94-
.setFieldTrials(fieldTrials)
95-
.setNativeLibraryLoader(new LibraryLoader())
96-
.setInjectableLogger(injectableLogger, loggingSeverity)
97-
.createInitializationOptions());
94+
.setFieldTrials(fieldTrials)
95+
.setNativeLibraryLoader(new LibraryLoader())
96+
.setInjectableLogger(injectableLogger, loggingSeverity)
97+
.createInitializationOptions());
9898

9999
if (injectableLogger == null && loggingSeverity != null) {
100100
Logging.enableLogToDebugOutput(loggingSeverity);

‎ios/RCTWebRTC/WebRTCModule+Permissions.m

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ - (AVMediaType)avMediaType:(NSString *)mediaType {
1919
}
2020
}
2121

22-
RCT_EXPORT_METHOD(checkPermission : (NSString *)mediaType resolver : (RCTPromiseResolveBlock)
23-
resolve rejecter : (RCTPromiseRejectBlock)reject) {
22+
RCT_EXPORT_METHOD(checkPermission
23+
: (NSString *)mediaType resolver
24+
: (RCTPromiseResolveBlock)resolve rejecter
25+
: (RCTPromiseRejectBlock)reject) {
2426
#if TARGET_OS_TV
2527
resolve(@"tvOS is not supported");
2628
return;
@@ -48,8 +50,10 @@ - (AVMediaType)avMediaType:(NSString *)mediaType {
4850
#endif
4951
}
5052

51-
RCT_EXPORT_METHOD(requestPermission : (NSString *)mediaType resolver : (RCTPromiseResolveBlock)
52-
resolve rejecter : (RCTPromiseRejectBlock)reject) {
53+
RCT_EXPORT_METHOD(requestPermission
54+
: (NSString *)mediaType resolver
55+
: (RCTPromiseResolveBlock)resolve rejecter
56+
: (RCTPromiseRejectBlock)reject) {
5357
#if TARGET_OS_TV
5458
resolve(@"tvOS is not supported");
5559
return;

‎ios/RCTWebRTC/WebRTCModule+RTCDataChannel.m

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ @implementation WebRTCModule (RTCDataChannel)
1414
* Thuis methos is implemented synchronously since we need to create the DataChannel on the spot
1515
* and where is no good way to report an error at creation time.
1616
*/
17-
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(createDataChannel : (nonnull NSNumber *)peerConnectionId label : (NSString *)
18-
label config : (RTCDataChannelConfiguration *)config) {
17+
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(createDataChannel
18+
: (nonnull NSNumber *)peerConnectionId label
19+
: (NSString *)label config
20+
: (RTCDataChannelConfiguration *)config) {
1921
__block id channelInfo;
2022

2123
dispatch_sync(self.workerQueue, ^{
@@ -57,35 +59,42 @@ @implementation WebRTCModule (RTCDataChannel)
5759
return channelInfo;
5860
}
5961

60-
RCT_EXPORT_METHOD(dataChannelClose : (nonnull NSNumber *)peerConnectionId reactTag : (nonnull NSString *)tag {
61-
RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
62-
DataChannelWrapper *dcw = peerConnection.dataChannels[tag];
63-
if (dcw) {
64-
[dcw.channel close];
65-
}
66-
})
67-
68-
RCT_EXPORT_METHOD(dataChannelDispose : (nonnull NSNumber *)peerConnectionId reactTag : (nonnull NSString *)tag {
69-
RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
70-
DataChannelWrapper *dcw = peerConnection.dataChannels[tag];
71-
if (dcw) {
72-
dcw.delegate = nil;
73-
[peerConnection.dataChannels removeObjectForKey:tag];
74-
}
75-
})
76-
77-
RCT_EXPORT_METHOD(dataChannelSend : (nonnull NSNumber *)peerConnectionId reactTag : (nonnull NSString *)
78-
tag data : (NSString *)data type : (NSString *)type {
79-
RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
80-
DataChannelWrapper *dcw = peerConnection.dataChannels[tag];
81-
if (dcw) {
82-
BOOL isBinary = [type isEqualToString:@"binary"];
83-
NSData *bytes = isBinary ? [[NSData alloc] initWithBase64EncodedString:data options:0]
84-
: [data dataUsingEncoding:NSUTF8StringEncoding];
85-
RTCDataBuffer *buffer = [[RTCDataBuffer alloc] initWithData:bytes isBinary:isBinary];
86-
[dcw.channel sendData:buffer];
87-
}
88-
})
62+
RCT_EXPORT_METHOD(dataChannelClose
63+
: (nonnull NSNumber *)peerConnectionId reactTag
64+
: (nonnull NSString *)tag {
65+
RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
66+
DataChannelWrapper *dcw = peerConnection.dataChannels[tag];
67+
if (dcw) {
68+
[dcw.channel close];
69+
}
70+
})
71+
72+
RCT_EXPORT_METHOD(dataChannelDispose
73+
: (nonnull NSNumber *)peerConnectionId reactTag
74+
: (nonnull NSString *)tag {
75+
RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
76+
DataChannelWrapper *dcw = peerConnection.dataChannels[tag];
77+
if (dcw) {
78+
dcw.delegate = nil;
79+
[peerConnection.dataChannels removeObjectForKey:tag];
80+
}
81+
})
82+
83+
RCT_EXPORT_METHOD(dataChannelSend
84+
: (nonnull NSNumber *)peerConnectionId reactTag
85+
: (nonnull NSString *)tag data
86+
: (NSString *)data type
87+
: (NSString *)type {
88+
RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
89+
DataChannelWrapper *dcw = peerConnection.dataChannels[tag];
90+
if (dcw) {
91+
BOOL isBinary = [type isEqualToString:@"binary"];
92+
NSData *bytes = isBinary ? [[NSData alloc] initWithBase64EncodedString:data options:0]
93+
: [data dataUsingEncoding:NSUTF8StringEncoding];
94+
RTCDataBuffer *buffer = [[RTCDataBuffer alloc] initWithData:bytes isBinary:isBinary];
95+
[dcw.channel sendData:buffer];
96+
}
97+
})
8998

9099
- (NSString *)stringForDataChannelState:(RTCDataChannelState)state {
91100
switch (state) {

‎ios/RCTWebRTC/WebRTCModule+RTCMediaStream.m

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,10 @@ - (RTCVideoTrack *)createScreenCaptureVideoTrack {
224224
* if audio permission was not granted, there will be no "audio" key in
225225
* the constraints dictionary.
226226
*/
227-
RCT_EXPORT_METHOD(getUserMedia : (NSDictionary *)constraints successCallback : (RCTResponseSenderBlock)
228-
successCallback errorCallback : (RCTResponseSenderBlock)errorCallback) {
227+
RCT_EXPORT_METHOD(getUserMedia
228+
: (NSDictionary *)constraints successCallback
229+
: (RCTResponseSenderBlock)successCallback errorCallback
230+
: (RCTResponseSenderBlock)errorCallback) {
229231
#if TARGET_OS_TV
230232
errorCallback(@[ @"PlatformNotSupported", @"getUserMedia is not supported on tvOS." ]);
231233
return;
@@ -363,8 +365,10 @@ - (RTCVideoTrack *)createScreenCaptureVideoTrack {
363365
self.localStreams[streamID] = mediaStream;
364366
}
365367

366-
RCT_EXPORT_METHOD(mediaStreamAddTrack : (nonnull NSString *)streamID : (nonnull NSNumber *)pcId : (nonnull NSString *)
367-
trackID) {
368+
RCT_EXPORT_METHOD(mediaStreamAddTrack
369+
: (nonnull NSString *)streamID
370+
: (nonnull NSNumber *)pcId
371+
: (nonnull NSString *)trackID) {
368372
RTCMediaStream *mediaStream = self.localStreams[streamID];
369373
if (mediaStream == nil) {
370374
return;
@@ -382,8 +386,10 @@ - (RTCVideoTrack *)createScreenCaptureVideoTrack {
382386
}
383387
}
384388

385-
RCT_EXPORT_METHOD(mediaStreamRemoveTrack : (nonnull NSString *)streamID : (nonnull NSNumber *)
386-
pcId : (nonnull NSString *)trackID) {
389+
RCT_EXPORT_METHOD(mediaStreamRemoveTrack
390+
: (nonnull NSString *)streamID
391+
: (nonnull NSNumber *)pcId
392+
: (nonnull NSString *)trackID) {
387393
RTCMediaStream *mediaStream = self.localStreams[streamID];
388394
if (mediaStream == nil) {
389395
return;
@@ -440,8 +446,11 @@ - (RTCVideoTrack *)createScreenCaptureVideoTrack {
440446
#endif
441447
}
442448

443-
RCT_EXPORT_METHOD(mediaStreamTrackApplyConstraints : (nonnull NSString *)trackID : (NSDictionary *)
444-
constraints : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject) {
449+
RCT_EXPORT_METHOD(mediaStreamTrackApplyConstraints
450+
: (nonnull NSString *)trackID
451+
: (NSDictionary *)constraints
452+
: (RCTPromiseResolveBlock)resolve
453+
: (RCTPromiseRejectBlock)reject) {
445454
#if TARGET_OS_TV
446455
reject(@"unsupported_platform", @"tvOS is not supported", nil);
447456
return;
@@ -479,8 +488,9 @@ - (RTCVideoTrack *)createScreenCaptureVideoTrack {
479488
}
480489
}
481490

482-
RCT_EXPORT_METHOD(mediaStreamTrackSetVideoEffects : (nonnull NSString *)trackID names : (nonnull NSArray<NSString *> *)
483-
names) {
491+
RCT_EXPORT_METHOD(mediaStreamTrackSetVideoEffects
492+
: (nonnull NSString *)trackID names
493+
: (nonnull NSArray<NSString *> *)names) {
484494
RTCMediaStreamTrack *track = self.localTracks[trackID];
485495
if (track == nil) {
486496
return;

‎ios/RCTWebRTC/WebRTCModule+RTCPeerConnection.m

Lines changed: 55 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
126126
* This method is synchronous and blocking. This is done so we can implement createDataChannel
127127
* in the same way (synchronous) since the peer connection needs to exist before.
128128
*/
129-
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(peerConnectionInit : (RTCConfiguration *)
130-
configuration objectID : (nonnull NSNumber *)objectID) {
129+
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(peerConnectionInit
130+
: (RTCConfiguration *)configuration objectID
131+
: (nonnull NSNumber *)objectID) {
131132
__block BOOL ret = YES;
132133

133134
dispatch_sync(self.workerQueue, ^{
@@ -154,17 +155,21 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
154155
return @(ret);
155156
}
156157

157-
RCT_EXPORT_METHOD(peerConnectionSetConfiguration : (RTCConfiguration *)configuration objectID : (nonnull NSNumber *)
158-
objectID) {
158+
RCT_EXPORT_METHOD(peerConnectionSetConfiguration
159+
: (RTCConfiguration *)configuration objectID
160+
: (nonnull NSNumber *)objectID) {
159161
RTCPeerConnection *peerConnection = self.peerConnections[objectID];
160162
if (!peerConnection) {
161163
return;
162164
}
163165
[peerConnection setConfiguration:configuration];
164166
}
165167

166-
RCT_EXPORT_METHOD(peerConnectionCreateOffer : (nonnull NSNumber *)objectID options : (NSDictionary *)
167-
options resolver : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
168+
RCT_EXPORT_METHOD(peerConnectionCreateOffer
169+
: (nonnull NSNumber *)objectID options
170+
: (NSDictionary *)options resolver
171+
: (RCTPromiseResolveBlock)resolve rejecter
172+
: (RCTPromiseRejectBlock)reject) {
168173
RTCPeerConnection *peerConnection = self.peerConnections[objectID];
169174
if (!peerConnection) {
170175
reject(@"E_INVALID", @"PeerConnection not found", nil);
@@ -208,8 +213,11 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
208213
[peerConnection offerForConstraints:constraints completionHandler:handler];
209214
}
210215

211-
RCT_EXPORT_METHOD(peerConnectionCreateAnswer : (nonnull NSNumber *)objectID options : (NSDictionary *)
212-
options resolver : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
216+
RCT_EXPORT_METHOD(peerConnectionCreateAnswer
217+
: (nonnull NSNumber *)objectID options
218+
: (NSDictionary *)options resolver
219+
: (RCTPromiseResolveBlock)resolve rejecter
220+
: (RCTPromiseRejectBlock)reject) {
213221
RTCPeerConnection *peerConnection = self.peerConnections[objectID];
214222
if (!peerConnection) {
215223
reject(@"E_INVALID", @"PeerConnection not found", nil);
@@ -237,8 +245,11 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
237245
[peerConnection answerForConstraints:constraints completionHandler:handler];
238246
}
239247

240-
RCT_EXPORT_METHOD(peerConnectionSetLocalDescription : (nonnull NSNumber *)objectID desc : (RTCSessionDescription *)
241-
desc resolver : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
248+
RCT_EXPORT_METHOD(peerConnectionSetLocalDescription
249+
: (nonnull NSNumber *)objectID desc
250+
: (RTCSessionDescription *)desc resolver
251+
: (RCTPromiseResolveBlock)resolve rejecter
252+
: (RCTPromiseRejectBlock)reject) {
242253
RTCPeerConnection *peerConnection = self.peerConnections[objectID];
243254
if (!peerConnection) {
244255
reject(@"E_INVALID", @"PeerConnection not found", nil);
@@ -273,8 +284,11 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
273284
}
274285
}
275286

276-
RCT_EXPORT_METHOD(peerConnectionSetRemoteDescription : (nonnull NSNumber *)objectID desc : (RTCSessionDescription *)
277-
desc resolver : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
287+
RCT_EXPORT_METHOD(peerConnectionSetRemoteDescription
288+
: (nonnull NSNumber *)objectID desc
289+
: (RTCSessionDescription *)desc resolver
290+
: (RCTPromiseResolveBlock)resolve rejecter
291+
: (RCTPromiseRejectBlock)reject) {
278292
RTCPeerConnection *peerConnection = self.peerConnections[objectID];
279293
if (!peerConnection) {
280294
reject(@"E_INVALID", @"PeerConnection not found", nil);
@@ -322,8 +336,11 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
322336
[peerConnection setRemoteDescription:desc completionHandler:handler];
323337
}
324338

325-
RCT_EXPORT_METHOD(peerConnectionAddICECandidate : (nonnull NSNumber *)objectID candidate : (RTCIceCandidate *)
326-
candidate resolver : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
339+
RCT_EXPORT_METHOD(peerConnectionAddICECandidate
340+
: (nonnull NSNumber *)objectID candidate
341+
: (RTCIceCandidate *)candidate resolver
342+
: (RCTPromiseResolveBlock)resolve rejecter
343+
: (RCTPromiseRejectBlock)reject) {
327344
RTCPeerConnection *peerConnection = self.peerConnections[objectID];
328345
if (!peerConnection) {
329346
reject(@"E_INVALID", @"PeerConnection not found", nil);
@@ -384,8 +401,10 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
384401
[self.peerConnections removeObjectForKey:objectID];
385402
}
386403

387-
RCT_EXPORT_METHOD(peerConnectionGetStats : (nonnull NSNumber *)objectID resolver : (RCTPromiseResolveBlock)
388-
resolve rejecter : (RCTPromiseRejectBlock)reject) {
404+
RCT_EXPORT_METHOD(peerConnectionGetStats
405+
: (nonnull NSNumber *)objectID resolver
406+
: (RCTPromiseResolveBlock)resolve rejecter
407+
: (RCTPromiseRejectBlock)reject) {
389408
RTCPeerConnection *peerConnection = self.peerConnections[objectID];
390409
if (!peerConnection) {
391410
RCTLogWarn(@"PeerConnection %@ not found in peerConnectionGetStats()", objectID);
@@ -398,8 +417,11 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
398417
}];
399418
}
400419

401-
RCT_EXPORT_METHOD(receiverGetStats : (nonnull NSNumber *)pcId receiverId : (nonnull NSString *)
402-
receiverId resolver : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
420+
RCT_EXPORT_METHOD(receiverGetStats
421+
: (nonnull NSNumber *)pcId receiverId
422+
: (nonnull NSString *)receiverId resolver
423+
: (RCTPromiseResolveBlock)resolve rejecter
424+
: (RCTPromiseRejectBlock)reject) {
403425
RTCPeerConnection *peerConnection = self.peerConnections[pcId];
404426
if (!peerConnection) {
405427
RCTLogWarn(@"PeerConnection %@ not found in receiverGetStats()", pcId);
@@ -427,8 +449,11 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
427449
}];
428450
}
429451

430-
RCT_EXPORT_METHOD(senderGetStats : (nonnull NSNumber *)pcId senderId : (nonnull NSString *)
431-
senderId resolver : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
452+
RCT_EXPORT_METHOD(senderGetStats
453+
: (nonnull NSNumber *)pcId senderId
454+
: (nonnull NSString *)senderId resolver
455+
: (RCTPromiseResolveBlock)resolve rejecter
456+
: (RCTPromiseRejectBlock)reject) {
432457
RTCPeerConnection *peerConnection = self.peerConnections[pcId];
433458
if (!peerConnection) {
434459
RCTLogWarn(@"PeerConnection %@ not found in senderGetStats()", pcId);
@@ -465,8 +490,10 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
465490
[peerConnection restartIce];
466491
}
467492

468-
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(peerConnectionAddTrack : (nonnull NSNumber *)objectID trackId : (NSString *)
469-
trackId options : (NSDictionary *)options) {
493+
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(peerConnectionAddTrack
494+
: (nonnull NSNumber *)objectID trackId
495+
: (NSString *)trackId options
496+
: (NSDictionary *)options) {
470497
__block id params = nil;
471498

472499
dispatch_sync(self.workerQueue, ^{
@@ -504,8 +531,9 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
504531
return params;
505532
}
506533

507-
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(peerConnectionAddTransceiver : (nonnull NSNumber *)
508-
objectID options : (NSDictionary *)options) {
534+
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(peerConnectionAddTransceiver
535+
: (nonnull NSNumber *)objectID options
536+
: (NSDictionary *)options) {
509537
__block id params = nil;
510538

511539
dispatch_sync(self.workerQueue, ^{
@@ -561,8 +589,9 @@ - (nullable RTCRtpTransceiver *)getTransceiverByPeerConnectionId:(nonnull NSNumb
561589
return params;
562590
}
563591

564-
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(peerConnectionRemoveTrack : (nonnull NSNumber *)
565-
objectID senderId : (nonnull NSString *)senderId) {
592+
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(peerConnectionRemoveTrack
593+
: (nonnull NSNumber *)objectID senderId
594+
: (nonnull NSString *)senderId) {
566595
__block BOOL ret = NO;
567596

568597
dispatch_sync(self.workerQueue, ^{

0 commit comments

Comments
 (0)