diff --git a/docs/BuildingLibWebRTC.md b/docs/BuildingLibWebRTC.md index c1ff6837..67e0df3e 100644 --- a/docs/BuildingLibWebRTC.md +++ b/docs/BuildingLibWebRTC.md @@ -20,7 +20,7 @@ $ get_webrtc * Set a specific *libwebrtc* version: ```bash -$ update2Revision 12558 +$ update2Revision 13311 ``` diff --git a/lib/libWebRTC-LATEST-Universal-Release.a b/lib/libWebRTC-LATEST-Universal-Release.a index d364a59b..be44c38f 100644 Binary files a/lib/libWebRTC-LATEST-Universal-Release.a and b/lib/libWebRTC-LATEST-Universal-Release.a differ diff --git a/src/webrtc-headers/RTCDTMFSender.h b/src/webrtc-headers/RTCDTMFSender.h new file mode 100644 index 00000000..7e1f675d --- /dev/null +++ b/src/webrtc-headers/RTCDTMFSender.h @@ -0,0 +1,66 @@ +/* + * libjingle + * Copyright 2014 Google Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import + +#import "RTCAudioTrack.h" + +NS_ASSUME_NONNULL_BEGIN + +@class RTCDTMFSender; +// Protocol for receving tone change events. +@protocol RTCDTMFSenderDelegate + +// Called when a DTMF tone is played out. +- (void)toneChange:(NSString*)tone; + +@end + +// ObjectiveC wrapper for a DtmfSender object. +// See webrtc/api/dtmfsenderinterface.h +@interface RTCDTMFSender : NSObject + +@property(nonatomic, readonly) BOOL canInsertDTMF; +@property(nonatomic, readonly) NSString* toneBuffer; +@property(nonatomic, readonly) NSInteger duration; +@property(nonatomic, readonly) NSInteger interToneGap; +@property(nonatomic, weak) id delegate; +// The track associated with this DTMF sender. This property +// returns a copy of the RTCMediaStreamTrack +@property(nonatomic, copy, nullable) RTCAudioTrack *track; + +- (BOOL)insertDTMF:(NSString*)tones withDuration:(NSInteger)duration andInterToneGap:(NSInteger)interToneGap; + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +// Disallow init and don't add to documentation +- (id)init __attribute__(( + unavailable("init is not a supported initializer for this class."))); +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/webrtc-headers/RTCI420Frame.h b/src/webrtc-headers/RTCI420Frame.h index 890d4aa6..1d145ee7 100644 --- a/src/webrtc-headers/RTCI420Frame.h +++ b/src/webrtc-headers/RTCI420Frame.h @@ -28,6 +28,8 @@ #import // RTCI420Frame is an ObjectiveC version of cricket::VideoFrame. +// TODO(nisse): It appears it doesn't support any VideoFrame methods, +// so let it wrap an webrtc::VideoFrameBuffer instead? @interface RTCI420Frame : NSObject @property(nonatomic, readonly) NSUInteger width; diff --git a/src/webrtc-headers/RTCPeerConnection.h b/src/webrtc-headers/RTCPeerConnection.h index a13ed3ec..481bbd52 100644 --- a/src/webrtc-headers/RTCPeerConnection.h +++ b/src/webrtc-headers/RTCPeerConnection.h @@ -27,9 +27,11 @@ #import "RTCPeerConnectionDelegate.h" +@class RTCAudioTrack; @class RTCConfiguration; @class RTCDataChannel; @class RTCDataChannelInit; +@class RTCDTMFSender; @class RTCICECandidate; @class RTCICEServers; @class RTCMediaConstraints; @@ -76,6 +78,9 @@ - (RTCDataChannel*)createDataChannelWithLabel:(NSString*)label config:(RTCDataChannelInit*)config; +// Create a DTMF sender. +- (RTCDTMFSender*)createDTMFSenderForTrack:(RTCAudioTrack*)audioTrack; + // Create a new offer. // Success or failure will be reported via RTCSessionDescriptionDelegate. - (void)createOfferWithDelegate:(id)delegate