mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prepare the removal of GetScalabilityMode2.

Browse source 
Change-Id: I4b41fd1faee0e27b2b05842d7825b6b0785735ec
Bug: b/327381318
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/341600
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#41870}
This commit is contained in:
Jeremy Leconte 2024-02-29 08:00:33 +01:00 committed by WebRTC LUCI CQ
parent b41f07bc51
commit 51f98ccb5d
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/video_codecs/simulcast_stream.cc
View file

@ -24,18 +24,18 @@ void SimulcastStream::SetNumberOfTemporalLayers(unsigned char n) {
numberOfTemporalLayers = n;
}
ScalabilityMode SimulcastStream::GetScalabilityMode() const {
RTC_CHECK_GE(numberOfTemporalLayers, 1);
RTC_CHECK_LE(numberOfTemporalLayers, 3);
absl::optional<ScalabilityMode> SimulcastStream::GetScalabilityMode() const {
static const ScalabilityMode scalability_modes[3] = {
ScalabilityMode::kL1T1,
ScalabilityMode::kL1T2,
ScalabilityMode::kL1T3,
};
if (numberOfTemporalLayers < 1 || numberOfTemporalLayers > 3) {
return absl::nullopt;
}
return scalability_modes[numberOfTemporalLayers - 1];
}
// TODO(b/327381318): Rename to GetScalabilityMode.
absl::optional<ScalabilityMode> SimulcastStream::GetScalabilityMode2() const {
static const ScalabilityMode scalability_modes[3] = {
ScalabilityMode::kL1T1,

2
api/video_codecs/simulcast_stream.h
View file

@ -22,7 +22,7 @@ struct SimulcastStream {
// Temporary utility methods for transition from numberOfTemporalLayers
// setting to ScalabilityMode.
unsigned char GetNumberOfTemporalLayers() const;
ScalabilityMode GetScalabilityMode() const;
absl::optional<ScalabilityMode> GetScalabilityMode() const;
// TODO(b/327381318): Rename to GetScalabilityMode.
absl::optional<ScalabilityMode> GetScalabilityMode2() const;
void SetNumberOfTemporalLayers(unsigned char n);

2
api/video_codecs/video_codec.cc
View file

@ -93,7 +93,7 @@ std::string VideoCodec::ToString() const {
for (size_t i = 0; i < numberOfSimulcastStreams; ++i) {
const SimulcastStream stream = simulcastStream[i];
absl::optional<ScalabilityMode> scalability_mode =
stream.GetScalabilityMode2();
stream.GetScalabilityMode();
if (scalability_mode.has_value()) {
ss << "[" << stream.width << "x" << stream.height << " "
<< ScalabilityModeToString(*scalability_mode)

2
media/engine/simulcast_encoder_adapter.cc
View file

@ -810,7 +810,7 @@ webrtc::VideoCodec SimulcastEncoderAdapter::MakeStreamCodec(
// SimulcastEncoderAdapter is used. This allows multiple encodings of L1Tx,
// but SimulcastStream currently does not support multiple spatial layers.
absl::optional<ScalabilityMode> scalability_mode =
stream_params.GetScalabilityMode2();
stream_params.GetScalabilityMode();
// To support the full set of scalability modes in the event that this is the
// only active encoding, prefer VideoCodec::GetScalabilityMode() if all other
// encodings are inactive.

2
video/video_stream_encoder.cc
View file

@ -1158,7 +1158,7 @@ void VideoStreamEncoder::ReconfigureEncoder() {
log_stream << "ReconfigureEncoder: simulcast streams: ";
for (size_t i = 0; i < codec.numberOfSimulcastStreams; ++i) {
absl::optional<ScalabilityMode> scalability_mode =
codec.simulcastStream[i].GetScalabilityMode2();
codec.simulcastStream[i].GetScalabilityMode();
if (scalability_mode) {
log_stream << "{" << i << ": " << codec.simulcastStream[i].width << "x"
<< codec.simulcastStream[i].height << " "