Move rtp-specific config out of EncoderSettings.
In VideoSendStream::Config, move payload_name and payload_type from EncoderSettings to Rtp. EncoderSettings now contains configuration for VideoStreamEncoder only, and should perhaps be renamed in a follow up cl. It's no longer passed as an argument to VideoCodecInitializer::SetupCodec. The latter then needs a different way to know the codec type, which is provided by a new codec_type member in VideoEncoderConfig. Bug: webrtc:8830 Change-Id: Ifcc691aef1ee6a95e43c0452c5e630d92a511cd6 Reviewed-on: https://webrtc-review.googlesource.com/62062 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22532}
This commit is contained in:
@ -133,8 +133,8 @@ std::unique_ptr<rtclog::StreamConfig> CreateRtcLogStreamConfig(
|
||||
rtclog_config->rtcp_mode = config.rtp.rtcp_mode;
|
||||
rtclog_config->rtp_extensions = config.rtp.extensions;
|
||||
|
||||
rtclog_config->codecs.emplace_back(config.encoder_settings.payload_name,
|
||||
config.encoder_settings.payload_type,
|
||||
rtclog_config->codecs.emplace_back(config.rtp.payload_name,
|
||||
config.rtp.payload_type,
|
||||
config.rtp.rtx.payload_type);
|
||||
return rtclog_config;
|
||||
}
|
||||
|
Reference in New Issue
Block a user