Changeset 211902 in webkit


Ignore:
Timestamp:
Feb 8, 2017 2:26:57 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Fix libwebrtc build on iOS simulator
​https://bugs.webkit.org/show_bug.cgi?id=168017

Reviewed by Tim Horton.

  • Configurations/libwebrtc.xcconfig:
  • Configurations/libwebrtcpcrtc.xcconfig:

Use $(inherited)

  • Source/webrtc/modules/audio_device/ios/audio_device_ios.h:
  • Source/webrtc/modules/audio_device/ios/audio_device_ios.mm:
  • Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession+Configuration.mm:
  • Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession+Private.h:
  • Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession.h:
  • Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm:
  • Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h:
  • Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.m:
  • Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h:
  • Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm:

Renamed RTCAudioSession* to WebRTCAudioSession* so that all ObjC classes in WebCore start with Web prefix.

  • libwebrtc.xcodeproj/project.pbxproj:

Add necessary files. Some iOS-specific files need ARC,
and this matches the Build.gn in Source/webrtc/modules/audio_device

Location:
trunk/Source/ThirdParty/libwebrtc
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r211888 r211902  
     12017-02-08  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix libwebrtc build on iOS simulator
     4        https://bugs.webkit.org/show_bug.cgi?id=168017
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/libwebrtc.xcconfig:
     9        * Configurations/libwebrtcpcrtc.xcconfig:
     10        Use $(inherited)
     11        * Source/webrtc/modules/audio_device/ios/audio_device_ios.h:
     12        * Source/webrtc/modules/audio_device/ios/audio_device_ios.mm:
     13        * Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession+Configuration.mm:
     14        * Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession+Private.h:
     15        * Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession.h:
     16        * Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm:
     17        * Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h:
     18        * Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.m:
     19        * Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h:
     20        * Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm:
     21        Renamed RTCAudioSession* to WebRTCAudioSession* so that all ObjC classes in WebCore start with Web prefix.
     22        * libwebrtc.xcodeproj/project.pbxproj:
     23        Add necessary files.  Some iOS-specific files need ARC,
     24        and this matches the Build.gn in Source/webrtc/modules/audio_device
     25
    1262017-02-08  Alex Christensen  <achristensen@webkit.org>
    227

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

    r211888 r211902  
    1414WARNING_CFLAGS = -Wno-exit-time-destructors -Wno-objc-property-no-attribute -Wno-objc-missing-super-calls -Wno-deprecated-declarations;
    1515
    16 BASE_PREPROCESSOR_DEFINITIONS = WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP HAVE_OPENSSL_SSL_H SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_CODEC_ILBC WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED RTC_DISABLE_VP9 RTC_DISABLE_VP8 HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE HAVE_SCTP;
     16GCC_PREPROCESSOR_DEFINITIONS = WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP HAVE_OPENSSL_SSL_H SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_CODEC_ILBC WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED RTC_DISABLE_VP9 RTC_DISABLE_VP8 HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE HAVE_SCTP;
    1717
    18 GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(BASE_PREPROCESSOR_DEFINITIONS);
    19 GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(BASE_PREPROCESSOR_DEFINITIONS) WEBRTC_IOS;
    20 GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(BASE_PREPROCESSOR_DEFINITIONS) WEBRTC_IOS;
     18GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited);
     19GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) WEBRTC_IOS;
     20GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) WEBRTC_IOS;
    2121
    2222EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse.cc *_sse2.cc macutils.cc macwindowpicker.cc audio_device_mac.cc;

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtcpcrtc.xcconfig

    r211888 r211902  
    1414WARNING_CFLAGS = -Wno-exit-time-destructors -Wno-objc-property-no-attribute -Wno-objc-missing-super-calls;
    1515
    16 BASE_PREPROCESSOR_DEFINITIONS = WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP HAVE_OPENSSL_SSL_H SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_CODEC_ILBC WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED RTC_DISABLE_VP9 RTC_DISABLE_VP8 HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE HAVE_SCTP;
     16GCC_PREPROCESSOR_DEFINITIONS = WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP HAVE_OPENSSL_SSL_H SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_CODEC_ILBC WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED RTC_DISABLE_VP9 RTC_DISABLE_VP8 HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE HAVE_SCTP;
    1717
    18 GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(BASE_PREPROCESSOR_DEFINITIONS);
    19 GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(BASE_PREPROCESSOR_DEFINITIONS) WEBRTC_IOS;
    20 GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(BASE_PREPROCESSOR_DEFINITIONS) WEBRTC_IOS;
     18GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited);
     19GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) WEBRTC_IOS;
     20GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) WEBRTC_IOS;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/audio_device_ios.h

    r210942 r211902  
    2121#include "webrtc/modules/audio_device/ios/voice_processing_audio_unit.h"
    2222
    23 RTC_FWD_DECL_OBJC_CLASS(RTCAudioSessionDelegateAdapter);
     23RTC_FWD_DECL_OBJC_CLASS(WebRTCAudioSessionDelegateAdapter);
    2424
    2525namespace webrtc {
    … …  
    289289
    290290  // Audio interruption observer instance.
    291   RTCAudioSessionDelegateAdapter* audio_session_observer_;
     291  WebRTCAudioSessionDelegateAdapter* audio_session_observer_;
    292292
    293293  // Set to true if we've activated the audio session.

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/audio_device_ios.mm

    r210942 r211902  
    105105  thread_ = rtc::Thread::Current();
    106106  audio_session_observer_ =
    107       [[RTCAudioSessionDelegateAdapter alloc] initWithObserver:this];
     107      [[WebRTCAudioSessionDelegateAdapter alloc] initWithObserver:this];
    108108}
    109109
    … …  
    135135  // is not called until audio is about to start. However, it makes sense to
    136136  // store the parameters now and then verify at a later stage.
    137   RTCAudioSessionConfiguration* config =
    138       [RTCAudioSessionConfiguration webRTCConfiguration];
     137  WebRTCAudioSessionConfiguration* config =
     138      [WebRTCAudioSessionConfiguration webRTCConfiguration];
    139139  playout_parameters_.reset(config.sampleRate,
    140140                            config.outputNumberOfChannels);
    … …  
    268268  LOGI() << "SetLoudspeakerStatus(" << enable << ")";
    269269
    270   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     270  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    271271  [session lockForConfiguration];
    272272  NSString* category = session.category;
    … …  
    295295int32_t AudioDeviceIOS::GetLoudspeakerStatus(bool& enabled) const {
    296296  LOGI() << "GetLoudspeakerStatus";
    297   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     297  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    298298  AVAudioSessionCategoryOptions options = session.categoryOptions;
    299299  enabled = options & AVAudioSessionCategoryOptionDefaultToSpeaker;
    … …  
    369369                  static_cast<unsigned int>(num_frames));
    370370
    371     RTCAudioSession *session = [RTCAudioSession sharedInstance];
     371    WebRTCAudioSession *session = [WebRTCAudioSession sharedInstance];
    372372    RTCLogWarning(@"Session:\n %@", session);
    373373    return result;
    … …  
    486486  is_interrupted_ = false;
    487487  RTCLog(@"Interruption ended. Updating audio unit state.");
    488   UpdateAudioUnit([RTCAudioSession sharedInstance].canPlayOrRecord);
     488  UpdateAudioUnit([WebRTCAudioSession sharedInstance].canPlayOrRecord);
    489489}
    490490
    … …  
    492492  RTC_DCHECK(thread_checker_.CalledOnValidThread());
    493493
    494   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     494  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    495495  RTCLog(@"%@", session);
    496496  HandleSampleRateChange(session.sampleRate);
    … …  
    522522  // The audio unit is already initialized or started.
    523523  // Check to see if the sample rate or buffer size has changed.
    524   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     524  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    525525  const double session_sample_rate = session.sampleRate;
    526526  const NSTimeInterval session_buffer_duration = session.IOBufferDuration;
    … …  
    592592  LOGI() << "SetupAudioBuffersForActiveAudioSession";
    593593  // Verify the current values once the audio session has been activated.
    594   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     594  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    595595  double sample_rate = session.sampleRate;
    596596  NSTimeInterval io_buffer_duration = session.IOBufferDuration;
    … …  
    601601  // reinitializing the audio parameters. Most BT headsets only support 8kHz or
    602602  // 16kHz.
    603   RTCAudioSessionConfiguration* webRTCConfig =
    604       [RTCAudioSessionConfiguration webRTCConfiguration];
     603  WebRTCAudioSessionConfiguration* webRTCConfig =
     604      [WebRTCAudioSessionConfiguration webRTCConfiguration];
    605605  if (sample_rate != webRTCConfig.sampleRate) {
    606606    LOG(LS_WARNING) << "Unable to set the preferred sample rate";
    … …  
    732732    RTCLog(@"Starting audio unit for UpdateAudioUnit");
    733733    // Log session settings before trying to start audio streaming.
    734     RTCAudioSession* session = [RTCAudioSession sharedInstance];
     734    WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    735735    RTCLog(@"%@", session);
    736736    if (!audio_unit_->Start()) {
    … …  
    762762    return;
    763763  }
    764   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     764  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    765765  [session lockForConfiguration];
    766766  [session configureWebRTCSession:nil];
    … …  
    777777    return;
    778778  }
    779   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     779  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    780780  [session lockForConfiguration];
    781781  [session unconfigureWebRTCSession:nil];
    … …  
    793793  }
    794794
    795   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     795  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    796796  // Subscribe to audio session events.
    797797  [session pushDelegate:audio_session_observer_];
    … …  
    830830
    831831  // Remove audio session notification observers.
    832   RTCAudioSession* session = [RTCAudioSession sharedInstance];
     832  WebRTCAudioSession* session = [WebRTCAudioSession sharedInstance];
    833833  [session removeDelegate:audio_session_observer_];
    834834

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession+Configuration.mm

    r210942 r211902  
    1515#import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h"
    1616
    17 @implementation RTCAudioSession (Configuration)
     17@implementation WebRTCAudioSession (Configuration)
    1818
    19 - (BOOL)setConfiguration:(RTCAudioSessionConfiguration *)configuration
     19- (BOOL)setConfiguration:(WebRTCAudioSessionConfiguration *)configuration
    2020                   error:(NSError **)outError {
    2121  return [self setConfiguration:configuration
    … …  
    2525}
    2626
    27 - (BOOL)setConfiguration:(RTCAudioSessionConfiguration *)configuration
     27- (BOOL)setConfiguration:(WebRTCAudioSessionConfiguration *)configuration
    2828                  active:(BOOL)active
    2929                   error:(NSError **)outError {
    … …  
    3636#pragma mark - Private
    3737
    38 - (BOOL)setConfiguration:(RTCAudioSessionConfiguration *)configuration
     38- (BOOL)setConfiguration:(WebRTCAudioSessionConfiguration *)configuration
    3939                  active:(BOOL)active
    4040         shouldSetActive:(BOOL)shouldSetActive

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession+Private.h

    r210942 r211902  
    1515NS_ASSUME_NONNULL_BEGIN
    1616
    17 @class RTCAudioSessionConfiguration;
     17@class WebRTCAudioSessionConfiguration;
    1818
    19 @interface RTCAudioSession ()
     19@interface WebRTCAudioSession ()
    2020
    2121/** Number of times setActive:YES has succeeded without a balanced call to
    … …  
    4343 *  audio events.
    4444 */
    45 - (void)pushDelegate:(id<RTCAudioSessionDelegate>)delegate;
     45- (void)pushDelegate:(id<WebRTCAudioSessionDelegate>)delegate;
    4646
    47 /** Signals RTCAudioSession that a WebRTC session is about to begin and
     47/** Signals WebRTCAudioSession that a WebRTC session is about to begin and
    4848 *  audio configuration is needed. Will configure the audio session for WebRTC
    4949 *  if not already configured and if configuration is not delayed.
    … …  
    5252- (BOOL)beginWebRTCSession:(NSError **)outError;
    5353
    54 /** Signals RTCAudioSession that a WebRTC session is about to end and audio
     54/** Signals WebRTCAudioSession that a WebRTC session is about to end and audio
    5555 *  unconfiguration is needed. Will unconfigure the audio session for WebRTC
    5656 *  if this is the last unmatched call and if configuration is not delayed.
    … …  
    7979// Properties and methods for tests.
    8080@property(nonatomic, readonly)
    81     std::vector<__weak id<RTCAudioSessionDelegate> > delegates;
     81    std::vector<__weak id<WebRTCAudioSessionDelegate> > delegates;
    8282
    8383- (void)notifyDidBeginInterruption;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession.h

    r210942 r211902  
    2222extern NSInteger const kRTCAudioSessionErrorConfiguration;
    2323
    24 @class RTCAudioSession;
    25 @class RTCAudioSessionConfiguration;
     24@class WebRTCAudioSession;
     25@class WebRTCAudioSessionConfiguration;
    2626
    2727// Surfaces AVAudioSession events. WebRTC will listen directly for notifications
    … …  
    2929// at which point applications can perform additional processing if required.
    3030RTC_EXPORT
    31 @protocol RTCAudioSessionDelegate <NSObject>
     31@protocol WebRTCAudioSessionDelegate <NSObject>
    3232
    3333@optional
    … …  
    3535 *  interruption event.
    3636 */
    37 - (void)audioSessionDidBeginInterruption:(RTCAudioSession *)session;
     37- (void)audioSessionDidBeginInterruption:(WebRTCAudioSession *)session;
    3838
    3939/** Called on a system notification thread when AVAudioSession ends an
    4040 *  interruption event.
    4141 */
    42 - (void)audioSessionDidEndInterruption:(RTCAudioSession *)session
     42- (void)audioSessionDidEndInterruption:(WebRTCAudioSession *)session
    4343                   shouldResumeSession:(BOOL)shouldResumeSession;
    4444
    … …  
    4646 *  route.
    4747 */
    48 - (void)audioSessionDidChangeRoute:(RTCAudioSession *)session
     48- (void)audioSessionDidChangeRoute:(WebRTCAudioSession *)session
    4949           reason:(AVAudioSessionRouteChangeReason)reason
    5050    previousRoute:(AVAudioSessionRouteDescription *)previousRoute;
    … …  
    5353 *  terminates.
    5454 */
    55 - (void)audioSessionMediaServicesWereLost:(RTCAudioSession *)session;
     55- (void)audioSessionMediaServicesWereLost:(WebRTCAudioSession *)session;
    5656
    5757/** Called on a system notification thread when AVAudioSession media server
    5858 *  restarts.
    5959 */
    60 - (void)audioSessionMediaServicesWereReset:(RTCAudioSession *)session;
     60- (void)audioSessionMediaServicesWereReset:(WebRTCAudioSession *)session;
    6161
    6262// TODO(tkchin): Maybe handle SilenceSecondaryAudioHintNotification.
    6363
    64 - (void)audioSession:(RTCAudioSession *)session
     64- (void)audioSession:(WebRTCAudioSession *)session
    6565    didChangeCanPlayOrRecord:(BOOL)canPlayOrRecord;
    6666
    … …  
    6868 *  playback or recording.
    6969 */
    70 - (void)audioSessionDidStartPlayOrRecord:(RTCAudioSession *)session;
     70- (void)audioSessionDidStartPlayOrRecord:(WebRTCAudioSession *)session;
    7171
    7272/** Called on a WebRTC thread when the audio device is notified to stop
    7373 *  playback or recording.
    7474 */
    75 - (void)audioSessionDidStopPlayOrRecord:(RTCAudioSession *)session;
     75- (void)audioSessionDidStopPlayOrRecord:(WebRTCAudioSession *)session;
    7676
    7777@end
    … …  
    8181 *  WebRTC and the application layer are avoided.
    8282 *
    83  *  RTCAudioSession also coordinates activation so that the audio session is
     83 *  WebRTCAudioSession also coordinates activation so that the audio session is
    8484 *  activated only once. See |setActive:error:|.
    8585 */
    8686RTC_EXPORT
    87 @interface RTCAudioSession : NSObject
     87@interface WebRTCAudioSession : NSObject
    8888
    8989/** Convenience property to access the AVAudioSession singleton. Callers should
    … …  
    9797 */
    9898@property(nonatomic, readonly) BOOL isActive;
    99 /** Whether RTCAudioSession is currently locked for configuration. */
     99/** Whether WebRTCAudioSession is currently locked for configuration. */
    100100@property(nonatomic, readonly) BOOL isLocked;
    101101
    … …  
    155155
    156156/** Adds a delegate, which is held weakly. */
    157 - (void)addDelegate:(id<RTCAudioSessionDelegate>)delegate;
     157- (void)addDelegate:(id<WebRTCAudioSessionDelegate>)delegate;
    158158/** Removes an added delegate. */
    159 - (void)removeDelegate:(id<RTCAudioSessionDelegate>)delegate;
     159- (void)removeDelegate:(id<WebRTCAudioSessionDelegate>)delegate;
    160160
    161161/** Request exclusive access to the audio session for configuration. This call
    … …  
    203203@end
    204204
    205 @interface RTCAudioSession (Configuration)
     205@interface WebRTCAudioSession (Configuration)
    206206
    207207/** Applies the configuration to the current session. Attempts to set all
    … …  
    210210 *  |lockForConfiguration| must be called first.
    211211 */
    212 - (BOOL)setConfiguration:(RTCAudioSessionConfiguration *)configuration
     212- (BOOL)setConfiguration:(WebRTCAudioSessionConfiguration *)configuration
    213213                   error:(NSError **)outError;
    214214
    … …  
    216216 *  |lockForConfiguration| must be called first.
    217217 */
    218 - (BOOL)setConfiguration:(RTCAudioSessionConfiguration *)configuration
     218- (BOOL)setConfiguration:(WebRTCAudioSessionConfiguration *)configuration
    219219                  active:(BOOL)active
    220220                   error:(NSError **)outError;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm

    r210942 r211902  
    2222#import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h"
    2323
    24 NSString * const kRTCAudioSessionErrorDomain = @"org.webrtc.RTCAudioSession";
     24NSString * const kRTCAudioSessionErrorDomain = @"org.webrtc.WebRTCAudioSession";
    2525NSInteger const kRTCAudioSessionErrorLockRequired = -1;
    2626NSInteger const kRTCAudioSessionErrorConfiguration = -2;
    … …  
    2929// TODO(tkchin): Consider more granular locking. We're not expecting a lot of
    3030// lock contention so coarse locks should be fine for now.
    31 @implementation RTCAudioSession {
     31@implementation WebRTCAudioSession {
    3232  rtc::CriticalSection _crit;
    3333  AVAudioSession *_session;
    … …  
    4747+ (instancetype)sharedInstance {
    4848  static dispatch_once_t onceToken;
    49   static RTCAudioSession *sharedInstance = nil;
     49  static WebRTCAudioSession *sharedInstance = nil;
    5050  dispatch_once(&onceToken, ^{
    5151    sharedInstance = [[self alloc] init];
    … …  
    9797- (NSString *)description {
    9898  NSString *format =
    99       @"RTCAudioSession: {\n"
     99      @"WebRTCAudioSession: {\n"
    100100       "  category: %@\n"
    101101       "  categoryOptions: %ld\n"
    … …  
    167167
    168168// TODO(tkchin): Check for duplicates.
    169 - (void)addDelegate:(id<RTCAudioSessionDelegate>)delegate {
     169- (void)addDelegate:(id<WebRTCAudioSessionDelegate>)delegate {
    170170  if (!delegate) {
    171171    return;
    … …  
    177177}
    178178
    179 - (void)removeDelegate:(id<RTCAudioSessionDelegate>)delegate {
     179- (void)removeDelegate:(id<WebRTCAudioSessionDelegate>)delegate {
    180180  if (!delegate) {
    181181    return;
    … …  
    564564}
    565565
    566 - (std::vector<__weak id<RTCAudioSessionDelegate> >)delegates {
     566- (std::vector<__weak id<WebRTCAudioSessionDelegate> >)delegates {
    567567  @synchronized(self) {
    568568    // Note: this returns a copy.
    … …  
    572572
    573573// TODO(tkchin): check for duplicates.
    574 - (void)pushDelegate:(id<RTCAudioSessionDelegate>)delegate {
     574- (void)pushDelegate:(id<WebRTCAudioSessionDelegate>)delegate {
    575575  @synchronized(self) {
    576576    _delegates.insert(_delegates.begin(), delegate);
    … …  
    630630  if (!self.isLocked) {
    631631    if (outError) {
    632       *outError = [RTCAudioSession lockError];
     632      *outError = [WebRTCAudioSession lockError];
    633633    }
    634634    return NO;
    … …  
    673673  // Provide an error even if there isn't one so we can log it.
    674674  NSError *error = nil;
    675   RTCAudioSessionConfiguration *webRTCConfig =
    676       [RTCAudioSessionConfiguration webRTCConfiguration];
     675  WebRTCAudioSessionConfiguration *webRTCConfig =
     676      [WebRTCAudioSessionConfiguration webRTCConfiguration];
    677677  if (![self setConfiguration:webRTCConfig active:YES error:&error]) {
    678678    RTCLogError(@"Failed to set WebRTC audio configuration: %@",

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h

    r210942 r211902  
    2424// Struct to hold configuration values.
    2525RTC_EXPORT
    26 @interface RTCAudioSessionConfiguration : NSObject
     26@interface WebRTCAudioSessionConfiguration : NSObject
    2727
    2828@property(nonatomic, strong) NSString *category;
    … …  
    4242+ (instancetype)webRTCConfiguration;
    4343/** Provide a way to override the default configuration. */
    44 + (void)setWebRTCConfiguration:(RTCAudioSessionConfiguration *)configuration;
     44+ (void)setWebRTCConfiguration:(WebRTCAudioSessionConfiguration *)configuration;
    4545
    4646@end

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.m

    r210942 r211902  
    5353const double kRTCAudioSessionLowComplexityIOBufferDuration = 0.06;
    5454
    55 static RTCAudioSessionConfiguration *gWebRTCConfiguration = nil;
     55static WebRTCAudioSessionConfiguration *gWebRTCConfiguration = nil;
    5656
    57 @implementation RTCAudioSessionConfiguration
     57@implementation WebRTCAudioSessionConfiguration
    5858
    5959@synthesize category = _category;
    … …  
    107107
    108108+ (instancetype)currentConfiguration {
    109   RTCAudioSession *session = [RTCAudioSession sharedInstance];
    110   RTCAudioSessionConfiguration *config =
    111       [[RTCAudioSessionConfiguration alloc] init];
     109  WebRTCAudioSession *session = [WebRTCAudioSession sharedInstance];
     110  WebRTCAudioSessionConfiguration *config =
     111      [[WebRTCAudioSessionConfiguration alloc] init];
    112112  config.category = session.category;
    113113  config.categoryOptions = session.categoryOptions;
    … …  
    122122+ (instancetype)webRTCConfiguration {
    123123  @synchronized(self) {
    124     return (RTCAudioSessionConfiguration *)gWebRTCConfiguration;
     124    return (WebRTCAudioSessionConfiguration *)gWebRTCConfiguration;
    125125  }
    126126}
    127127
    128 + (void)setWebRTCConfiguration:(RTCAudioSessionConfiguration *)configuration {
     128+ (void)setWebRTCConfiguration:(WebRTCAudioSessionConfiguration *)configuration {
    129129  @synchronized(self) {
    130130    gWebRTCConfiguration = configuration;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.h

    r210942 r211902  
    1818 *  methods on the AudioSessionObserver.
    1919 */
    20 @interface RTCAudioSessionDelegateAdapter : NSObject <RTCAudioSessionDelegate>
     20@interface WebRTCAudioSessionDelegateAdapter : NSObject <WebRTCAudioSessionDelegate>
    2121
    2222- (instancetype)init NS_UNAVAILABLE;

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm

    r210942 r211902  
    1515#import "WebRTC/RTCLogging.h"
    1616
    17 @implementation RTCAudioSessionDelegateAdapter {
     17@implementation WebRTCAudioSessionDelegateAdapter {
    1818  webrtc::AudioSessionObserver *_observer;
    1919}
    … …  
    2727}
    2828
    29 #pragma mark - RTCAudioSessionDelegate
     29#pragma mark - WebRTCAudioSessionDelegate
    3030
    31 - (void)audioSessionDidBeginInterruption:(RTCAudioSession *)session {
     31- (void)audioSessionDidBeginInterruption:(WebRTCAudioSession *)session {
    3232  _observer->OnInterruptionBegin();
    3333}
    3434
    35 - (void)audioSessionDidEndInterruption:(RTCAudioSession *)session
     35- (void)audioSessionDidEndInterruption:(WebRTCAudioSession *)session
    3636                   shouldResumeSession:(BOOL)shouldResumeSession {
    3737  _observer->OnInterruptionEnd();
    3838}
    3939
    40 - (void)audioSessionDidChangeRoute:(RTCAudioSession *)session
     40- (void)audioSessionDidChangeRoute:(WebRTCAudioSession *)session
    4141           reason:(AVAudioSessionRouteChangeReason)reason
    4242    previousRoute:(AVAudioSessionRouteDescription *)previousRoute {
    … …  
    6565}
    6666
    67 - (void)audioSessionMediaServicesWereLost:(RTCAudioSession *)session {
     67- (void)audioSessionMediaServicesWereLost:(WebRTCAudioSession *)session {
    6868}
    6969
    70 - (void)audioSessionMediaServicesWereReset:(RTCAudioSession *)session {
     70- (void)audioSessionMediaServicesWereReset:(WebRTCAudioSession *)session {
    7171}
    7272
    73 - (void)audioSession:(RTCAudioSession *)session
     73- (void)audioSession:(WebRTCAudioSession *)session
    7474    didChangeCanPlayOrRecord:(BOOL)canPlayOrRecord {
    7575  _observer->OnCanPlayOrRecordChange(canPlayOrRecord);
    7676}
    7777
    78 - (void)audioSessionDidStartPlayOrRecord:(RTCAudioSession *)session {
     78- (void)audioSessionDidStartPlayOrRecord:(WebRTCAudioSession *)session {
    7979}
    8080
    81 - (void)audioSessionDidStopPlayOrRecord:(RTCAudioSession *)session {
     81- (void)audioSessionDidStopPlayOrRecord:(WebRTCAudioSession *)session {
    8282}
    8383

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r211888 r211902  
    24702470                5CFD53601E4BA34B00482908 /* helpers_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD535F1E4BA34B00482908 /* helpers_ios.mm */; };
    24712471                5CFD536C1E4BA4DC00482908 /* RTCAudioSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD53631E4BA4DC00482908 /* RTCAudioSession.h */; };
    2472                 5CFD536D1E4BA4DC00482908 /* RTCAudioSession.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53641E4BA4DC00482908 /* RTCAudioSession.mm */; };
    2473                 5CFD536E1E4BA4DC00482908 /* RTCAudioSession+Configuration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53651E4BA4DC00482908 /* RTCAudioSession+Configuration.mm */; };
     2472                5CFD536D1E4BA4DC00482908 /* RTCAudioSession.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53641E4BA4DC00482908 /* RTCAudioSession.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
     2473                5CFD536E1E4BA4DC00482908 /* RTCAudioSession+Configuration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53651E4BA4DC00482908 /* RTCAudioSession+Configuration.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
    24742474                5CFD536F1E4BA4DC00482908 /* RTCAudioSession+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD53661E4BA4DC00482908 /* RTCAudioSession+Private.h */; };
    24752475                5CFD53701E4BA4DC00482908 /* RTCAudioSessionConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD53671E4BA4DC00482908 /* RTCAudioSessionConfiguration.h */; };
    2476                 5CFD53711E4BA4DC00482908 /* RTCAudioSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53681E4BA4DC00482908 /* RTCAudioSessionConfiguration.m */; };
     2476                5CFD53711E4BA4DC00482908 /* RTCAudioSessionConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53681E4BA4DC00482908 /* RTCAudioSessionConfiguration.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
    24772477                5CFD53721E4BA4DC00482908 /* RTCAudioSessionDelegateAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD53691E4BA4DC00482908 /* RTCAudioSessionDelegateAdapter.h */; };
    2478                 5CFD53731E4BA4DC00482908 /* RTCAudioSessionDelegateAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD536A1E4BA4DC00482908 /* RTCAudioSessionDelegateAdapter.mm */; };
     2478                5CFD53731E4BA4DC00482908 /* RTCAudioSessionDelegateAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD536A1E4BA4DC00482908 /* RTCAudioSessionDelegateAdapter.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
    24792479                5CFD537C1E4BA4F500482908 /* audio_device_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD53751E4BA4F500482908 /* audio_device_ios.h */; };
    24802480                5CFD537D1E4BA4F500482908 /* audio_device_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53761E4BA4F500482908 /* audio_device_ios.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
    24812481                5CFD53801E4BA4F500482908 /* audio_session_observer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD53791E4BA4F500482908 /* audio_session_observer.h */; };
    24822482                5CFD53811E4BA4F500482908 /* voice_processing_audio_unit.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFD537A1E4BA4F500482908 /* voice_processing_audio_unit.h */; };
    2483                 5CFD53821E4BA4F500482908 /* voice_processing_audio_unit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD537B1E4BA4F500482908 /* voice_processing_audio_unit.mm */; };
     2483                5CFD53821E4BA4F500482908 /* voice_processing_audio_unit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD537B1E4BA4F500482908 /* voice_processing_audio_unit.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
     2484                5CFD53841E4BBD8D00482908 /* audio_device_not_implemented_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53831E4BBD8D00482908 /* audio_device_not_implemented_ios.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
    24842485/* End PBXBuildFile section */
    24852486
    … …  
    51855186                5CFD537A1E4BA4F500482908 /* voice_processing_audio_unit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = voice_processing_audio_unit.h; sourceTree = "<group>"; };
    51865187                5CFD537B1E4BA4F500482908 /* voice_processing_audio_unit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = voice_processing_audio_unit.mm; sourceTree = "<group>"; };
     5188                5CFD53831E4BBD8D00482908 /* audio_device_not_implemented_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = audio_device_not_implemented_ios.mm; sourceTree = "<group>"; };
    51875189                5D7C59C51208C68B001C873E /* libwebrtc.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libwebrtc.xcconfig; sourceTree = "<group>"; };
    51885190                5D7C59C61208C68B001C873E /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
    … …  
    91319133                                5CFD53751E4BA4F500482908 /* audio_device_ios.h */,
    91329134                                5CFD53761E4BA4F500482908 /* audio_device_ios.mm */,
     9135                                5CFD53831E4BBD8D00482908 /* audio_device_not_implemented_ios.mm */,
    91339136                                5CFD53791E4BA4F500482908 /* audio_session_observer.h */,
    91349137                                5CFD537A1E4BA4F500482908 /* voice_processing_audio_unit.h */,
    … …  
    1120911212                                5CFD537D1E4BA4F500482908 /* audio_device_ios.mm in Sources */,
    1121011213                                5C11A00B1E457448004F0987 /* audio_device_mac.cc in Sources */,
     11214                                5CFD53841E4BBD8D00482908 /* audio_device_not_implemented_ios.mm in Sources */,
    1121111215                                5CDD84171E439B2900621E92 /* audio_encoder.cc in Sources */,
    1121211216                                5CDD8CA71E43C6F700621E92 /* audio_encoder_cng.cc in Sources */,
Note: See TracChangeset for help on using the changeset viewer.