Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 61b4cec

Browse files
committed
Replace import for WebRTC headers.
WebRTC iOS SDK removed placeholder for ObjC headers in https://source.chromium.org/chromium/_/webrtc/src.git/+/6bfad33fd866e682c871c2ef2172b70b609593d1. OWT imports both modified WebRTC headers from WebRTC framework and original headers from source code, which results duplicated definitions. Running :s/#import <WebRTC/(.*\.h)>/#import "$1"/g to avoid import headers from WebRTC framework. A follow up change will modify public OWT headers back to import WebRTC framework during packaging.
1 parent d44abbe commit 61b4cec

34 files changed

+43
-47
lines changed

talk/owt/BUILD.gn

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,6 @@ static_library("owt_sdk_base") {
185185
# usually need some changes to fit the latest API.
186186
defines += [ "OWT_CUSTOM_AVIO" ]
187187
}
188-
if (is_ios) {
189-
public_deps += [ "//third_party/webrtc/sdk:framework_objc+link" ]
190-
}
191188
if (is_win) {
192189
sources += [
193190
"sdk/base/desktopcapturer.cc",
@@ -337,6 +334,9 @@ if (is_ios) {
337334
":owt_sdk_p2p",
338335
"//third_party/jsoncpp",
339336
]
337+
if (is_ios) {
338+
deps += [ "//third_party/webrtc/sdk:framework_objc+link" ]
339+
}
340340
include_dirs = [
341341
"//third_party",
342342
"sdk/include/cpp",
@@ -357,8 +357,6 @@ if (is_ios) {
357357
"sdk/base/objc/OWTDefaultVideoEncoderFactory.h",
358358
"sdk/base/objc/OWTDefaultVideoEncoderFactory.m",
359359
"sdk/base/objc/OWTErrors.m",
360-
361-
#"sdk/base/objc/OWTGlobalConfiguration.mm",
362360
"sdk/base/objc/OWTLocalStream+Private.h",
363361
"sdk/base/objc/OWTLocalStream.mm",
364362
"sdk/base/objc/OWTMediaFormat+Internal.h",
@@ -377,8 +375,6 @@ if (is_ios) {
377375
"sdk/base/objc/RemoteStreamObserverObjcImpl.mm",
378376
"sdk/base/objc/public/OWTErrors.h",
379377
"sdk/base/objc/public/OWTFrameGeneratorProtocol.h",
380-
381-
#"sdk/base/objc/public/OWTGlobalConfiguration.h",
382378
"sdk/base/objc/public/OWTLocalCameraStream.h",
383379
"sdk/base/objc/public/OWTLocalCameraStreamParameters.h",
384380
"sdk/base/objc/public/OWTLocalCustomizedStream.h",

talk/owt/sdk/base/objc/CameraVideoCapturer.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "talk/owt/sdk/base/objc/CameraVideoCapturer.h"
55
#include "third_party/webrtc/rtc_base/logging.h"
66
#import "third_party/webrtc/sdk/objc/api/peerconnection/RTCVideoSource+Private.h"
7-
#import "third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h"
7+
#import "third_party/webrtc/sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
88
#import "talk/owt/sdk/include/objc/OWT/RTCPeerConnectionFactory+OWT.h"
99
namespace owt {
1010
namespace base {

talk/owt/sdk/base/objc/OWTDefaultVideoDecoderFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
#import "WebRTC/RTCDefaultVideoDecoderFactory.h"
5+
#import "RTCDefaultVideoDecoderFactory.h"
66

77
RTC_OBJC_EXPORT
88
@interface OWTDefaultVideoDecoderFactory : RTCDefaultVideoDecoderFactory

talk/owt/sdk/base/objc/OWTDefaultVideoDecoderFactory.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
#import "WebRTC/RTCEncodedImage.h"
5+
#import "RTCEncodedImage.h"
66
#if defined(OWT_USE_H265)
7-
#import "WebRTC/RTCVideoCodecH265.h"
7+
#import "RTCVideoCodecH265.h"
88
#endif
99
#import "talk/owt/sdk/base/objc/OWTDefaultVideoDecoderFactory.h"
1010
@implementation OWTDefaultVideoDecoderFactory

talk/owt/sdk/base/objc/OWTDefaultVideoEncoderFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
#import "WebRTC/RTCDefaultVideoEncoderFactory.h"
5+
#import "RTCDefaultVideoEncoderFactory.h"
66

77
RTC_OBJC_EXPORT
88
@interface OWTDefaultVideoEncoderFactory : RTCDefaultVideoEncoderFactory

talk/owt/sdk/base/objc/OWTDefaultVideoEncoderFactory.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
#import "WebRTC/RTCEncodedImage.h"
5+
#import "RTCEncodedImage.h"
66
#if defined(OWT_USE_H265)
7-
#import "WebRTC/RTCVideoCodecH265.h"
7+
#import "RTCVideoCodecH265.h"
88
#endif
99
#import "talk/owt/sdk/base/objc/OWTDefaultVideoEncoderFactory.h"
1010
@implementation OWTDefaultVideoEncoderFactory

talk/owt/sdk/base/objc/OWTLocalStream+Private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44
#import "talk/owt/sdk/base/objc/OWTStream+Private.h"
55
#import "talk/owt/sdk/include/objc/OWT/OWTLocalStream.h"
6-
#import <WebRTC/RTCVideoCapturer.h>
6+
#import "RTCVideoCapturer.h"
77
@interface OWTLocalStream ()
88
/// If capturer is nil, caller manages its capturer's lifetime.
99
@property(nonatomic, strong) RTCVideoCapturer* capturer;

talk/owt/sdk/base/objc/OWTLocalStream.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <string>
55
#include <unordered_map>
66
#import <Foundation/Foundation.h>
7-
#import <WebRTC/RTCCameraVideoCapturer.h>
8-
#import <WebRTC/RTCVideoSource.h>
7+
#import "RTCCameraVideoCapturer.h"
8+
#import "RTCVideoSource.h"
99
#import "talk/owt/sdk/base/objc/OWTLocalStream+Private.h"
1010
#import "talk/owt/sdk/base/objc/OWTMediaFormat+Private.h"
1111
#import "talk/owt/sdk/include/objc/OWT/RTCPeerConnectionFactory+OWT.h"

talk/owt/sdk/base/objc/OWTPeerConnectionDependencyFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44

55
#import <Foundation/Foundation.h>
6-
#import "WebRTC/RTCMediaStream.h"
6+
#import "RTCMediaStream.h"
77
@class RTCMediaConstraints;
88
@interface OWTPeerConnectionDependencyFactory : NSObject
99
+ (id)sharedOWTPeerConnectionDependencyFactory;

talk/owt/sdk/base/objc/OWTRemoteStream.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44
#import "talk/owt/sdk/include/objc/OWT/OWTRemoteStream.h"
55
#import <Foundation/Foundation.h>
6-
#import "WebRTC/RTCMediaStream.h"
6+
#import "RTCMediaStream.h"
77
#import "talk/owt/sdk/base/objc/OWTRemoteStream+Private.h"
88
#import "webrtc/sdk/objc/Framework/Classes/Common/NSString+StdString.h"
99
#import "talk/owt/sdk/base/objc/OWTMediaFormat+Private.h"

0 commit comments

Comments
 (0)