Skip to content

Commit

Permalink
Update libWebRTC to revision 13311
Browse files Browse the repository at this point in the history
Includes the DTMF patch.
  • Loading branch information
saghul committed Jul 11, 2016
1 parent 990c173 commit 201f6b7
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 1 deletion.
2 changes: 1 addition & 1 deletion docs/BuildingLibWebRTC.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $ get_webrtc

* Set a specific *libwebrtc* version:
```bash
$ update2Revision 12558
$ update2Revision 13311
```


Expand Down
Binary file modified lib/libWebRTC-LATEST-Universal-Release.a
Binary file not shown.
66 changes: 66 additions & 0 deletions src/webrtc-headers/RTCDTMFSender.h
Original file line number Diff line number Diff line change
@@ -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 <Foundation/Foundation.h>

#import "RTCAudioTrack.h"

NS_ASSUME_NONNULL_BEGIN

@class RTCDTMFSender;
// Protocol for receving tone change events.
@protocol RTCDTMFSenderDelegate<NSObject>

// 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<RTCDTMFSenderDelegate> 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
2 changes: 2 additions & 0 deletions src/webrtc-headers/RTCI420Frame.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#import <Foundation/Foundation.h>

// 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;
Expand Down
5 changes: 5 additions & 0 deletions src/webrtc-headers/RTCPeerConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@

#import "RTCPeerConnectionDelegate.h"

@class RTCAudioTrack;
@class RTCConfiguration;
@class RTCDataChannel;
@class RTCDataChannelInit;
@class RTCDTMFSender;
@class RTCICECandidate;
@class RTCICEServers;
@class RTCMediaConstraints;
Expand Down Expand Up @@ -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<RTCSessionDescriptionDelegate>)delegate
Expand Down

0 comments on commit 201f6b7

Please sign in to comment.