From 80adac053cab279954d552fa6aa9d1c893ab1a47 Mon Sep 17 00:00:00 2001 From: VladimirTechMan Date: Thu, 23 Nov 2017 12:22:11 -0500 Subject: [PATCH] Set video codec names in public API using existing cricket constants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For better consistency between the Objective-C API constant definitions and the existing constants defined in the underlying core, re-use the available video codec-name constants from cricket to define the peer constants in the public API. BUG=None Change-Id: I8d5ddc2c1bd6670810fca1665aaf9a116620a34e Reviewed-on: https://webrtc-review.googlesource.com/25360 Commit-Queue: Kári Helgason Reviewed-by: Kári Helgason Cr-Commit-Position: refs/heads/master@{#20883} --- .../Framework/Classes/PeerConnection/RTCVideoCodec.mm | 8 +++++--- .../Classes/VideoToolbox/objc_video_encoder_factory.mm | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm index 8886209fa1..4a5d45062a 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm @@ -14,9 +14,11 @@ #import "RTCVideoCodec+Private.h" #import "WebRTC/RTCVideoCodecFactory.h" -NSString *const kRTCVideoCodecVp8Name = @"VP8"; -NSString *const kRTCVideoCodecVp9Name = @"VP9"; -NSString *const kRTCVideoCodecH264Name = @"H264"; +#include "media/base/mediaconstants.h" + +NSString *const kRTCVideoCodecVp8Name = @(cricket::kVp8CodecName); +NSString *const kRTCVideoCodecVp9Name = @(cricket::kVp9CodecName); +NSString *const kRTCVideoCodecH264Name = @(cricket::kH264CodecName); NSString *const kRTCLevel31ConstrainedHigh = @"640c1f"; NSString *const kRTCLevel31ConstrainedBaseline = @"42e01f"; 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 9e76626b7d..1380486730 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm +++ b/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.mm @@ -80,7 +80,7 @@ class ObjCVideoEncoder : public VideoEncoder { // CodecSpecificInfo only handles a hard coded list of codecs id rtcCodecSpecificInfo = nil; if (codec_specific_info) { - if (strcmp(codec_specific_info->codec_name, "H264") == 0) { + if (strcmp(codec_specific_info->codec_name, cricket::kH264CodecName) == 0) { RTCCodecSpecificInfoH264 *h264Info = [[RTCCodecSpecificInfoH264 alloc] init]; h264Info.packetizationMode = (RTCH264PacketizationMode)codec_specific_info->codecSpecific.H264.packetization_mode;