Change EXPECT_TRUE to ASSERT_TRUE
It doesn't seem to make sense to continue the test if
rc_api_->UpdateRateControl(rc_cfg_) fails, because subsequent code may
assume the numbers of spatial and temporal layers have been updated in
the rate control class. So change EXPECT_TRUE to ASSERT_TRUE.
Change-Id: I26ccee1372741790738261a9c28fe0a6fde3e2e8
diff --git a/test/ratectrl_rtc_test.cc b/test/ratectrl_rtc_test.cc
index 2ed8ea1..74c114e 100644
--- a/test/ratectrl_rtc_test.cc
+++ b/test/ratectrl_rtc_test.cc
@@ -89,17 +89,17 @@
// Go down to 2 temporal layers.
SetConfigSvc(3, 2);
encoder->Control(AV1E_SET_SVC_PARAMS, &svc_params_);
- EXPECT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
+ ASSERT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
} else if (superframe_cnt_ == 200 && layer_id_.spatial_layer_id == 0) {
// Go down to 1 temporal layer.
SetConfigSvc(3, 1);
encoder->Control(AV1E_SET_SVC_PARAMS, &svc_params_);
- EXPECT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
+ ASSERT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
} else if (superframe_cnt_ == 300 && layer_id_.spatial_layer_id == 0) {
// Go back up to 3 temporal layers.
SetConfigSvc(3, 3);
encoder->Control(AV1E_SET_SVC_PARAMS, &svc_params_);
- EXPECT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
+ ASSERT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
}
} else if (dynamic_spatial_layers_) {
// In this example the #spatial layers is modified on the fly,
@@ -108,12 +108,12 @@
// Change to 2 spatial layers (240p, 480p).
SetConfigSvc(2, 3);
encoder->Control(AV1E_SET_SVC_PARAMS, &svc_params_);
- EXPECT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
+ ASSERT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
} else if (superframe_cnt_ == 200 && layer_id_.spatial_layer_id == 0) {
// Change to 1 spatial layer (480p).
SetConfigSvc(1, 3);
encoder->Control(AV1E_SET_SVC_PARAMS, &svc_params_);
- EXPECT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
+ ASSERT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
} else if (superframe_cnt_ == 300 && layer_id_.spatial_layer_id == 0) {
// Go back to 3 spatial layers (120p, 240p, 480p).
SetConfigSvc(3, 3);
@@ -126,7 +126,7 @@
// reference instead,
frame_flags_ = AOM_EFLAG_FORCE_KF;
frame_params_.frame_type = aom::kKeyFrame;
- EXPECT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
+ ASSERT_TRUE(rc_api_->UpdateRateControl(rc_cfg_));
}
}
// TODO(marpan): Add dynamic spatial layers based on 0 layer bitrate.
