iOS HW encoder: Enable H264 High profile support

webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h"
 
 #include "webrtc/base/logging.h"
 #include "webrtc/common_video/h264/profile_level_id.h"
 #include "webrtc/media/base/codec.h"
 #if defined(WEBRTC_IOS)
 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.h"
 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h"
 #endif
 
 namespace webrtc {
 
 // VideoToolboxVideoEncoderFactory
 
 VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory() {
 // Hardware H264 encoding only supported on iOS for now.
 #if defined(WEBRTC_IOS)
-  // TODO(magjed): Push Constrained High profile as well when negotiation is
-  // ready, http://crbug/webrtc/6337.
-  cricket::VideoCodec constrained_baseline(cricket::kH264CodecName);
   // TODO(magjed): Enumerate actual level instead of using hardcoded level 3.1.
   // Level 3.1 is 1280x720@30fps which is enough for now.
+  const H264::Level level = H264::kLevel3_1;
+
+  cricket::VideoCodec constrained_high(cricket::kH264CodecName);
+  const H264::ProfileLevelId constrained_high_profile(
+      H264::kProfileConstrainedHigh, level);
+  constrained_high.SetParam(
+      cricket::kH264FmtpProfileLevelId,
+      *H264::ProfileLevelIdToString(constrained_high_profile));
+  constrained_high.SetParam(cricket::kH264FmtpLevelAsymmetryAllowed, "1");
+  constrained_high.SetParam(cricket::kH264FmtpPacketizationMode, "1");
+  supported_codecs_.push_back(constrained_high);
+
+  cricket::VideoCodec constrained_baseline(cricket::kH264CodecName);
   const H264::ProfileLevelId constrained_baseline_profile(
-      H264::kProfileConstrainedBaseline, H264::kLevel3_1);
+      H264::kProfileConstrainedBaseline, level);
   constrained_baseline.SetParam(
       cricket::kH264FmtpProfileLevelId,
       *H264::ProfileLevelIdToString(constrained_baseline_profile));
   constrained_baseline.SetParam(cricket::kH264FmtpLevelAsymmetryAllowed, "1");
   constrained_baseline.SetParam(cricket::kH264FmtpPacketizationMode, "1");
   supported_codecs_.push_back(constrained_baseline);
 #endif
 }
 
 VideoToolboxVideoEncoderFactory::~VideoToolboxVideoEncoderFactory() {}
@@ skipping 53 matching lines @@
 
 void VideoToolboxVideoDecoderFactory::DestroyVideoDecoder(
     VideoDecoder* decoder) {
 #if defined(WEBRTC_IOS)
   delete decoder;
   decoder = nullptr;
 #endif
 }
 
 }  // namespace webrtc