From c4b5f4da976d579b37fe512627f39b934648cab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 20 May 2022 15:18:21 +0200 Subject: [PATCH] New struct SimulcastStream. Currently has the same contents as struct SpatialLayer. Intention is to add a ScalabilityMode member, which isn't appropriate for a spatial layer. Bug: webrtc:11607 Change-Id: I75c9e9b39407e3f24ec117bb17dc37830076b26f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262255 Reviewed-by: Rasmus Brandt Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/main@{#37062} --- api/video_codecs/simulcast_stream.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/api/video_codecs/simulcast_stream.h b/api/video_codecs/simulcast_stream.h index bace10b290..79a9395d26 100644 --- a/api/video_codecs/simulcast_stream.h +++ b/api/video_codecs/simulcast_stream.h @@ -11,14 +11,21 @@ #ifndef API_VIDEO_CODECS_SIMULCAST_STREAM_H_ #define API_VIDEO_CODECS_SIMULCAST_STREAM_H_ -#include "api/video_codecs/spatial_layer.h" - namespace webrtc { // TODO(bugs.webrtc.org/6883): Unify with struct VideoStream, part of // VideoEncoderConfig. -// TODO(bugs.webrtc.org/11607): Make this a separate type, rather than an alias. -using SimulcastStream = SpatialLayer; +struct SimulcastStream { + int width; + int height; + float maxFramerate; // fps. + unsigned char numberOfTemporalLayers; + unsigned int maxBitrate; // kilobits/sec. + unsigned int targetBitrate; // kilobits/sec. + unsigned int minBitrate; // kilobits/sec. + unsigned int qpMax; // minimum quality + bool active; // encoded and sent. +}; } // namespace webrtc #endif // API_VIDEO_CODECS_SIMULCAST_STREAM_H_