Add layer skipping to L2T2_KEY_SHIFT structure
Bug: None
Change-Id: Iba019a999cb1812eee12bfe54c2f9ec9ebfa248f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/189965
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32487}
diff --git a/modules/video_coding/svc/scalability_structure_unittest.cc b/modules/video_coding/svc/scalability_structure_unittest.cc
index a7c5205..d6766f0 100644
--- a/modules/video_coding/svc/scalability_structure_unittest.cc
+++ b/modules/video_coding/svc/scalability_structure_unittest.cc
@@ -250,11 +250,7 @@
}
}
-// TODO(danilchap): Merge with ScalabilityStructureTest when SetRates
-// implemented for all tested structures.
-class ScalabilityStructureSetRatesTest : public ScalabilityStructureTest {};
-
-TEST_P(ScalabilityStructureSetRatesTest, ProduceNoFrameForDisabledLayers) {
+TEST_P(ScalabilityStructureTest, ProduceNoFrameForDisabledLayers) {
std::unique_ptr<ScalableVideoController> svc_controller =
CreateScalabilityStructure(GetParam().name);
ScalableVideoController::StreamLayersConfig structure =
@@ -311,24 +307,5 @@
return info.param.name;
});
-// TODO(danilchap): Merge with ScalabilityStructureTest when the functionality
-// is implemented for all tested structures.
-INSTANTIATE_TEST_SUITE_P(
- Svc,
- ScalabilityStructureSetRatesTest,
- Values(SvcTestParam{"L1T2", /*num_temporal_units=*/4},
- SvcTestParam{"L1T3", /*num_temporal_units=*/8},
- SvcTestParam{"L2T1", /*num_temporal_units=*/3},
- SvcTestParam{"L2T1_KEY", /*num_temporal_units=*/3},
- SvcTestParam{"L2T2", /*num_temporal_units=*/4},
- SvcTestParam{"L2T2_KEY", /*num_temporal_units=*/4},
- SvcTestParam{"L3T1", /*num_temporal_units=*/3},
- SvcTestParam{"L3T3", /*num_temporal_units=*/8},
- SvcTestParam{"L3T3_KEY", /*num_temporal_units=*/8},
- SvcTestParam{"S2T1", /*num_temporal_units=*/3}),
- [](const testing::TestParamInfo<SvcTestParam>& info) {
- return info.param.name;
- });
-
} // namespace
} // namespace webrtc