commit cad94449dd2f4b4374936a457da20ca2677a84c4
author Kári Tristan Helgason <kthelgason@webrtc.org> Wed May 02 10:29:12 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Wed May 02 13:42:37 2018 +0000
tree c5821f60025e3599e93f2c0a698f854a29070ab0
parent 5613879b7b4660922b9fe12145532d3307b5d395

Remove H264 CHP field trial code.

Bug: webrtc:8317
Change-Id: I2da3cc6578dd8ff6e88052bc33cd38cb92af46dc
Reviewed-on: https://webrtc-review.googlesource.com/73242
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23077}

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 5477791..51583d0 100644
--- a/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
+++ b/sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm
@@ -16,13 +16,6 @@
 #import "WebRTC/RTCVideoCodec.h"
 
 #include "rtc_base/timeutils.h"
-#include "system_wrappers/include/field_trial.h"
-
-const char kHighProfileExperiment[] = "WebRTC-H264HighProfile";
-
-bool IsHighProfileEnabled() {
-  return webrtc::field_trial::IsEnabled(kHighProfileExperiment);
-}
 
 // H264 specific settings.
 @implementation RTCCodecSpecificInfoH264
@@ -48,16 +41,14 @@
   NSMutableArray<RTCVideoCodecInfo *> *codecs = [NSMutableArray array];
   NSString *codecName = kRTCVideoCodecH264Name;
 
-  if (IsHighProfileEnabled()) {
-    NSDictionary<NSString *, NSString *> *constrainedHighParams = @{
-      @"profile-level-id" : kRTCMaxSupportedH264ProfileLevelConstrainedHigh,
-      @"level-asymmetry-allowed" : @"1",
-      @"packetization-mode" : @"1",
-    };
-    RTCVideoCodecInfo *constrainedHighInfo =
-        [[RTCVideoCodecInfo alloc] initWithName:codecName parameters:constrainedHighParams];
-    [codecs addObject:constrainedHighInfo];
-  }
+  NSDictionary<NSString *, NSString *> *constrainedHighParams = @{
+    @"profile-level-id" : kRTCMaxSupportedH264ProfileLevelConstrainedHigh,
+    @"level-asymmetry-allowed" : @"1",
+    @"packetization-mode" : @"1",
+  };
+  RTCVideoCodecInfo *constrainedHighInfo =
+      [[RTCVideoCodecInfo alloc] initWithName:codecName parameters:constrainedHighParams];
+  [codecs addObject:constrainedHighInfo];
 
   NSDictionary<NSString *, NSString *> *constrainedBaselineParams = @{
     @"profile-level-id" : kRTCMaxSupportedH264ProfileLevelConstrainedBaseline,