Prepare iOS H264 HW encoder for High Profile

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
 
 // TODO(kthelgason): delete this when CreateVideoDecoder takes
 // a cricket::VideoCodec instead of webrtc::VideoCodecType.
 static const char* NameFromCodecType(webrtc::VideoCodecType type) {
   switch (type) {
     case webrtc::kVideoCodecVP8:
       return cricket::kVp8CodecName;
     case webrtc::kVideoCodecVP9:
       return cricket::kVp9CodecName;
     case webrtc::kVideoCodecH264:
       return cricket::kH264CodecName;
     default:
       return "Unknown codec";
   }
 }
 
 namespace webrtc {
 
 // VideoToolboxVideoEncoderFactory
 
 VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory() {
 // Hardware H264 encoding only supported on iOS for now.
 #if defined(WEBRTC_IOS)
-  supported_codecs_.push_back(cricket::VideoCodec(cricket::kH264CodecName));
+  // 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::ProfileLevelId constrained_baseline_profile(
+      H264::kProfileConstrainedBaseline, H264::kLevel3_1);

[tkchin_webrtc, 2016/11/14 18:27:27]

I don't know how this will affect the encoder. But if AppRTCMobile looks ok this
should be fine.

[magjed_webrtc, 2016/11/15 17:14:24]

It looks good in AppRTCMobile as far as I can tell. I could keep using AutoLevel
since this has worked in the past, but it feels nice to pass as much information
as possible about the negotiated profile down to the encoder.

+  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() {}
 
 VideoEncoder* VideoToolboxVideoEncoderFactory::CreateVideoEncoder(
     const cricket::VideoCodec& codec) {
 #if defined(WEBRTC_IOS)
   if (IsCodecSupported(supported_codecs_, codec)) {
     LOG(LS_INFO) << "Creating HW encoder for " << codec.name;
-    return new H264VideoToolboxEncoder();
+    return new H264VideoToolboxEncoder(codec);
   }
 #endif
   LOG(LS_INFO) << "No HW encoder found for codec " << codec.name;
   return nullptr;
 }
 
 void VideoToolboxVideoEncoderFactory::DestroyVideoEncoder(
     VideoEncoder* encoder) {
 #if defined(WEBRTC_IOS)
   delete encoder;
@@ skipping 31 matching lines @@
 
 void VideoToolboxVideoDecoderFactory::DestroyVideoDecoder(
     VideoDecoder* decoder) {
 #if defined(WEBRTC_IOS)
   delete decoder;
   decoder = nullptr;
 #endif
 }
 
 }  // namespace webrtc