| commit | 67d23043f3e3c3589dfe884f6ce4ee74b9674cba | [log] [tgz] |
|---|---|---|
| author | Niels Möller <nisse@webrtc.org> | Mon Jul 04 07:46:36 2022 |
| committer | WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> | Mon Jul 04 08:59:02 2022 |
| tree | 6438b931e2ed2530aaefe6d82ffca1e535ed64ea | |
| parent | 47a4584a7c53081097a9b56f6929cdb26a03e1ef [diff] |
Fix config of number of temporal layers Needed to produce correct VideoLayersAllocation extension for scalability mode L1T2. The value in the `spatialLayers` array is used on this line: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/video/video_stream_encoder.cc;drc=c374d11fac252535ccba15975568b1f6552c117e;l=320 Bug: webrtc:11607 Change-Id: I3bcfe738627e0af6f203a9b0f6e5323492e68987 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267621 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37414}
diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc index cece073..e1885d7 100644 --- a/modules/video_coding/video_codec_initializer.cc +++ b/modules/video_coding/video_codec_initializer.cc
@@ -170,7 +170,9 @@ video_codec.spatialLayers[0].height = video_codec.height; video_codec.spatialLayers[0].maxFramerate = max_framerate; video_codec.spatialLayers[0].numberOfTemporalLayers = - streams[0].num_temporal_layers.value_or(1); + streams[0].scalability_mode.has_value() + ? ScalabilityModeToNumTemporalLayers(*streams[0].scalability_mode) + : streams[0].num_temporal_layers.value_or(1); // Set codec specific options if (config.encoder_specific_settings)