admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename scalability mode "NONE" to "L1T1".

Browse Source 
Bug: webrtc:11607
Change-Id: I81e8ead4a2cc15de6c21c7ee852e909af38b0567
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258127
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36474}
This commit is contained in:
Niels Möller 2022-04-06 13:37:40 +02:00 committed by WebRTC LUCI CQ
parent 04c6053f46
commit cc171956f8
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/video_coding/codecs/av1/av1_svc_config.cc
View File

@ -26,8 +26,8 @@ bool SetAv1SvcConfig(VideoCodec& video_codec) {
absl::string_view scalability_mode = video_codec.ScalabilityMode();
if (scalability_mode.empty()) {
RTC_LOG(LS_WARNING) << "Scalability mode is not set, using 'NONE'.";
scalability_mode = "NONE";
RTC_LOG(LS_WARNING) << "Scalability mode is not set, using 'L1T1'.";
scalability_mode = "L1T1";
}
std::unique_ptr<ScalableVideoController> structure =

2
modules/video_coding/codecs/av1/av1_svc_config_unittest.cc
View File

@ -24,7 +24,7 @@ TEST(Av1SvcConfigTest, RequireScalabilityMode) {
video_codec.SetScalabilityMode("Unknown");
EXPECT_FALSE(SetAv1SvcConfig(video_codec));
video_codec.SetScalabilityMode("NONE");
video_codec.SetScalabilityMode("L1T1");
EXPECT_TRUE(SetAv1SvcConfig(video_codec));
}

4
modules/video_coding/codecs/av1/libaom_av1_encoder.cc
View File

@ -171,8 +171,8 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* codec_settings,
}
absl::string_view scalability_mode = encoder_settings_.ScalabilityMode();
if (scalability_mode.empty()) {
RTC_LOG(LS_WARNING) << "Scalability mode is not set, using 'NONE'.";
scalability_mode = "NONE";
RTC_LOG(LS_WARNING) << "Scalability mode is not set, using 'L1T1'.";
scalability_mode = "L1T1";
}
svc_controller_ = CreateScalabilityStructure(scalability_mode);
if (svc_controller_ == nullptr) {

4
modules/video_coding/codecs/av1/libaom_av1_unittest.cc
View File

@ -55,7 +55,7 @@ constexpr int kFramerate = 30;
VideoCodec DefaultCodecSettings() {
VideoCodec codec_settings;
codec_settings.SetScalabilityMode("NONE");
codec_settings.SetScalabilityMode("L1T1");
codec_settings.width = kWidth;
codec_settings.height = kHeight;
codec_settings.maxFramerate = kFramerate;
@ -318,7 +318,7 @@ TEST_P(LibaomAv1SvcTest, SetRatesMatchMeasuredBitrate) {
INSTANTIATE_TEST_SUITE_P(
Svc,
LibaomAv1SvcTest,
Values(SvcTestParam{"NONE", /*num_frames_to_generate=*/4},
Values(SvcTestParam{"L1T1", /*num_frames_to_generate=*/4},
SvcTestParam{"L1T2",
/*num_frames_to_generate=*/4,
/*configured_bitrates=*/

6
modules/video_coding/codecs/test/videocodec_test_av1.cc
View File

@ -52,7 +52,7 @@ TEST_P(VideoCodecTestAv1, HighBitrate) {
auto config = CreateConfig("foreman_cif");
config.SetCodecSettings(cricket::kAv1CodecName, 1, 1, 1, false, true, true,
kCifWidth, kCifHeight);
config.codec_settings.SetScalabilityMode("NONE");
config.codec_settings.SetScalabilityMode("L1T1");
config.num_frames = kNumFramesLong;
auto fixture = CreateVideoCodecTestFixture(config);
@ -70,7 +70,7 @@ TEST_P(VideoCodecTestAv1, VeryLowBitrate) {
auto config = CreateConfig("foreman_cif");
config.SetCodecSettings(cricket::kAv1CodecName, 1, 1, 1, false, true, true,
kCifWidth, kCifHeight);
config.codec_settings.SetScalabilityMode("NONE");
config.codec_settings.SetScalabilityMode("L1T1");
auto fixture = CreateVideoCodecTestFixture(config);
std::vector<RateProfile> rate_profiles = {{50, 30, 0}};
@ -90,7 +90,7 @@ TEST_P(VideoCodecTestAv1, Hd) {
auto config = CreateConfig("ConferenceMotion_1280_720_50");
config.SetCodecSettings(cricket::kAv1CodecName, 1, 1, 1, false, true, true,
kHdWidth, kHdHeight);
config.codec_settings.SetScalabilityMode("NONE");
config.codec_settings.SetScalabilityMode("L1T1");
config.num_frames = kNumFramesLong;
auto fixture = CreateVideoCodecTestFixture(config);

4
modules/video_coding/svc/create_scalability_structure.cc
View File

@ -45,7 +45,7 @@ std::unique_ptr<ScalableVideoController> CreateH() {
return std::make_unique<T>(factor);
}
constexpr ScalableVideoController::StreamLayersConfig kConfigNone = {
constexpr ScalableVideoController::StreamLayersConfig kConfigL1T1 = {
/*num_spatial_layers=*/1, /*num_temporal_layers=*/1,
/*uses_reference_scaling=*/false};
@ -114,7 +114,7 @@ constexpr ScalableVideoController::StreamLayersConfig kConfigS3T3 = {
{4, 2, 1}};
constexpr NamedStructureFactory kFactories[] = {
{"NONE", Create<ScalableVideoControllerNoLayering>, kConfigNone},
{"L1T1", Create<ScalableVideoControllerNoLayering>, kConfigL1T1},
{"L1T2", Create<ScalabilityStructureL1T2>, kConfigL1T2},
{"L1T3", Create<ScalabilityStructureL1T3>, kConfigL1T3},
{"L2T1", Create<ScalabilityStructureL2T1>, kConfigL2T1},

2
modules/video_coding/svc/scalability_structure_unittest.cc
View File

@ -317,7 +317,7 @@ TEST_P(ScalabilityStructureTest, ProduceNoFrameForDisabledLayers) {
INSTANTIATE_TEST_SUITE_P(
Svc,
ScalabilityStructureTest,
Values(SvcTestParam{"NONE", /*num_temporal_units=*/3},
Values(SvcTestParam{"L1T1", /*num_temporal_units=*/3},
SvcTestParam{"L1T2", /*num_temporal_units=*/4},
SvcTestParam{"L1T3", /*num_temporal_units=*/8},
SvcTestParam{"L2T1", /*num_temporal_units=*/3},