aboutsummaryrefslogtreecommitdiff
path: root/test/svc_datarate_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'test/svc_datarate_test.cc')
-rw-r--r--test/svc_datarate_test.cc58
1 files changed, 29 insertions, 29 deletions
diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc
index 484252ca4..aff4ace84 100644
--- a/test/svc_datarate_test.cc
+++ b/test/svc_datarate_test.cc
@@ -43,7 +43,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
}
protected:
- virtual ~DatarateOnePassCbrSvc() {}
+ ~DatarateOnePassCbrSvc() override = default;
virtual void ResetModel() {
last_pts_ = 0;
@@ -86,7 +86,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
}
ksvc_flex_noupd_tlenh_ = false;
}
- virtual void BeginPassHook(unsigned int /*pass*/) {}
+ void BeginPassHook(unsigned int /*pass*/) override {}
// Example pattern for spatial layers and 2 temporal layers used in the
// bypass/flexible mode. The pattern corresponds to the pattern
@@ -179,8 +179,8 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
}
}
- virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
- ::libvpx_test::Encoder *encoder) {
+ void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
+ ::libvpx_test::Encoder *encoder) override {
PreEncodeFrameHookSetup(video, encoder);
if (video->frame() == 0) {
@@ -256,13 +256,13 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
temporal_layer_id_ = layer_id.temporal_layer_id;
for (int i = 0; i < number_spatial_layers_; i++) {
layer_id.temporal_layer_id_per_spatial[i] = temporal_layer_id_;
- ref_frame_config.duration[i] = 1;
+ ref_frame_config_.duration[i] = 1;
}
encoder->Control(VP9E_SET_SVC_LAYER_ID, &layer_id);
set_frame_flags_bypass_mode(layer_id.temporal_layer_id,
- number_spatial_layers_, 0, &ref_frame_config,
+ number_spatial_layers_, 0, &ref_frame_config_,
1);
- encoder->Control(VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config);
+ encoder->Control(VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config_);
}
if (update_pattern_ && video->frame() >= 100) {
@@ -277,13 +277,13 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
temporal_layer_id_ = layer_id.temporal_layer_id;
for (int i = 0; i < number_spatial_layers_; i++) {
layer_id.temporal_layer_id_per_spatial[i] = temporal_layer_id_;
- ref_frame_config.duration[i] = 1;
+ ref_frame_config_.duration[i] = 1;
}
encoder->Control(VP9E_SET_SVC_LAYER_ID, &layer_id);
set_frame_flags_bypass_mode(layer_id.temporal_layer_id,
- number_spatial_layers_, 0, &ref_frame_config,
+ number_spatial_layers_, 0, &ref_frame_config_,
0);
- encoder->Control(VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config);
+ encoder->Control(VP9E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config_);
}
if (change_bitrate_ && video->frame() == 200) {
@@ -468,7 +468,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
return VPX_CODEC_OK;
}
- virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {
+ void FramePktHook(const vpx_codec_cx_pkt_t *pkt) override {
uint32_t sizes[8] = { 0 };
uint32_t sizes_parsed[8] = { 0 };
int count = 0;
@@ -571,7 +571,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
}
}
- virtual void EndPassHook() {
+ void EndPassHook() override {
if (change_bitrate_) last_pts_ = last_pts_ - last_pts_ref_;
duration_ = (last_pts_ + 1) * timebase_;
for (int sl = 0; sl < number_spatial_layers_; ++sl) {
@@ -583,7 +583,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
}
}
- virtual void MismatchHook(const vpx_image_t *img1, const vpx_image_t *img2) {
+ void MismatchHook(const vpx_image_t *img1, const vpx_image_t *img2) override {
// TODO(marpan): Look into why an assert is triggered in compute_psnr
// for mismatch frames for the special test case: ksvc_flex_noupd_tlenh.
// Has to do with dropped frames in bypass/flexible svc mode.
@@ -611,7 +611,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
bool single_layer_resize_;
unsigned int top_sl_width_;
unsigned int top_sl_height_;
- vpx_svc_ref_frame_config_t ref_frame_config;
+ vpx_svc_ref_frame_config_t ref_frame_config_;
int update_pattern_;
bool change_bitrate_;
vpx_codec_pts_t last_pts_ref_;
@@ -639,7 +639,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc {
bool ksvc_flex_noupd_tlenh_;
private:
- virtual void SetConfig(const int num_temporal_layer) {
+ void SetConfig(const int num_temporal_layer) override {
cfg_.rc_end_usage = VPX_CBR;
cfg_.g_lag_in_frames = 0;
cfg_.g_error_resilient = 1;
@@ -670,10 +670,10 @@ class DatarateOnePassCbrSvcSingleBR
DatarateOnePassCbrSvcSingleBR() : DatarateOnePassCbrSvc(GET_PARAM(0)) {
memset(&svc_params_, 0, sizeof(svc_params_));
}
- virtual ~DatarateOnePassCbrSvcSingleBR() {}
+ ~DatarateOnePassCbrSvcSingleBR() override = default;
protected:
- virtual void SetUp() {
+ void SetUp() override {
InitializeConfig();
SetMode(::libvpx_test::kRealTime);
speed_setting_ = GET_PARAM(1);
@@ -1160,10 +1160,10 @@ class DatarateOnePassCbrSvcMultiBR
DatarateOnePassCbrSvcMultiBR() : DatarateOnePassCbrSvc(GET_PARAM(0)) {
memset(&svc_params_, 0, sizeof(svc_params_));
}
- virtual ~DatarateOnePassCbrSvcMultiBR() {}
+ ~DatarateOnePassCbrSvcMultiBR() override = default;
protected:
- virtual void SetUp() {
+ void SetUp() override {
InitializeConfig();
SetMode(::libvpx_test::kRealTime);
speed_setting_ = GET_PARAM(1);
@@ -1243,10 +1243,10 @@ class DatarateOnePassCbrSvcFrameDropMultiBR
: DatarateOnePassCbrSvc(GET_PARAM(0)) {
memset(&svc_params_, 0, sizeof(svc_params_));
}
- virtual ~DatarateOnePassCbrSvcFrameDropMultiBR() {}
+ ~DatarateOnePassCbrSvcFrameDropMultiBR() override = default;
protected:
- virtual void SetUp() {
+ void SetUp() override {
InitializeConfig();
SetMode(::libvpx_test::kRealTime);
speed_setting_ = GET_PARAM(1);
@@ -1355,10 +1355,10 @@ class DatarateOnePassCbrSvcInterLayerPredSingleBR
: DatarateOnePassCbrSvc(GET_PARAM(0)) {
memset(&svc_params_, 0, sizeof(svc_params_));
}
- virtual ~DatarateOnePassCbrSvcInterLayerPredSingleBR() {}
+ ~DatarateOnePassCbrSvcInterLayerPredSingleBR() override = default;
protected:
- virtual void SetUp() {
+ void SetUp() override {
InitializeConfig();
SetMode(::libvpx_test::kRealTime);
speed_setting_ = GET_PARAM(1);
@@ -1441,10 +1441,10 @@ class DatarateOnePassCbrSvcDenoiser
DatarateOnePassCbrSvcDenoiser() : DatarateOnePassCbrSvc(GET_PARAM(0)) {
memset(&svc_params_, 0, sizeof(svc_params_));
}
- virtual ~DatarateOnePassCbrSvcDenoiser() {}
+ ~DatarateOnePassCbrSvcDenoiser() override = default;
protected:
- virtual void SetUp() {
+ void SetUp() override {
InitializeConfig();
SetMode(::libvpx_test::kRealTime);
speed_setting_ = GET_PARAM(1);
@@ -1499,10 +1499,10 @@ class DatarateOnePassCbrSvcSmallKF
DatarateOnePassCbrSvcSmallKF() : DatarateOnePassCbrSvc(GET_PARAM(0)) {
memset(&svc_params_, 0, sizeof(svc_params_));
}
- virtual ~DatarateOnePassCbrSvcSmallKF() {}
+ ~DatarateOnePassCbrSvcSmallKF() override = default;
protected:
- virtual void SetUp() {
+ void SetUp() override {
InitializeConfig();
SetMode(::libvpx_test::kRealTime);
speed_setting_ = GET_PARAM(1);
@@ -1702,10 +1702,10 @@ class DatarateOnePassCbrSvcPostencodeDrop
DatarateOnePassCbrSvcPostencodeDrop() : DatarateOnePassCbrSvc(GET_PARAM(0)) {
memset(&svc_params_, 0, sizeof(svc_params_));
}
- virtual ~DatarateOnePassCbrSvcPostencodeDrop() {}
+ ~DatarateOnePassCbrSvcPostencodeDrop() override = default;
protected:
- virtual void SetUp() {
+ void SetUp() override {
InitializeConfig();
SetMode(::libvpx_test::kRealTime);
speed_setting_ = GET_PARAM(1);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 16:07:45 +0000