Fix build issues for iOS. (#658)

Author: jianjunz

talk/owt/BUILD.gn

@@ -119,6 +119,10 @@ static_library("owt_sdk_base") {
     "sdk/base/commontypes.cc",
     "sdk/base/connectionstats.cc",
     "sdk/base/cursorutils.cc",
+    "sdk/base/customizedaudiocapturer.cc",
+    "sdk/base/customizedaudiocapturer.h",
+    "sdk/base/customizedaudiodevicemodule.cc",
+    "sdk/base/customizedaudiodevicemodule.h",
     "sdk/base/deviceutils.cc",
     "sdk/base/encodedstreamproviderwrapper.cc",
     "sdk/base/encodedstreamproviderwrapper.h",
@@ -232,10 +236,6 @@ static_library("owt_sdk_base") {
     defines += [ "OWT_CUSTOM_AVIO" ]
   }
   if (is_ios) {
-    sources += [
-      "sdk/base/ios/networkmonitorios.cc",
-      "sdk/base/ios/networkmonitorios.h",
-    ]
     public_deps += [ "//third_party/webrtc/sdk:framework_objc+link" ]
   }
 
@@ -338,14 +338,6 @@ static_library("owt_sdk_base") {
     ]
   }
 
-  if (is_win || is_linux) {
-    sources += [
-      "sdk/base/customizedaudiocapturer.cc",
-      "sdk/base/customizedaudiocapturer.h",
-      "sdk/base/customizedaudiodevicemodule.cc",
-      "sdk/base/customizedaudiodevicemodule.h",
-    ]
-  }
   if (is_linux && use_sysroot) {
     configs += [ "//third_party/webrtc/modules/desktop_capture:gio" ]
   }

talk/owt/sdk/base/peerconnectiondependencyfactory.cc

@@ -2,9 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 //
-#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX)
 #include "talk/owt/sdk/base/customizedaudiodevicemodule.h"
-#endif
 #include "talk/owt/sdk/base/encodedvideoencoderfactory.h"
 #include "talk/owt/sdk/base/peerconnectiondependencyfactory.h"
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
@@ -180,8 +178,8 @@ void PeerConnectionDependencyFactory::
       network_thread->socketserver());
   network_manager_ = std::make_shared<rtc::BasicNetworkManager>(
       network_thread->socketserver());
-  std::unique_ptr<VideoEncoderFactory> encoder_factory;
-  std::unique_ptr<VideoDecoderFactory> decoder_factory;
+  std::unique_ptr<webrtc::VideoEncoderFactory> encoder_factory;
+  std::unique_ptr<webrtc::VideoDecoderFactory> decoder_factory;
 #if defined(WEBRTC_IOS)
   encoder_factory = ObjcVideoCodecFactory::CreateObjcVideoEncoderFactory();
   decoder_factory = ObjcVideoCodecFactory::CreateObjcVideoDecoderFactory();
@@ -201,7 +199,6 @@ void PeerConnectionDependencyFactory::
   } else {
     encoder_factory = webrtc::CreateBuiltinVideoEncoderFactory();
   }
