zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the libaom AV1 encoder optional in RTCDefaultVideoEncoderFactory.

Browse Source 
This is a partial revert of: https://webrtc-review.googlesource.com/c/src/+/262814

skip_shebang_check=True

bug: webrtc:13573
Change-Id: I08282df91446efa79ca86cc8dfe3b6daeb4eec9a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264543
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37074}
This commit is contained in:
philipel
2022-05-31 17:24:44 +02:00
committed by WebRTC LUCI CQ
parent 2f9d60b18d
commit 4eab9f47a5
4 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/objc/api/video_codec/RTCVideoEncoderAV1.h
View File

@ -22,4 +22,6 @@ RTC_OBJC_EXPORT
*/
+ (id<RTC_OBJC_TYPE(RTCVideoEncoder)>)av1Encoder;
+ (bool)isSupported;
@end

17
sdk/objc/api/video_codec/RTCVideoEncoderAV1.mm
View File

@ -15,15 +15,28 @@
#import "RTCVideoEncoderAV1.h"
#import "RTCWrappedNativeVideoEncoder.h"
#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
#if defined(RTC_USE_LIBAOM_AV1_ENCODER)
#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h" // nogncheck
#endif
@implementation RTC_OBJC_TYPE (RTCVideoEncoderAV1)
+ (id<RTC_OBJC_TYPE(RTCVideoEncoder)>)av1Encoder {
#if defined(RTC_USE_LIBAOM_AV1_ENCODER)
std::unique_ptr<webrtc::VideoEncoder> nativeEncoder(webrtc::CreateLibaomAv1Encoder());
return [[RTC_OBJC_TYPE(RTCWrappedNativeVideoEncoder) alloc]
initWithNativeEncoder:std::move(nativeEncoder)];
#else
return nil;
#endif
}
+ (bool)isSupported {
#if defined(RTC_USE_LIBAOM_AV1_ENCODER)
return true;
#else
return false;
#endif
}
@end

8
sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.m
View File

@ -55,7 +55,10 @@
addObject:[[RTC_OBJC_TYPE(RTCVideoCodecInfo) alloc] initWithName:kRTCVideoCodecVp9Name]];
}
[result addObject:[[RTC_OBJC_TYPE(RTCVideoCodecInfo) alloc] initWithName:kRTCVideoCodecAv1Name]];
if ([RTC_OBJC_TYPE(RTCVideoEncoderAV1) isSupported]) {
[result
addObject:[[RTC_OBJC_TYPE(RTCVideoCodecInfo) alloc] initWithName:kRTCVideoCodecAv1Name]];
}
return result;
}
@ -68,7 +71,8 @@
} else if ([info.name isEqualToString:kRTCVideoCodecVp9Name] &&
[RTC_OBJC_TYPE(RTCVideoEncoderVP9) isSupported]) {
return [RTC_OBJC_TYPE(RTCVideoEncoderVP9) vp9Encoder];
} else if ([info.name isEqualToString:kRTCVideoCodecAv1Name]) {
} else if ([info.name isEqualToString:kRTCVideoCodecAv1Name] &&
[RTC_OBJC_TYPE(RTCVideoEncoderAV1) isSupported]) {
return [RTC_OBJC_TYPE(RTCVideoEncoderAV1) av1Encoder];
}