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

Revert "Add a prefix for objc category."

Browse Source 
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}
This commit is contained in:
Artem Titov
2022-05-13 14:46:42 +00:00
committed by WebRTC LUCI CQ
parent 059548919b
commit 63ee39d0be
56 changed files with 181 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm
View File

@ -11,9 +11,9 @@
#import "RTCH264ProfileLevelId.h"
#import "helpers/NSString+RTCStdString.h"
#import "helpers/NSString+StdString.h"
#if defined(WEBRTC_IOS)
#import "UIDevice+RTCH264Profile.h"
#import "UIDevice+H264Profile.h"
#endif
#include "api/video_codecs/h264_profile_level_id.h"
@ -40,12 +40,12 @@ namespace {
NSString *MaxSupportedLevelForProfile(webrtc::H264Profile profile) {
const absl::optional<webrtc::H264ProfileLevelId> profileLevelId =
[UIDevice rtc_maxSupportedH264Profile];
[UIDevice maxSupportedH264Profile];
if (profileLevelId && profileLevelId->profile >= profile) {
const absl::optional<std::string> profileString =
H264ProfileLevelIdToString(webrtc::H264ProfileLevelId(profile, profileLevelId->level));
if (profileString) {
return [NSString rtc_stringForStdString:*profileString];
return [NSString stringForStdString:*profileString];
}
}
return nil;

4
sdk/objc/components/video_codec/UIDevice+RTCH264Profile.h → sdk/objc/components/video_codec/UIDevice+H264Profile.h
View File

@ -12,8 +12,8 @@
#include "api/video_codecs/h264_profile_level_id.h"
@interface UIDevice (RTCH264Profile)
@interface UIDevice (H264Profile)
+ (absl::optional<webrtc::H264ProfileLevelId>)rtc_maxSupportedH264Profile;
+ (absl::optional<webrtc::H264ProfileLevelId>)maxSupportedH264Profile;
@end

6
sdk/objc/components/video_codec/UIDevice+RTCH264Profile.mm → sdk/objc/components/video_codec/UIDevice+H264Profile.mm
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#import "UIDevice+RTCH264Profile.h"
#import "UIDevice+H264Profile.h"
#import "helpers/UIDevice+RTCDevice.h"
#include <algorithm>
@ -196,9 +196,9 @@ absl::optional<H264ProfileLevelId> FindMaxSupportedProfileForDevice(RTCDeviceTyp
} // namespace
@implementation UIDevice (RTCH264Profile)
@implementation UIDevice (H264Profile)
+ (absl::optional<webrtc::H264ProfileLevelId>)rtc_maxSupportedH264Profile {
+ (absl::optional<webrtc::H264ProfileLevelId>)maxSupportedH264Profile {
return FindMaxSupportedProfileForDevice([self deviceType]);
}