63ee39d0be
This reverts commit 181ea6e414c5982015ce161e6368120be3658ec4.
Reason for revert: Breaks downstream project. Kári will help to land it next week.
Original change's description:
> Add a prefix for objc category.
>
> According to the Google Objective-C style [1], category names should
> start with an appropriate prefix. WebRTC has some category definitions
> for system interfaces, but it doesn't use prefixes.
>
> $ otool -ov WebRTC.framework/WebRTC | grep -E "^[0-9a-z]{16} 0x[0-9a-z]+ __OBJC_._CATEGORY" | grep -v "_RTC"
> 0000000002160840 0x217c3c0 __OBJC_$_CATEGORY_UIDevice_$_H264Profile
> 0000000002160850 0x21808b8 __OBJC_$_CATEGORY_AVCaptureSession_$_DevicePosition
> 0000000002160858 0x2180968 __OBJC_$_CATEGORY_NSString_$_StdString
> 0000000002160860 0x21809c8 __OBJC_$_CATEGORY_NSString_$_AbslStringView
>
> To avoid conflicts, prefix the names and methods of those categories.
> Also remove sdk/objc/Framework/Classes/Common/NSString+StdString.h as
> it is not used by any other files.
>
> [1] https://google.github.io/styleguide/objcguide.html#category-naming
>
> Bug: webrtc:13884
> Change-Id: I2cf2742af198ab4e0bfb15c0476d72971e50ceee
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262341
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36880}
Bug: webrtc:13884
Change-Id: I85257088e4a3a62e01ff925ab5e77af83b078ef3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262420
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36885}
121 lines
3.6 KiB
Plaintext
121 lines
3.6 KiB
Plaintext
/*
|
|
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*
|
|
*/
|
|
|
|
#import "RTCH264ProfileLevelId.h"
|
|
|
|
#import "helpers/NSString+StdString.h"
|
|
#if defined(WEBRTC_IOS)
|
|
#import "UIDevice+H264Profile.h"
|
|
#endif
|
|
|
|
#include "api/video_codecs/h264_profile_level_id.h"
|
|
#include "media/base/media_constants.h"
|
|
|
|
namespace {
|
|
|
|
NSString *MaxSupportedProfileLevelConstrainedHigh();
|
|
NSString *MaxSupportedProfileLevelConstrainedBaseline();
|
|
|
|
} // namespace
|
|
|
|
NSString *const kRTCVideoCodecH264Name = @(cricket::kH264CodecName);
|
|
NSString *const kRTCLevel31ConstrainedHigh = @"640c1f";
|
|
NSString *const kRTCLevel31ConstrainedBaseline = @"42e01f";
|
|
NSString *const kRTCMaxSupportedH264ProfileLevelConstrainedHigh =
|
|
MaxSupportedProfileLevelConstrainedHigh();
|
|
NSString *const kRTCMaxSupportedH264ProfileLevelConstrainedBaseline =
|
|
MaxSupportedProfileLevelConstrainedBaseline();
|
|
|
|
namespace {
|
|
|
|
#if defined(WEBRTC_IOS)
|
|
|
|
NSString *MaxSupportedLevelForProfile(webrtc::H264Profile profile) {
|
|
const absl::optional<webrtc::H264ProfileLevelId> profileLevelId =
|
|
[UIDevice maxSupportedH264Profile];
|
|
if (profileLevelId && profileLevelId->profile >= profile) {
|
|
const absl::optional<std::string> profileString =
|
|
H264ProfileLevelIdToString(webrtc::H264ProfileLevelId(profile, profileLevelId->level));
|
|
if (profileString) {
|
|
return [NSString stringForStdString:*profileString];
|
|
}
|
|
}
|
|
return nil;
|
|
}
|
|
#endif
|
|
|
|
NSString *MaxSupportedProfileLevelConstrainedBaseline() {
|
|
#if defined(WEBRTC_IOS)
|
|
NSString *profile = MaxSupportedLevelForProfile(webrtc::H264Profile::kProfileConstrainedBaseline);
|
|
if (profile != nil) {
|
|
return profile;
|
|
}
|
|
#endif
|
|
return kRTCLevel31ConstrainedBaseline;
|
|
}
|
|
|
|
NSString *MaxSupportedProfileLevelConstrainedHigh() {
|
|
#if defined(WEBRTC_IOS)
|
|
NSString *profile = MaxSupportedLevelForProfile(webrtc::H264Profile::kProfileConstrainedHigh);
|
|
if (profile != nil) {
|
|
return profile;
|
|
}
|
|
#endif
|
|
return kRTCLevel31ConstrainedHigh;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
@interface RTC_OBJC_TYPE (RTCH264ProfileLevelId)
|
|
()
|
|
|
|
@property(nonatomic, assign) RTCH264Profile profile;
|
|
@property(nonatomic, assign) RTCH264Level level;
|
|
@property(nonatomic, strong) NSString *hexString;
|
|
|
|
@end
|
|
|
|
@implementation RTC_OBJC_TYPE (RTCH264ProfileLevelId)
|
|
|
|
@synthesize profile = _profile;
|
|
@synthesize level = _level;
|
|
@synthesize hexString = _hexString;
|
|
|
|
- (instancetype)initWithHexString:(NSString *)hexString {
|
|
if (self = [super init]) {
|
|
self.hexString = hexString;
|
|
|
|
absl::optional<webrtc::H264ProfileLevelId> profile_level_id =
|
|
webrtc::ParseH264ProfileLevelId([hexString cStringUsingEncoding:NSUTF8StringEncoding]);
|
|
if (profile_level_id.has_value()) {
|
|
self.profile = static_cast<RTCH264Profile>(profile_level_id->profile);
|
|
self.level = static_cast<RTCH264Level>(profile_level_id->level);
|
|
}
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithProfile:(RTCH264Profile)profile level:(RTCH264Level)level {
|
|
if (self = [super init]) {
|
|
self.profile = profile;
|
|
self.level = level;
|
|
|
|
absl::optional<std::string> hex_string =
|
|
webrtc::H264ProfileLevelIdToString(webrtc::H264ProfileLevelId(
|
|
static_cast<webrtc::H264Profile>(profile), static_cast<webrtc::H264Level>(level)));
|
|
self.hexString =
|
|
[NSString stringWithCString:hex_string.value_or("").c_str() encoding:NSUTF8StringEncoding];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
@end
|