Support layer skipping in key svc structures
Add KSvc structure for 3 spatial and 3 temporal layers to allow to cover
more scenarious
Bug: webrtc:11999
Change-Id: Id16d1acfb4ca5f98d1b17d8f66d54b31d22d0745
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/188122
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32434}
diff --git a/modules/video_coding/svc/scalability_structure_unittest.cc b/modules/video_coding/svc/scalability_structure_unittest.cc
index eab1801..627415b 100644
--- a/modules/video_coding/svc/scalability_structure_unittest.cc
+++ b/modules/video_coding/svc/scalability_structure_unittest.cc
@@ -305,27 +305,29 @@
SvcTestParam{"S2T1", /*num_temporal_units=*/3},
SvcTestParam{"L2T2", /*num_temporal_units=*/4},
SvcTestParam{"L2T2_KEY", /*num_temporal_units=*/4},
- SvcTestParam{"L2T2_KEY_SHIFT", /*num_temporal_units=*/4}),
+ SvcTestParam{"L2T2_KEY_SHIFT", /*num_temporal_units=*/4},
+ SvcTestParam{"L3T3_KEY", /*num_temporal_units=*/8}),
[](const testing::TestParamInfo<SvcTestParam>& info) {
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{"L2T2",
- /*num_temporal_units=*/4},
- SvcTestParam{"L3T1", /*num_temporal_units=*/3},
- SvcTestParam{"L3T3", /*num_temporal_units=*/8}),
- [](const testing::TestParamInfo<SvcTestParam>& info) {
- return info.param.name;
- });
+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}),
+ [](const testing::TestParamInfo<SvcTestParam>& info) {
+ return info.param.name;
+ });
} // namespace
} // namespace webrtc