ref: 5b63f0f821e94f8072eb483014cfc33b05978bb9
parent: 275c2769933d599ae74002610563fe11321668bc
author: Angie Chiang <angiebird@google.com>
date: Tue Nov 17 10:30:55 EST 2020
Capitalize VPX_RC_OK / VPX_RC_ERROR Change-Id: I526bd6a6c2d2095db564f96d63c7ab7ee4dd90ad
--- a/test/vp9_ext_ratectrl_test.cc
+++ b/test/vp9_ext_ratectrl_test.cc
@@ -44,7 +44,7 @@
EXPECT_EQ(ratectrl_config->target_bitrate_kbps, 24000);
EXPECT_EQ(ratectrl_config->frame_rate_num, 30);
EXPECT_EQ(ratectrl_config->frame_rate_den, 1);
- return vpx_rc_ok;
+ return VPX_RC_OK;
}
vpx_rc_status_t rc_send_firstpass_stats(
@@ -57,7 +57,7 @@
for (int i = 0; i < first_pass_stats->num_frames; ++i) {
EXPECT_DOUBLE_EQ(first_pass_stats->frame_stats[i].frame, i);
}
- return vpx_rc_ok;
+ return VPX_RC_OK;
}
vpx_rc_status_t rc_get_encodeframe_decision(
@@ -120,7 +120,7 @@
} else {
frame_decision->q_index = 100;
}
- return vpx_rc_ok;
+ return VPX_RC_OK;
}
vpx_rc_status_t rc_update_encodeframe_result(
@@ -135,7 +135,7 @@
if (toy_rate_ctrl->coding_index == kLosslessCodingIndex) {
EXPECT_EQ(encode_frame_result->sse, 0);
}
- return vpx_rc_ok;
+ return VPX_RC_OK;
}
vpx_rc_status_t rc_delete_model(vpx_rc_model_t rate_ctrl_model) {
@@ -142,7 +142,7 @@
ToyRateCtrl *toy_rate_ctrl = static_cast<ToyRateCtrl *>(rate_ctrl_model);
EXPECT_EQ(toy_rate_ctrl->magic_number, kModelMagicNumber);
delete toy_rate_ctrl;
- return vpx_rc_ok;
+ return VPX_RC_OK;
}
class ExtRateCtrlTest : public ::libvpx_test::EncoderTest,
--- a/vpx/vpx_ext_ratectrl.h
+++ b/vpx/vpx_ext_ratectrl.h
@@ -73,8 +73,8 @@
/*!\brief Status returned by rate control callback functions.
*/
typedef enum vpx_rc_status {
- vpx_rc_ok = 0,
- vpx_rc_error = 1,
+ VPX_RC_OK = 0,
+ VPX_RC_ERROR = 1,
} vpx_rc_status_t;
/*!\brief First pass frame stats