8000 fixed merge bugs · coder-wuyan/flutter-webrtc@096b2bc · GitHub
[go: up one dir, main page]
Skip to content

Commit 096b2bc

Browse files
yonatannyonatann
committed
fixed merge bugs
1 parent 45a68fc commit 096b2bc

File tree

4 files changed

+38
-45
lines changed

4 files changed

+38
-45
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ example/ios/Pods/Local Podspecs/
3131
example/ios/Runner/GeneratedPluginRegistrant.h
3232
example/ios/Runner/GeneratedPluginRegistrant.m
3333
example/ios/Runner.xcworkspace/xcuserdata/
34+
example/android/.project

‎ios/Classes/FlutterWebRTCPlugin.m

Lines changed: 34 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -440,47 +440,39 @@ - (void)handleMethodCall:(FlutterMethodCall *)call
440440
details:nil]);
441441
}
442442
result(nil);
443-
} else if ([@"mediaStreamRemoveTrack" isEqualToString:call.method]) {
444-
NSDictionary *argsMap = call.arguments;
445-
NSString *streamId = argsMap[@"streamId"];
446-
NSString *trackId = argsMap[@"trackId"];
447-
RTCMediaStream *stream = self.localStreams[streamId];
448-
if (stream) {
449-
RTCMediaStreamTrack *track = self.localTracks[trackId];
450-
if (track != nil) {
451-
if ([track isKindOfClass:[RTCAudioTrack class]]) {
452-
RTCAudioTrack *audioTrack = (RTCAudioTrack *)track;
453-
[stream removeAudioTrack:audioTrack];
454-
} else if ([track isKindOfClass:[RTCVideoTrack class]]) {
455-
RTCVideoTrack *videoTrack = (RTCVideoTrack *)track;
456-
[stream removeVideoTrack:videoTrack];
457-
}
458-
} else if([@"setConfiguration" isEqualToString:call.method]){
459-
NSDictionary* argsMap = call.arguments;
460-
NSString* peerConnectionId = argsMap[@"peerConnectionId"];
461-
NSDictionary* configuration = argsMap[@"configuration"];
462-
RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
463-
if(peerConnection) {
464-
[self peerConnectionSetConfiguration:[self RTCConfiguration:configuration] peerConnection:peerConnection];
465-
result(nil);
466-
} else {
467-
result([FlutterError errorWithCode:[NSString stringWithFormat:@"%@Failed",call.method]
468-
message:[NSString stringWithFormat:@"Error: peerConnection not found!"]
469-
details:nil]);
470< 10000 span class="diff-text-marker">-
}
471-
} else if([@"startRecordToFile" isEqualToString:call.method]){
472-
NSDictionary* argsMap = call.arguments;
473-
NSString* path = argsMap[@"path"];
474-
NSNumber* audioChannel = argsMap[@"audioChannel"];
475-
476-
flutterRTCAudioRecorder = [[FlutterRTCAudioRecorder alloc] initWithPath:path];
477-
result(nil);
478-
} else if([@"stopRecordToFile" isEqualToString:call.method]){
479-
if (flutterRTCAudioRecorder != nil) {
480-
[flutterRTCAudioRecorder stop:^(bool flag) {
481-
result([NSNumber numberWithBool:(BOOL)flag]);
482-
}];
483-
}
443+
} else if ([@"mediaStreamRemoveTrack" isEqualToString:call.method]){
444+
NSDictionary* argsMap = call.arguments;
445+
NSString* streamId = argsMap[@"streamId"];
446+
NSString* trackId = argsMap[@"trackId"];
447+
RTCMediaStream *stream = self.localStreams[streamId];
448+
if (stream) {
449+
RTCMediaStreamTrack *track = self.localTracks[trackId];
450+
if(track != nil) {
451+
if([track isKindOfClass:[RTCAudioTrack class]]) {
452+
RTCAudioTrack *audioTrack = (RTCAudioTrack *)track;
453+
[stream removeAudioTrack:audioTrack];
454+
} else if ([track isKindOfClass:[RTCVideoTrack class]]){
455+
RTCVideoTrack *videoTrack = (RTCVideoTrack *)track;
456+
[stream removeVideoTrack:videoTrack];
457+
}
458+
} else {
459+
result([FlutterError errorWithCode:@"mediaStreamRemoveTrack: Track is nil" message:nil details:nil]);
460+
}
461+
} else {
462+
result([FlutterError errorWithCode:@"mediaStreamRemoveTrack: Stream is nil" message:nil details:nil]);
463+
}
464+
result(nil);
465+
} else if([@"startRecordToFile" isEqualToString:call.method]){
466+
NSDictionary* argsMap = call.arguments;
467+
NSString* path = argsMap[@"path"];
468+
469+
flutterRTCAudioRecorder = [[FlutterRTCAudioRecorder alloc] initWithPath:path];
470+
result(nil);
471+
} else if([@"stopRecordToFile" isEqualToString:call.method]){
472+
if (flutterRTCAudioRecorder != nil) {
473+
[flutterRTCAudioRecorder stop:^(bool flag) {
474+
result([NSNumber numberWithBool:(BOOL)flag]);
475+
}];
484476
} else {
485477
result([FlutterError
486478
errorWithCode:@"mediaStreamRemoveTrack: Stream is nil"
@@ -688,7 +680,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call
688680
}
689681
}
690682

691-
- (void)dealloc {
683+
- (void) dealloc {
692684
[_localTracks removeAllObjects];
693685
_localTracks = nil;
694686
[_localStreams removeAllObjects];

‎lib/media_stream.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ class MediaStream {
9191
/// private: method.
9292
void _setMediaTracks(List<dynamic> audioTracks, List<dynamic> videoTracks) {
9393
List<MediaStreamTrack> newAudioTracks = new List();
94-
audioTracks.forEach((trackInfo) {
94+
(audioTracks ?? []).forEach((trackInfo) {
9595
newAudioTracks.add(MediaStreamTrack.fromMap(trackInfo));
9696
});
9797
_audioTracks = newAudioTracks;
9898
List<MediaStreamTrack> newVideoTracks = new List();
99-
videoTracks.forEach((trackInfo) {
99+
(videoTracks ?? []).forEach((trackInfo) {
100100
newVideoTracks.add(MediaStreamTrack.fromMap(trackInfo));
101101
});
102102
_videoTracks = newVideoTracks;

‎lib/rtc_peerconnection.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ class RTCPeerConnection {
410410

411411
Future<bool> closeSender(RTCRtpSender sender) async {
412412
try {
413-
final Map<dynamic, dynamic> response = await _methodChannel.invokeMethod(
413+
final Map<dynamic, dynamic> response = await _channel.invokeMethod(
414414
'closeSender', <String, dynamic>{
415415
'peerConnectionId': this._peerConnectionId,
416416
'senderId': sender.senderId

0 commit comments

Comments
 (0)
0