diff options
| author | Niels Möller <nisse@webrtc.org> | 2022-04-29 11:03:13 +0200 |
|---|---|---|
| committer | WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-29 12:16:42 +0000 |
| commit | 79d566b0cfa5b36d73747637e5c61d39c5c9768b (patch) | |
| tree | 946136030610af130c600d4cd9a0d26a25ec75f2 /media | |
| parent | cbf07f70e27c061f7e9569252e9afa7d0791158b (diff) | |
| download | webrtc-79d566b0cfa5b36d73747637e5c61d39c5c9768b.tar.gz | |
New enum ScalabilityMode.
Used instead of string representation in lower-levels of encoder configuration, to avoid string comparisons (with risk of misspelling) in lots of places.
Bug: webrtc:11607
Change-Id: I4d51c2265aac297c29976d2aa601d8ffb33b7326
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259870
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36706}
Diffstat (limited to 'media')
| -rw-r--r-- | media/BUILD.gn | 1 | ||||
| -rw-r--r-- | media/engine/webrtc_video_engine.cc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/media/BUILD.gn b/media/BUILD.gn index 015bc46ddd..74fd7a890c 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -291,6 +291,7 @@ rtc_library("rtc_audio_video") { "../modules/video_coding", "../modules/video_coding:video_codec_interface", "../modules/video_coding:video_coding_utility", + "../modules/video_coding/svc:scalability_mode_util", "../rtc_base", "../rtc_base:audio_format_to_string", "../rtc_base:buffer", diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index 0e2cfa2983..f3ada60ce3 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -32,6 +32,7 @@ #include "media/engine/webrtc_media_engine.h" #include "media/engine/webrtc_voice_engine.h" #include "modules/rtp_rtcp/source/rtp_util.h" +#include "modules/video_coding/svc/scalability_mode_util.h" #include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/experiments/field_trial_units.h" @@ -2476,7 +2477,8 @@ WebRtcVideoChannel::WebRtcVideoSendStream::CreateVideoEncoderConfig( encoder_config.simulcast_layers[i].active = rtp_parameters_.encodings[i].active; encoder_config.simulcast_layers[i].scalability_mode = - rtp_parameters_.encodings[i].scalability_mode; + webrtc::ScalabilityModeFromString( + rtp_parameters_.encodings[i].scalability_mode.value_or("")); if (rtp_parameters_.encodings[i].min_bitrate_bps) { encoder_config.simulcast_layers[i].min_bitrate_bps = *rtp_parameters_.encodings[i].min_bitrate_bps; |