commit fc313dcda650fc4cd7dd4bb45e25eef3c500d6de
author Kári Tristan Helgason <kthelgason@webrtc.org> Fri Oct 20 11:01:22 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Oct 23 12:49:17 2017 +0000
tree a83f5b2e4f75bcad9acb2899b5f83328e32f2d3f
parent 47217364f541165b96344749fc18ccbb7bd8fb7c

Add prefix to codec name constants.

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}

sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm

diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm
index 2a49189..8886209 100644
--- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm
+++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm
@@ -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
 

sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm

diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
index d7f9c19..f862453 100644
--- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
+++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
@@ -33,7 +33,7 @@
 - (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 @@
 
 - (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 @@
   }
 
   NSDictionary<NSString *, NSString *> *constrainedBaselineParams = @{
-    @"profile-level-id" : kLevel31ConstrainedBaseline,
+    @"profile-level-id" : kRTCLevel31ConstrainedBaseline,
     @"level-asymmetry-allowed" : @"1",
     @"packetization-mode" : @"1",
   };
@@ -86,7 +86,7 @@
 }
 
 - (NSArray<RTCVideoCodecInfo *> *)supportedCodecs {
-  NSString *codecName = kVideoCodecH264Name;
+  NSString *codecName = kRTCVideoCodecH264Name;
   return @[ [[RTCVideoCodecInfo alloc] initWithName:codecName parameters:nil] ];
 }