From 6dfc8d6ef3b21bce28a501cc6fb6d09754ddf5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 17 Apr 2018 12:51:59 +0200 Subject: [PATCH] Add member VideoEncoderConfig::SdpVideoFormat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation for moving creation of encoders to VideoStreamEncoder; then this field is needed for calling VideoEncoderFactory::CreateVideoEncoder. Bug: webrtc:8830 Change-Id: Ie107a93596e22a5e7b9a9147bd85a93cf84b15a3 Reviewed-on: https://webrtc-review.googlesource.com/70221 Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#22894} --- call/video_config.cc | 1 + call/video_config.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/call/video_config.cc b/call/video_config.cc index 3010cdf581..6d7c226c99 100644 --- a/call/video_config.cc +++ b/call/video_config.cc @@ -48,6 +48,7 @@ std::string VideoStream::ToString() const { VideoEncoderConfig::VideoEncoderConfig() : codec_type(kVideoCodecUnknown), + video_format("Unset"), content_type(ContentType::kRealtimeVideo), encoder_specific_settings(nullptr), min_transmit_bitrate_bps(0), diff --git a/call/video_config.h b/call/video_config.h index 162d833c82..93f956201b 100644 --- a/call/video_config.h +++ b/call/video_config.h @@ -15,6 +15,7 @@ #include #include "api/optional.h" +#include "api/video_codecs/sdp_video_format.h" #include "common_types.h" // NOLINT(build/include) #include "rtc_base/basictypes.h" #include "rtc_base/refcount.h" @@ -126,7 +127,10 @@ class VideoEncoderConfig { ~VideoEncoderConfig(); std::string ToString() const; + // TODO(nisse): Consolidate on one of these. VideoCodecType codec_type; + SdpVideoFormat video_format; + rtc::scoped_refptr video_stream_factory; std::vector spatial_layers; ContentType content_type;