-#endif
 
   if (GlobalConfiguration::GetCustomizedVideoDecoderEnabled()) {
     decoder_factory.reset(new CustomizedVideoDecoderFactory(
@@ -215,6 +212,7 @@ void PeerConnectionDependencyFactory::
   } else {
     decoder_factory = webrtc::CreateBuiltinVideoDecoderFactory();
   }
+#endif
   // If still video factory is not in place, use internal factory.
   if (!encoder_factory.get()) {
     encoder_factory = webrtc::CreateBuiltinVideoEncoderFactory();
@@ -248,7 +246,7 @@ void PeerConnectionDependencyFactory::
   }
 #if defined(WEBRTC_IOS)
   pc_factory_ = webrtc::CreatePeerConnectionFactory(
-      network_thread, worker_thread, signaling_thread, adm,
+      network_thread.get(), worker_thread.get(), signaling_thread.get(), adm,
       webrtc::CreateBuiltinAudioEncoderFactory(),
       webrtc::CreateBuiltinAudioDecoderFactory(), std::move(encoder_factory),
       std::move(decoder_factory), nullptr,
@@ -365,13 +363,11 @@ rtc::Thread* PeerConnectionDependencyFactory::SignalingThreadForTesting() {
   return signaling_thread.get();
 }
 
-#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX)
 scoped_refptr<webrtc::AudioDeviceModule> PeerConnectionDependencyFactory::
     CreateCustomizedAudioDeviceModuleOnCurrentThread() {
   return CustomizedAudioDeviceModule::Create(
       GlobalConfiguration::GetAudioFrameGenerator());
 }
-#endif
 
 }  // namespace base
 }  // namespace owt

talk/owt/sdk/base/peerconnectiondependencyfactory.h

@@ -73,9 +73,9 @@ class PeerConnectionDependencyFactory : public rtc::RefCountInterface {
   CreatePeerConnectionOnCurrentThread(
       const webrtc::PeerConnectionInterface::RTCConfiguration& config,
       webrtc::PeerConnectionObserver* observer);
-#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX)
-  rtc::scoped_refptr<webrtc::AudioDeviceModule> CreateCustomizedAudioDeviceModuleOnCurrentThread();
-#endif
+  rtc::scoped_refptr<webrtc::AudioDeviceModule>
+  CreateCustomizedAudioDeviceModuleOnCurrentThread();
+
   scoped_refptr<PeerConnectionFactoryInterface> pc_factory_;
   static scoped_refptr<PeerConnectionDependencyFactory>
       dependency_factory_;  // Get() always return this instance.

talk/owt/sdk/include/cpp/owt/base/globalconfiguration.h

@@ -238,6 +238,7 @@ class OWT_EXPORT GlobalConfiguration {
       return;
     h264_temporal_layers_ = layers;
   }
+#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX)
   /**
    @brief This function sets the customized video decoder to decode the encoded images.
    @param Customized video decoder
@@ -246,6 +247,7 @@ class OWT_EXPORT GlobalConfiguration {
       std::unique_ptr<VideoDecoderInterface> external_video_decoder) {
     video_decoder_ = std::move(external_video_decoder);
   }
+#endif
   /**
   @breif This function disables/enables auto echo cancellation.
   @details When it is enabled, SDK will turn on AEC functionality.
@@ -438,18 +440,19 @@ class OWT_EXPORT GlobalConfiguration {
   static bool encoded_frame_;
   static int delay_based_bwe_weight_;
   static std::unique_ptr<AudioFrameGeneratorInterface> audio_frame_generator_;
+  /**
+   @brief This function returns the weight of delay based BWE in overall
+   bandwidth estimation.
+  */
+  static int GetDelayBasedBweWeight() { return delay_based_bwe_weight_; }
+#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX)
   /**
    @brief This function returns flag indicating whether customized video decoder is enabled or not
    @return Boolean flag indicating whether customized video decoder is enabled or not
    */
   static bool GetCustomizedVideoDecoderEnabled() {
     return video_decoder_ ? true : false;
   }
-  /**
-   @brief This function returns the weight of delay based BWE in overall
-   bandwidth estimation.
-  */
-  static int GetDelayBasedBweWeight() { return delay_based_bwe_weight_; }
   /**
    @brief This function gets customized video decoder
    @return Customized video decoder
@@ -461,6 +464,7 @@ class OWT_EXPORT GlobalConfiguration {
    * Customized video decoder. Default is nullptr.
    */
   static std::unique_ptr<VideoDecoderInterface> video_decoder_;
+#endif
 
   static AudioProcessingSettings audio_processing_settings_;
 

talk/owt/sdk/p2p/objc/OWTP2PPeerConnectionChannel.mm

@@ -121,6 +121,7 @@ - (void)send:(NSString*)message
         onFailure:(void (^)(NSError*))onFailure {
   _nativeChannel->Send(
       [message UTF8String],
+      true,
       [=]() {
         if (onSuccess != nil)
           onSuccess();