-
Notifications
You must be signed in to change notification settings - Fork 216
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release-v0.6.11'
- Loading branch information
Showing
15 changed files
with
988 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| Copyright 2016 OpenMarket Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| /** | ||
| Autamatic wrapper enabling. | ||
| The code of this wrapper is enabled only if the Xcode workspace contains the header files | ||
| of libjingle. | ||
| That means that MXJingleCallStack will be automatically built if the application that uses | ||
| MatrixSDK embeds libjingle. | ||
| The application can use the libjingle build pod provided by pristine.io at | ||
| https://github.com/pristineio/webrtc-build-scripts: | ||
| pod 'libjingle_peerconnection' | ||
| */ | ||
|
|
||
| #if __has_include("RTCPeerConnection.h") | ||
| #define MX_CALL_STACK_JINGLE | ||
| #endif | ||
|
|
||
| #ifdef MX_CALL_STACK_JINGLE | ||
|
|
||
| #import "MXCallStack.h" | ||
|
|
||
| /** | ||
| `MXJingleCallStack` is the implementation of the `MXCallStack` protocol using | ||
| libjingle. | ||
| @see https://developers.google.com/talk/libjingle/developer_guide | ||
| */ | ||
| @interface MXJingleCallStack : NSObject <MXCallStack> | ||
|
|
||
| @end | ||
|
|
||
| #endif // MX_CALL_STACK_JINGLE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| Copyright 2016 OpenMarket Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| #import "MXJingleCallStack.h" | ||
|
|
||
| #ifdef MX_CALL_STACK_JINGLE | ||
|
|
||
| #import "MXJingleCallStackCall.h" | ||
|
|
||
| #import "RTCPeerConnectionFactory.h" | ||
|
|
||
| @interface MXJingleCallStack () | ||
| { | ||
| RTCPeerConnectionFactory *peerConnectionFactory; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @implementation MXJingleCallStack | ||
|
|
||
| - (instancetype)init | ||
| { | ||
| self = [super init]; | ||
| if (self) | ||
| { | ||
| [RTCPeerConnectionFactory initializeSSL]; | ||
|
|
||
| peerConnectionFactory = [[RTCPeerConnectionFactory alloc] init]; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (id<MXCallStackCall>)createCall | ||
| { | ||
| return [[MXJingleCallStackCall alloc] initWithFactory:peerConnectionFactory]; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| #endif // MX_CALL_STACK_JINGLE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| Copyright 2016 OpenMarket Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| #import "MXJingleCallStack.h" | ||
|
|
||
| #ifdef MX_CALL_STACK_JINGLE | ||
|
|
||
| #import "MXCallStackCall.h" | ||
|
|
||
| #import "RTCPeerConnectionDelegate.h" | ||
| #import "RTCSessionDescriptionDelegate.h" | ||
|
|
||
| @class RTCPeerConnectionFactory; | ||
|
|
||
| /** | ||
| `MXJingleCallStack` is the implementation of the `MXCallStack` protocol using | ||
| the WebRTC part of jingle. | ||
| @see https://developers.google.com/talk/libjingle/developer_guide | ||
| */ | ||
| @interface MXJingleCallStackCall : NSObject <MXCallStackCall, RTCPeerConnectionDelegate, RTCSessionDescriptionDelegate> | ||
|
|
||
| - (instancetype)initWithFactory:(RTCPeerConnectionFactory*)factory; | ||
|
|
||
| @end | ||
|
|
||
| #endif // MX_CALL_STACK_JINGLE |
Oops, something went wrong.