Skip to content

Commit

Permalink
Version 0.1.2
Browse files Browse the repository at this point in the history
  - adds call and conference statistics collection
  - fixes "cannot disable automatic speaker detection" bug
  • Loading branch information
kapejod committed Nov 12, 2015
1 parent 95e8fc3 commit 59ae591
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 9 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ The inner workings of the AhoyRTC plugin changed recently (from a statically lin

Because some dependencies (included with the AhoyRTC plugin) do not support bitcode (yet), you will need to disable bitcode support for your XCode project when you are using XCode 7+ ("Build Settings" ... "Build Options" ... "Enable Bitcode").

If you are using XCode 7.1 you need to add (including the quotes):
"$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include"
to the "Header Search Path" in "Build Settings" or building an AppStore binary will fail.

## Examples

Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:rim="http://www.blackberry.com/ns/widgets"
id="com.ahoyrtc.cordova"
version="0.1.1">
version="0.1.2">
<name>AhoyRTC SDK cordova plugin</name>
<description>Cordova plugin for the AhoyRTC SDK</description>
<author>Klaus-Peter Junghanns</author>
Expand Down
Binary file modified src/ios/AhoyKit.framework/AhoyKit
Binary file not shown.
2 changes: 2 additions & 0 deletions src/ios/AhoyKit.framework/Headers/AhoyPeerConnectionFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#import "RTCVideoCapturer.h"
#import "RTCAudioTrack.h"
#import "RTCVideoTrack.h"
#import "RTCStatsReport.h"
#import "AhoySDK.h"


Expand All @@ -31,6 +32,7 @@
@property (nonatomic) BOOL isUsingBackCamera;

+ (id)sharedInstance;
+ (void) addStatisticsPair:(RTCPair *)pair toDictionary:(NSMutableDictionary *)dictionary;
+ (NSString *)processSdp:(NSString *)origSDP maxVideoBitrate:(NSNumber *)maxVideoBitrate limitVideoBitrate:(bool)limitVideoBitrate;
+ (NSString *)processSdp:(NSString *)origSDP;
+ (RTCSessionDescription *)descriptionForDescription:(RTCSessionDescription *)description preferredVideoCodec:(NSString *)codec;
Expand Down
16 changes: 15 additions & 1 deletion src/ios/AhoyKit.framework/Headers/AhoySession.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
#import "RTCIceCandidate.h"
#import "RTCSessionDescription.h"
#import "RTCSessionDescriptionDelegate.h"
#import "RTCStatsDelegate.h"
#import "AhoyMediaLayerDelegateProtocol.h"
#import "AhoySessionDelegateProtocol.h"

@interface AhoySession : NSObject <RTCPeerConnectionDelegate, RTCSessionDescriptionDelegate, UIAlertViewDelegate>
@interface AhoySession : NSObject <RTCPeerConnectionDelegate, RTCSessionDescriptionDelegate, RTCStatsDelegate, UIAlertViewDelegate>

@property (nonatomic, weak) id<AhoySessionDelegateProtocol> delegate;
@property (nonatomic, weak) id<AhoyMediaLayerDelegateProtocol> mediaLayerDelegate;
Expand All @@ -32,19 +33,31 @@
@property (nonatomic, strong) NSDictionary *metaData;
@property (nonatomic) BOOL isAudioEnabled;
@property (nonatomic) BOOL isVideoEnabled;
@property (nonatomic) BOOL isTrickleIceEnabled;
@property (nonatomic, strong) UILocalNotification *localNotification;
@property (nonatomic, strong) UIAlertView *alertView;

@property (nonatomic, strong) RTCPeerConnection *peerConnection;
@property (nonatomic, strong) RTCMediaStream *localStream;
@property (nonatomic, strong) RTCMediaStream *remoteStream;
@property (nonatomic, strong) RTCSessionDescription *localDescription;
@property (nonatomic, weak) RTCMediaStreamTrack *localAudioTrack;
@property (nonatomic) int localAudioLostPackets;
@property (nonatomic, weak) RTCMediaStreamTrack *localVideoTrack;
@property (nonatomic) int localVideoLostPackets;
@property (nonatomic) int localVideoMaxBitrate;
@property (nonatomic) int bweAvailableSendBandwidth;
@property (nonatomic) int bweAvailableReceiveBandwidth;
@property (nonatomic) BOOL isBandwidthWarningActive;

@property (nonatomic, strong) RTCSessionDescription *remoteDescription;
@property (nonatomic, strong) NSDictionary *turn;
@property (nonatomic, strong) NSMutableArray *localIceCandidates;
@property (nonatomic, strong) NSMutableArray *pendingIceCandidates;
@property (nonatomic) BOOL isMediaLayerConnected;
@property (nonatomic) BOOL isConnected;
@property (nonatomic) int receivedAcks;
@property (nonatomic, strong) NSTimer *statisticsTimer;

@property (nonatomic, copy) void (^onSetSessionDescriptionCallback)(NSError *error);
@property (nonatomic, copy) void (^onCreateSessionDescriptionCallback)(RTCSessionDescription *description, NSError *error);
Expand All @@ -71,5 +84,6 @@

- (void)terminate;
- (void)hangup;

@end

Binary file modified src/ios/AhoyKit.framework/Info.plist
Binary file not shown.
14 changes: 7 additions & 7 deletions src/ios/AhoyKit.framework/_CodeSignature/CodeResources
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
</data>
<key>Headers/AhoyPeerConnectionFactory.h</key>
<data>
skFmhaRzR2KuW/XR/B4OblHuKDc=
4jQip0QF0yHgFhh6u5g/dAhOfck=
</data>
<key>Headers/AhoySDK.h</key>
<data>
cMI+Wd8r0HfJeSMpkIMjvxWozio=
</data>
<key>Headers/AhoySession.h</key>
<data>
QRm1nR7qx1q0LOMg2t3gJLFiKiQ=
57bJP7vxdka2HypgOBz6VjyPQAI=
</data>
<key>Headers/AhoySessionDelegateProtocol.h</key>
<data>
Expand Down Expand Up @@ -170,7 +170,7 @@
</data>
<key>Info.plist</key>
<data>
ZMfzb6kS+Ase2M2u/Cr3AoRisrM=
2wHnUOT+SPravYr+XUnoWr2D29Q=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down Expand Up @@ -265,7 +265,7 @@
<dict>
<key>hash</key>
<data>
Unf+yTuww+EguVrjH4VUTbMOyO4=
037u4G7nJqsWldwhCUzzam7tYTQ=
</data>
<key>optional</key>
<true/>
Expand Down Expand Up @@ -311,15 +311,15 @@
</data>
<key>Headers/AhoyPeerConnectionFactory.h</key>
<data>
skFmhaRzR2KuW/XR/B4OblHuKDc=
4jQip0QF0yHgFhh6u5g/dAhOfck=
</data>
<key>Headers/AhoySDK.h</key>
<data>
cMI+Wd8r0HfJeSMpkIMjvxWozio=
</data>
<key>Headers/AhoySession.h</key>
<data>
QRm1nR7qx1q0LOMg2t3gJLFiKiQ=
57bJP7vxdka2HypgOBz6VjyPQAI=
</data>
<key>Headers/AhoySessionDelegateProtocol.h</key>
<data>
Expand Down Expand Up @@ -538,7 +538,7 @@
<dict>
<key>hash</key>
<data>
Unf+yTuww+EguVrjH4VUTbMOyO4=
037u4G7nJqsWldwhCUzzam7tYTQ=
</data>
<key>optional</key>
<true/>
Expand Down
Binary file modified src/ios/AhoyKit.framework/en.lproj/Localizable.strings
Binary file not shown.

0 comments on commit 59ae591

Please sign in to comment.