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

Add prefix to codec name constants.

Browse Source 
Bug: webrtc:8401
Change-Id: I8cd4685df3609e8b91a79b19789aadef484138d4
Reviewed-on: https://webrtc-review.googlesource.com/14140
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20390}
This commit is contained in:
Kári Tristan Helgason
2017-10-20 11:01:22 +02:00
committed by Commit Bot
parent 47217364f5
commit fc313dcda6
6 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm
View File

@ -14,11 +14,11 @@
#import "RTCVideoCodec+Private.h"
#import "WebRTC/RTCVideoCodecFactory.h"
NSString *const kVideoCodecVp8Name = @"VP8";
NSString *const kVideoCodecVp9Name = @"VP9";
NSString *const kVideoCodecH264Name = @"H264";
NSString *const kLevel31ConstrainedHigh = @"640c1f";
NSString *const kLevel31ConstrainedBaseline = @"42e01f";
NSString *const kRTCVideoCodecVp8Name = @"VP8";
NSString *const kRTCVideoCodecVp9Name = @"VP9";
NSString *const kRTCVideoCodecH264Name = @"H264";
NSString *const kRTCLevel31ConstrainedHigh = @"640c1f";
NSString *const kRTCLevel31ConstrainedBaseline = @"42e01f";
@implementation RTCVideoCodecInfo

10
sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
View File

@ -33,7 +33,7 @@ bool IsHighProfileEnabled() {
- (webrtc::CodecSpecificInfo)nativeCodecSpecificInfo {
webrtc::CodecSpecificInfo codecSpecificInfo;
codecSpecificInfo.codecType = webrtc::kVideoCodecH264;
codecSpecificInfo.codec_name = [kVideoCodecH264Name cStringUsingEncoding:NSUTF8StringEncoding];
codecSpecificInfo.codec_name = [kRTCVideoCodecH264Name cStringUsingEncoding:NSUTF8StringEncoding];
codecSpecificInfo.codecSpecific.H264.packetization_mode =
(webrtc::H264PacketizationMode)_packetizationMode;
@ -47,11 +47,11 @@ bool IsHighProfileEnabled() {
- (NSArray<RTCVideoCodecInfo *> *)supportedCodecs {
NSMutableArray<RTCVideoCodecInfo *> *codecs = [NSMutableArray array];
NSString *codecName = kVideoCodecH264Name;
NSString *codecName = kRTCVideoCodecH264Name;
if (IsHighProfileEnabled()) {
NSDictionary<NSString *, NSString *> *constrainedHighParams = @{
@"profile-level-id" : kLevel31ConstrainedHigh,
@"profile-level-id" : kRTCLevel31ConstrainedHigh,
@"level-asymmetry-allowed" : @"1",
@"packetization-mode" : @"1",
};
@ -61,7 +61,7 @@ bool IsHighProfileEnabled() {
}
NSDictionary<NSString *, NSString *> *constrainedBaselineParams = @{
@"profile-level-id" : kLevel31ConstrainedBaseline,
@"profile-level-id" : kRTCLevel31ConstrainedBaseline,
@"level-asymmetry-allowed" : @"1",
@"packetization-mode" : @"1",
};
@ -86,7 +86,7 @@ bool IsHighProfileEnabled() {
}
- (NSArray<RTCVideoCodecInfo *> *)supportedCodecs {
NSString *codecName = kVideoCodecH264Name;
NSString *codecName = kRTCVideoCodecH264Name;
return @[ [[RTCVideoCodecInfo alloc] initWithName:codecName parameters:nil] ];
}