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}

examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java

@@ -105,8 +105,6 @@ public class PeerConnectionClient {
   private static final String VIDEO_FLEXFEC_FIELDTRIAL =
       "WebRTC-FlexFEC-03-Advertised/Enabled/WebRTC-FlexFEC-03/Enabled/";
   private static final String VIDEO_VP8_INTEL_HW_ENCODER_FIELDTRIAL = "WebRTC-IntelVP8/Enabled/";
-  private static final String VIDEO_H264_HIGH_PROFILE_FIELDTRIAL =
-      "WebRTC-H264HighProfile/Enabled/";
   private static final String DISABLE_WEBRTC_AGC_FIELDTRIAL =
       "WebRTC-Audio-MinimizeResamplingOnMobile/Enabled/";
   private static final String AUDIO_CODEC_PARAM_BITRATE = "maxaveragebitrate";
@@ -1043,10 +1041,6 @@ public class PeerConnectionClient {
       fieldTrials += DISABLE_WEBRTC_AGC_FIELDTRIAL;
       Log.d(TAG, "Disable WebRTC AGC field trial.");
     }
-    if (VIDEO_CODEC_H264_HIGH.equals(peerConnectionParameters.videoCodec)) {
-      // TODO(magjed): Strip High from SDP when selecting Baseline instead of using field trial.
-      fieldTrials += VIDEO_H264_HIGH_PROFILE_FIELDTRIAL;
-    }
     return fieldTrials;
   }
 

examples/objc/AppRTCMobile/ios/ARDAppDelegate.m

@@ -25,9 +25,7 @@
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  NSDictionary *fieldTrials = @{
+  NSDictionary *fieldTrials = @{};
-    kRTCFieldTrialH264HighProfileKey: kRTCFieldTrialEnabledValue,
-  };
   RTCInitFieldTrialDictionary(fieldTrials);
   RTCInitializeSSL();
   RTCSetupInternalTracer();

modules/video_coding/BUILD.gn

@@ -716,7 +716,6 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_tests_utils",
       "../../system_wrappers",
-      "../../test:field_trial",
       "../../test:fileutils",
       "../../test:test_support",
       "../../test:video_test_common",

modules/video_coding/codecs/test/videoprocessor_integrationtest_mediacodec.cc

@@ -16,7 +16,6 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "media/base/mediaconstants.h"
-#include "test/field_trial.h"
 #include "test/testsupport/fileutils.h"
 
 namespace webrtc {
@@ -82,8 +81,6 @@ TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsH264CBP) {
 // HW encoders that support CHP.
 TEST_F(VideoProcessorIntegrationTestMediaCodec,
        DISABLED_ForemanCif500kbpsH264CHP) {
-  ScopedFieldTrials override_field_trials("WebRTC-H264HighProfile/Enabled/");
-
   config_.h264_codec_settings.profile = H264::kProfileConstrainedHigh;
   config_.encoded_frame_checker = &h264_keyframe_checker_;
   config_.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false,

modules/video_coding/codecs/test/videoprocessor_integrationtest_videotoolbox.cc

@@ -14,7 +14,6 @@
 
 #include "media/base/mediaconstants.h"
 #include "modules/video_coding/codecs/test/objc_codec_factory_helper.h"
-#include "test/field_trial.h"
 #include "test/testsupport/fileutils.h"
 
 namespace webrtc {
@@ -82,8 +81,6 @@ MAYBE_TEST_F(VideoProcessorIntegrationTestVideoToolbox,
 
 MAYBE_TEST_F(VideoProcessorIntegrationTestVideoToolbox,
        ForemanCif500kbpsH264CHP) {
-  ScopedFieldTrials override_field_trials("WebRTC-H264HighProfile/Enabled/");
-
   config_.h264_codec_settings.profile = H264::kProfileConstrainedHigh;
   config_.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false,
                            false, 352, 288);

sdk/android/src/jni/androidmediaencoder.cc

@@ -81,7 +81,6 @@ namespace {
   // Maximum time limit between incoming frames before requesting a key frame.
   const size_t kFrameDiffThresholdMs = 350;
   const int kMinKeyFrameInterval = 6;
-  const char kH264HighProfileFieldTrial[] = "WebRTC-H264HighProfile";
   const char kCustomQPThresholdsFieldTrial[] = "WebRTC-CustomQPThresholds";
 }  // namespace
 
@@ -1318,11 +1317,7 @@ VideoEncoder* MediaCodecVideoEncoderFactory::CreateVideoEncoder(
 
 const std::vector<cricket::VideoCodec>&
 MediaCodecVideoEncoderFactory::supported_codecs() const {
-  if (field_trial::IsEnabled(kH264HighProfileFieldTrial)) {
+  return supported_codecs_with_h264_hp_;
-    return supported_codecs_with_h264_hp_;
-  } else {
-    return supported_codecs_;
-  }
 }
 
 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(VideoEncoder* encoder) {

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 @@ bool IsHighProfileEnabled() {
   NSMutableArray<RTCVideoCodecInfo *> *codecs = [NSMutableArray array];
   NSString *codecName = kRTCVideoCodecH264Name;
 
-  if (IsHighProfileEnabled()) {
+  NSDictionary<NSString *, NSString *> *constrainedHighParams = @{
-    NSDictionary<NSString *, NSString *> *constrainedHighParams = @{
+    @"profile-level-id" : kRTCMaxSupportedH264ProfileLevelConstrainedHigh,
-      @"profile-level-id" : kRTCMaxSupportedH264ProfileLevelConstrainedHigh,
+    @"level-asymmetry-allowed" : @"1",
-      @"level-asymmetry-allowed" : @"1",
+    @"packetization-mode" : @"1",
-      @"packetization-mode" : @"1",
+  };
-    };
+  RTCVideoCodecInfo *constrainedHighInfo =
-    RTCVideoCodecInfo *constrainedHighInfo =
+      [[RTCVideoCodecInfo alloc] initWithName:codecName parameters:constrainedHighParams];
-        [[RTCVideoCodecInfo alloc] initWithName:codecName parameters:constrainedHighParams];
+  [codecs addObject:constrainedHighInfo];
-    [codecs addObject:constrainedHighInfo];
-  }
 
   NSDictionary<NSString *, NSString *> *constrainedBaselineParams = @{
     @"profile-level-id" : kRTCMaxSupportedH264ProfileLevelConstrainedBaseline,