zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove temporal layer restriction for forced resolution based fallback.

Browse Source 
Bug: none
Change-Id: Id8d30b6759bc6d5a517d1363395d4495251b32fe
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/205860
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33172}
This commit is contained in:
Åsa Persson
2021-02-04 19:00:06 +01:00
committed by Commit Bot
parent b6d87ddd55
commit aab91c7b3a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
View File

@ -613,13 +613,13 @@ TEST_F(ForcedFallbackTestEnabled, FallbackIsEndedForNonValidSettings) {
EncodeFrameAndVerifyLastName("libvpx"); EncodeFrameAndVerifyLastName("libvpx");
// Re-initialize encoder with invalid setting, expect no fallback. // Re-initialize encoder with invalid setting, expect no fallback.
codec_.VP8()->numberOfTemporalLayers = 2; codec_.numberOfSimulcastStreams = 2;
InitEncode(kWidth, kHeight); InitEncode(kWidth, kHeight);
EXPECT_EQ(1, fake_encoder_->init_encode_count_); EXPECT_EQ(1, fake_encoder_->init_encode_count_);
EncodeFrameAndVerifyLastName("fake-encoder"); EncodeFrameAndVerifyLastName("fake-encoder");
// Re-initialize encoder with valid setting. // Re-initialize encoder with valid setting.
codec_.VP8()->numberOfTemporalLayers = 1; codec_.numberOfSimulcastStreams = 1;
InitEncode(kWidth, kHeight); InitEncode(kWidth, kHeight);
EXPECT_EQ(1, fake_encoder_->init_encode_count_); EXPECT_EQ(1, fake_encoder_->init_encode_count_);
EncodeFrameAndVerifyLastName("libvpx"); EncodeFrameAndVerifyLastName("libvpx");

1
api/video_codecs/video_encoder_software_fallback_wrapper.cc
View File

@ -50,7 +50,6 @@ struct ForcedFallbackParams {
return enable_resolution_based_switch && return enable_resolution_based_switch &&
codec.codecType == kVideoCodecVP8 && codec.codecType == kVideoCodecVP8 &&
codec.numberOfSimulcastStreams <= 1 && codec.numberOfSimulcastStreams <= 1 &&
codec.VP8().numberOfTemporalLayers == 1 &&
codec.width * codec.height <= max_pixels; codec.width * codec.height <= max_pixels;
} }