Pass selected cricket::VideoCodec down to internal H264 encoder

webrtc/DEPS

Index: webrtc/DEPS
diff --git a/webrtc/DEPS b/webrtc/DEPS
index cee05ef106ec4778c178159359744bb7613aac83..1bf6e8c701ffc34680a26c05a84ffe36feb4d5e0 100644
--- a/webrtc/DEPS
+++ b/webrtc/DEPS
@@ -14,6 +14,7 @@ include_rules = [
   "+webrtc/common_types.h",
   "+webrtc/common_video/rotation.h",
   "+webrtc/config.h",
+  "+webrtc/media/base/codec.h",

[hta-webrtc, 2016/11/04 10:04:05]

I'd think Tommi would want to check if we can avoid this - alternatively, file a
bug to move the type that we need to share out to somewhere else.

Which type is it that we have to share, and with what?

[magjed_webrtc, 2016/11/04 13:48:29]

The type that is needed is cricket::VideoCodec, and it's needed in the static
factory function for the webrtc::VideoEncoder interface in
webrtc/video_encoder.h:
static VideoEncoder* VideoEncoder::Create(const cricket::VideoCodec& codec);

This dependency is quite easy to avoid and I have planned a follow-up CL where I
remove the static factory function in webrtc::VideoEncoder (I think it's ugly
that the interface is aware of the implementations of the interface anyway).
Instead, I plan to expose the internal encoders under
webrtc/modules/video_coding/codecs/ (vp8, vp9, and h264) with an implementation
of WebRtcVideoEncoderFactory that is placed in
webrtc/modules/video_coding/codecs.

That would streamline the implementation in WebRtcVideoEngine2 since we would
then have two encoder factories of the same type (WebRtcVideoEncoderFactory),
one internal and one external. As a bonus, we can move the hardcoded codec
enumeration in WebRtcVideoEngine2 to the internal factory, i.e. move this code
to the codec implementations:

webrtc/media/engine/webrtcvideoengine2.cc:
std::vector<VideoCodec> DefaultVideoCodecList() {
  std::vector<VideoCodec> codecs;
  AddCodecAndMaybeRtxCodec(
      MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp8PlType, kVp8CodecName),
      &codecs);
  if (webrtc::VP9Encoder::IsSupported() && webrtc::VP9Decoder::IsSupported()) {
    AddCodecAndMaybeRtxCodec(MakeVideoCodecWithDefaultFeedbackParams(
                                 kDefaultVp9PlType, kVp9CodecName),
                             &codecs);
  }
  if (webrtc::H264Encoder::IsSupported() &&
      webrtc::H264Decoder::IsSupported()) {
    VideoCodec codec = MakeVideoCodecWithDefaultFeedbackParams(
        kDefaultH264PlType, kH264CodecName);
    // TODO(hta): Move all parameter generation for SDP into the codec
    // implementation, for all codecs and parameters.
    // TODO(hta): Move selection of profile-level-id to H.264 codec
    // implementation.
    // TODO(hta): Set FMTP parameters for all codecs of type H264.
    codec.SetParam(kH264FmtpProfileLevelId,
                   kH264ProfileLevelConstrainedBaseline);
    codec.SetParam(kH264FmtpLevelAsymmetryAllowed, "1");
    codec.SetParam(kH264FmtpPacketizationMode, "1");
    AddCodecAndMaybeRtxCodec(codec, &codecs);
  }
  AddCodecAndMaybeRtxCodec(VideoCodec(kDefaultRedPlType, kRedCodecName),
                           &codecs);
  codecs.push_back(VideoCodec(kDefaultUlpfecType, kUlpfecCodecName));
  return codecs;
}

Actually, I think I can include that change into this CL without the CL getting
too big. I will try to upload a new patch set next week.

   "+webrtc/transport.h",
   "+webrtc/typedefs.h",
   "+webrtc/video_decoder.h",