-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Original credit: https://github.com/shiguredo-webrtc-build/webrtc-build/blob/master/patches/ios_simulcast.patch
- Loading branch information
Showing
5 changed files
with
113 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#import "RTCMacros.h" | ||
#import "RTCVideoEncoder.h" | ||
#import "RTCVideoEncoderFactory.h" | ||
#import "RTCVideoCodecInfo.h" | ||
|
||
RTC_OBJC_EXPORT | ||
@interface RTC_OBJC_TYPE (RTCVideoEncoderSimulcast) : NSObject | ||
|
||
+ (id<RTC_OBJC_TYPE(RTCVideoEncoder)>)simulcastEncoderWithPrimary:(id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)>)primary | ||
fallback:(id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)>)fallback | ||
videoCodecInfo:(RTC_OBJC_TYPE(RTCVideoCodecInfo) *)videoCodecInfo; | ||
|
||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
#import <Foundation/Foundation.h> | ||
|
||
#import "RTCMacros.h" | ||
#import "RTCVideoEncoderSimulcast.h" | ||
#import "RTCWrappedNativeVideoEncoder.h" | ||
#import "api/peerconnection/RTCVideoCodecInfo+Private.h" | ||
|
||
#include "native/api/video_encoder_factory.h" | ||
#include "media/engine/simulcast_encoder_adapter.h" | ||
|
||
@implementation RTC_OBJC_TYPE (RTCVideoEncoderSimulcast) | ||
|
||
+ (id<RTC_OBJC_TYPE(RTCVideoEncoder)>)simulcastEncoderWithPrimary:(id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)>)primary | ||
fallback:(id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)>)fallback | ||
videoCodecInfo:(RTC_OBJC_TYPE(RTCVideoCodecInfo) *)videoCodecInfo { | ||
auto nativePrimary = webrtc::ObjCToNativeVideoEncoderFactory(primary); | ||
auto nativeFallback = webrtc::ObjCToNativeVideoEncoderFactory(fallback); | ||
auto nativeFormat = [videoCodecInfo nativeSdpVideoFormat]; | ||
return [[RTC_OBJC_TYPE(RTCWrappedNativeVideoEncoder) alloc] | ||
initWithNativeEncoder: std::make_unique<webrtc::SimulcastEncoderAdapter>( | ||
nativePrimary.release(), | ||
nativeFallback.release(), | ||
std::move(nativeFormat))]; | ||
} | ||
|
||
@end |
16 changes: 16 additions & 0 deletions
16
sdk/objc/components/video_codec/RTCVideoEncoderFactorySimulcast.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
#import <Foundation/Foundation.h> | ||
|
||
#import "RTCMacros.h" | ||
#import "RTCVideoEncoderFactory.h" | ||
|
||
NS_ASSUME_NONNULL_BEGIN | ||
|
||
RTC_OBJC_EXPORT | ||
@interface RTC_OBJC_TYPE (RTCVideoEncoderFactorySimulcast) : NSObject <RTC_OBJC_TYPE(RTCVideoEncoderFactory)> | ||
|
||
- (instancetype)initWithPrimary:(id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)>)primary | ||
fallback:(id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)>)fallback; | ||
|
||
@end | ||
|
||
NS_ASSUME_NONNULL_END |
39 changes: 39 additions & 0 deletions
39
sdk/objc/components/video_codec/RTCVideoEncoderFactorySimulcast.mm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#import <Foundation/Foundation.h> | ||
|
||
#import "RTCMacros.h" | ||
#import "RTCVideoCodecInfo.h" | ||
#import "RTCVideoEncoderFactorySimulcast.h" | ||
#import "api/video_codec/RTCVideoEncoderSimulcast.h" | ||
|
||
@interface RTC_OBJC_TYPE (RTCVideoEncoderFactorySimulcast) () | ||
|
||
@property id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)> primary; | ||
@property id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)> fallback; | ||
|
||
@end | ||
|
||
|
||
@implementation RTC_OBJC_TYPE (RTCVideoEncoderFactorySimulcast) | ||
|
||
@synthesize primary = _primary; | ||
@synthesize fallback = _fallback; | ||
|
||
- (instancetype)initWithPrimary:(id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)>)primary | ||
fallback:(id<RTC_OBJC_TYPE(RTCVideoEncoderFactory)>)fallback { | ||
if (self = [super init]) { | ||
_primary = primary; | ||
_fallback = fallback; | ||
} | ||
return self; | ||
} | ||
|
||
- (nullable id<RTC_OBJC_TYPE(RTCVideoEncoder)>)createEncoder: (RTC_OBJC_TYPE(RTCVideoCodecInfo) *)info { | ||
return [RTCVideoEncoderSimulcast simulcastEncoderWithPrimary: _primary fallback: _fallback videoCodecInfo: info]; | ||
} | ||
|
||
- (NSArray<RTC_OBJC_TYPE(RTCVideoCodecInfo) *> *)supportedCodecs { | ||
return [[_primary supportedCodecs] arrayByAddingObjectsFromArray: [_fallback supportedCodecs]]; | ||
} | ||
|
||
|
||
@end |
f98772a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You may use our patches, but please use them in compliance with the Apache License 2.0 rules.
f98772a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hey, @voluntas I think we will solve this problem soon, Thank you for your contribution to the open-source community.