Some changes for building with OWT.

BUILD.gn

@@ -140,6 +140,25 @@ config("common_inherited_config") {
       target_gen_dir,
     ]
   }
+  if (build_with_owt) {
+    include_dirs = [
+      # The overrides must be included first as that is the mechanism for
+      # selecting the override headers in Chromium.
+      #"../webrtc_overrides",
+
+      # Allow includes to be prefixed with webrtc/ in case it is not an
+      # immediate subdirectory of the top-level.
+      ".",
+
+      # Just like the root WebRTC directory is added to include path, the
+      # corresponding directory tree with generated files needs to be added too.
+      # Note: this path does not change depending on the current target, e.g.
+      # it is always "//gen/third_party/webrtc" when building with Chromium.
+      # See also: http://cs.chromium.org/?q=%5C"default_include_dirs
+      # https://gn.googlesource.com/gn/+/master/docs/reference.md#target_gen_dir
+      target_gen_dir,
+    ]
+  }
   if (is_posix || is_fuchsia) {
     defines += [ "WEBRTC_POSIX" ]
   }
@@ -245,7 +264,7 @@ config("common_config") {
     defines += [ "WEBRTC_USE_H264" ]
   }
 
-  if (build_with_chromium) {
+  if (build_with_chromium || build_with_owt) {
     defines += [
       # NOTICE: Since common_inherited_config is used in public_configs for our
       # targets, there's no point including the defines in that config here.
@@ -382,7 +401,7 @@ if (!build_with_chromium) {
   # Target to build all the WebRTC production code.
   rtc_static_library("webrtc") {
     # Only the root target should depend on this.
-    visibility = [ "//:default" ]
+    visibility = [ ".:default" ]
 
     sources = []
     complete_static_lib = true

examples/BUILD.gn

@@ -81,7 +81,7 @@ if (rtc_include_tests) {
     deps = [
       ":read_auth_file",
       "../test:test_main",
-      "//test:test_support",
+      "../test:test_support",
       "//testing/gtest",
     ]
   }
@@ -618,7 +618,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
           ":AppRTCMobile_lib",
           ":apprtcmobile_test_sources",
           "../sdk:framework_objc",
-          "//test:test_support",
+          "../test:test_support",
         ]
         ldflags = [ "-all_load" ]
       }

rtc_base/BUILD.gn

@@ -612,6 +612,7 @@ rtc_static_library("rtc_numerics") {
 }
 
 rtc_source_set("rtc_json") {
+  visibility = [ "*", "//talk/owt:owt_deps" ]
   defines = []
   sources = [
     "strings/json.cc",

sdk/BUILD.gn

@@ -358,11 +358,11 @@ if (is_ios || is_mac) {
       ]
       deps = [
         ":base_objc",
-        "//api/video:video_frame",
-        "//api/video:video_frame_i420",
-        "//common_video",
-        "//rtc_base:checks",
-        "//rtc_base:rtc_base_approved",
+        "../api/video:video_frame",
+        "../api/video:video_frame_i420",
+        "../common_video",
+        "../rtc_base:checks",
+        "../rtc_base:rtc_base_approved",
         "//third_party/libyuv",
       ]
       configs += [
@@ -1119,7 +1119,7 @@ if (is_ios || is_mac) {
             ":peerconnectionfactory_base_objc",
             ":sdk_unittests_bundle_data",
             ":sdk_unittests_sources",
-            "//test:test_support",
+            "../test:test_support",
           ]
           ldflags = [ "-all_load" ]
         }
@@ -1137,7 +1137,7 @@ if (is_ios || is_mac) {
           deps = [
             ":framework_objc+link",
             ":ios_framework_bundle",
-            "//test:test_support",
+            "../test:test_support",
           ]
         }
       }

sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Native.h

@@ -22,6 +22,7 @@ class NetworkControllerFactoryInterface;
 class VideoEncoderFactory;
 class VideoDecoderFactory;
 class AudioProcessing;
+class PeerConnectionFactoryInterface;
 
 }  // namespace webrtc
 
@@ -87,6 +88,9 @@ NS_ASSUME_NONNULL_BEGIN
                         decoderFactory:(nullable id<RTCVideoDecoderFactory>)decoderFactory
                  mediaTransportFactory:
                      (std::unique_ptr<webrtc::MediaTransportFactory>)mediaTransportFactory;
+
+- (instancetype)initWithNativePeerConnectionFactory:(
+    rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>)factory;
 @end
 
 NS_ASSUME_NONNULL_END

sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm

@@ -240,6 +240,13 @@ - (instancetype)initWithNativeAudioEncoderFactory:
   }
   return self;
 }
+- (instancetype)initWithNativePeerConnectionFactory:
+    (rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>)factory {
+  if (self = [self initNative]) {
+    _nativeFactory = factory;
+  }
+  return self;
+}
 
 - (RTCAudioSource *)audioSourceWithConstraints:(nullable RTCMediaConstraints *)constraints {
   std::unique_ptr<webrtc::MediaConstraints> nativeConstraints;

sdk/objc/native/src/objc_video_decoder_factory.mm

@@ -98,7 +98,10 @@ int32_t RegisterDecodeCompleteCallback(DecodedImageCallback *callback) override
     if ([codecName isEqualToString:codecInfo.name]) {
       id<RTCVideoDecoder> decoder = [decoder_factory_ createDecoder:codecInfo];
 
-      if ([decoder isKindOfClass:[RTCWrappedNativeVideoDecoder class]]) {
+      // Because of symbol conflict, isKindOfClass doesn't work as expected.
+      // See https://bugs.webkit.org/show_bug.cgi?id=198782.
+      // if ([decoder isKindOfClass:[RTCWrappedNativeVideoDecoder class]]) {
+      if ([codecName isEqual:@"VP8"] || [codecName isEqual:@"VP9"]) {
         return [(RTCWrappedNativeVideoDecoder *)decoder releaseWrappedDecoder];
       } else {
         return std::unique_ptr<ObjCVideoDecoder>(new ObjCVideoDecoder(decoder));

sdk/objc/native/src/objc_video_encoder_factory.mm

@@ -57,7 +57,10 @@ int32_t RegisterEncodeCompleteCallback(EncodedImageCallback *callback) override
 
       // Handle types that can be converted into one of CodecSpecificInfo's hard coded cases.
       CodecSpecificInfo codecSpecificInfo;
-      if ([info isKindOfClass:[RTCCodecSpecificInfoH264 class]]) {
+      // Because of symbol conflict, isKindOfClass doesn't work as expected.
+      // See https://bugs.webkit.org/show_bug.cgi?id=198782.
+      if ([NSStringFromClass([info class]) isEqual:@"RTCCodecSpecificInfoH264"]) {
+        // if ([info isKindOfClass:[RTCCodecSpecificInfoH264 class]]) {
         codecSpecificInfo = [(RTCCodecSpecificInfoH264 *)info nativeCodecSpecificInfo];
       }
 
@@ -147,7 +150,10 @@ void SetRates(const RateControlParameters &parameters) override {
     const SdpVideoFormat &format) {
   RTCVideoCodecInfo *info = [[RTCVideoCodecInfo alloc] initWithNativeSdpVideoFormat:format];
   id<RTCVideoEncoder> encoder = [encoder_factory_ createEncoder:info];
-  if ([encoder isKindOfClass:[RTCWrappedNativeVideoEncoder class]]) {
+  // Because of symbol conflict, isKindOfClass doesn't work as expected.
+  // See https://bugs.webkit.org/show_bug.cgi?id=198782.
+  // if ([encoder isKindOfClass:[RTCWrappedNativeVideoEncoder class]]) {
+  if ([info.name isEqual:@"VP8"] || [info.name isEqual:@"VP9"]) {
     return [(RTCWrappedNativeVideoEncoder *)encoder releaseWrappedEncoder];
   } else {
     return std::unique_ptr<ObjCVideoEncoder>(new ObjCVideoEncoder(encoder));

webrtc.gni

@@ -694,7 +694,7 @@ if (is_ios) {
     action("umbrella_header_$target_name") {
       forward_variables_from(invoker, [ "public_headers" ])
 
-      script = "//tools_webrtc/ios/generate_umbrella_header.py"
+      script = "../tools_webrtc/ios/generate_umbrella_header.py"
 
       outputs = [
         umbrella_header_path,
@@ -769,7 +769,7 @@ if (is_mac) {
     }
 
     action("modulemap_$this_target_name") {
-      script = "//tools_webrtc/ios/generate_modulemap.py"
+      script = "../tools_webrtc/ios/generate_modulemap.py"
       args = [
         "--out",
         rebase_path(modulemap_path, root_build_dir),
@@ -796,7 +796,7 @@ if (is_mac) {
     action("umbrella_header_$this_target_name") {
       forward_variables_from(invoker, [ "sources" ])
 
-      script = "//tools_webrtc/ios/generate_umbrella_header.py"
+      script = "../tools_webrtc/ios/generate_umbrella_header.py"
 
       outputs = [
         umbrella_header_path,