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/VideoToolbox/RTCVideoEncoderH264.mm

diff --git a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
index 79eb763..5b08e74 100644
--- a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
+++ b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
@@ -304,7 +304,7 @@
     _packetizationMode = RTCH264PacketizationModeNonInterleaved;
     _profile = ExtractProfile([codecInfo nativeSdpVideoFormat]);
     LOG(LS_INFO) << "Using profile " << CFStringToString(_profile);
-    RTC_CHECK([codecInfo.name isEqualToString:kVideoCodecH264Name]);
+    RTC_CHECK([codecInfo.name isEqualToString:kRTCVideoCodecH264Name]);
 
 #if defined(WEBRTC_IOS)
     [RTCUIApplicationStatusObserver prepareForUse];
@@ -320,7 +320,7 @@
 - (NSInteger)startEncodeWithSettings:(RTCVideoEncoderSettings *)settings
                        numberOfCores:(int)numberOfCores {
   RTC_DCHECK(settings);
-  RTC_DCHECK([settings.name isEqualToString:kVideoCodecH264Name]);
+  RTC_DCHECK([settings.name isEqualToString:kRTCVideoCodecH264Name]);
 
   _width = settings.width;
   _height = settings.height;

sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm

diff --git a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm
index d7601cf..9e76626 100644
--- a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm
+++ b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm
@@ -145,7 +145,7 @@
   // TODO(andersc): This is a hack until we figure out how this should be done properly.
   NSString *formatName = [NSString stringForStdString:format.name];
   NSSet *wrappedSoftwareFormats =
-      [NSSet setWithObjects:kVideoCodecVp8Name, kVideoCodecVp9Name, nil];
+      [NSSet setWithObjects:kRTCVideoCodecVp8Name, kRTCVideoCodecVp9Name, nil];
 
   CodecInfo codec_info;
   codec_info.is_hardware_accelerated = ![wrappedSoftwareFormats containsObject:formatName];