summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCheng Chen <chengchen@google.com>2022-06-06 15:46:41 -0700
committerCheng Chen <chengchen@google.com>2022-06-06 22:38:10 -0700
commit7bb4bd36122e55236148190625507efc90ec5b75 (patch)
treeeb118bc028bc2819de2ab8fc0b79648213ff87e1 /test
parentb21634073652cb7e73e52168dc2fa9c1b9a30adf (diff)
downloadlibvpx-7bb4bd36122e55236148190625507efc90ec5b75.tar
libvpx-7bb4bd36122e55236148190625507efc90ec5b75.tar.gz
libvpx-7bb4bd36122e55236148190625507efc90ec5b75.tar.bz2
libvpx-7bb4bd36122e55236148190625507efc90ec5b75.zip
L2E: rename 'gop_index' to 'gop_global_index'
'gop_index' has already been used in vpx_rc_encodeframe_info_t, which represents the frame index inside the current group of picture (gop). We therefore use 'gop_global_index' to represent the index of the current gop to avoid duplicate names. Change-Id: I3eb8987dd878f650649b013e0036e23d0846b5f0
Diffstat (limited to 'test')
-rw-r--r--test/vp9_ext_ratectrl_test.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/vp9_ext_ratectrl_test.cc b/test/vp9_ext_ratectrl_test.cc
index 1289e2db8..a3af4e98f 100644
--- a/test/vp9_ext_ratectrl_test.cc
+++ b/test/vp9_ext_ratectrl_test.cc
@@ -44,7 +44,7 @@ struct ToyRateCtrl {
int magic_number;
int coding_index;
- int gop_index;
+ int gop_global_index;
int frames_since_key;
int show_index;
};
@@ -73,7 +73,7 @@ vpx_rc_status_t rc_create_model_gop(void *priv,
ToyRateCtrl *toy_rate_ctrl = new (std::nothrow) ToyRateCtrl;
if (toy_rate_ctrl == nullptr) return VPX_RC_ERROR;
toy_rate_ctrl->magic_number = kModelMagicNumber;
- toy_rate_ctrl->gop_index = 0;
+ toy_rate_ctrl->gop_global_index = 0;
toy_rate_ctrl->frames_since_key = 0;
toy_rate_ctrl->show_index = 0;
toy_rate_ctrl->coding_index = 0;
@@ -198,13 +198,13 @@ vpx_rc_status_t rc_get_gop_decision(vpx_rc_model_t rate_ctrl_model,
if (gop_info->is_key_frame) {
EXPECT_EQ(gop_info->last_gop_use_alt_ref, 0);
EXPECT_EQ(gop_info->frames_since_key, 0);
- EXPECT_EQ(gop_info->gop_index, 0);
- toy_rate_ctrl->gop_index = 0;
+ EXPECT_EQ(gop_info->gop_global_index, 0);
+ toy_rate_ctrl->gop_global_index = 0;
toy_rate_ctrl->frames_since_key = 0;
} else {
EXPECT_EQ(gop_info->last_gop_use_alt_ref, 1);
}
- EXPECT_EQ(gop_info->gop_index, toy_rate_ctrl->gop_index);
+ EXPECT_EQ(gop_info->gop_global_index, toy_rate_ctrl->gop_global_index);
EXPECT_EQ(gop_info->frames_since_key, toy_rate_ctrl->frames_since_key);
EXPECT_EQ(gop_info->show_index, toy_rate_ctrl->show_index);
EXPECT_EQ(gop_info->coding_index, toy_rate_ctrl->coding_index);
@@ -217,7 +217,7 @@ vpx_rc_status_t rc_get_gop_decision(vpx_rc_model_t rate_ctrl_model,
toy_rate_ctrl->show_index +=
gop_decision->gop_coding_frames - gop_decision->use_alt_ref;
toy_rate_ctrl->coding_index += gop_decision->gop_coding_frames;
- ++toy_rate_ctrl->gop_index;
+ ++toy_rate_ctrl->gop_global_index;
return VPX_RC_OK;
}