Capitalize VPX_RC_OK / VPX_RC_ERROR

Change-Id: I526bd6a6c2d2095db564f96d63c7ab7ee4dd90ad

diff --git a/test/vp9_ext_ratectrl_test.cc b/test/vp9_ext_ratectrl_test.cc
index 8db0a358d067a5cffcb0100f358644e52f71fd10..01d801996921d2b0ba9fc6b1d0a6a0bfdb3772f7 100644 (file)
--- a/test/vp9_ext_ratectrl_test.cc
+++ b/test/vp9_ext_ratectrl_test.cc
@@ -44,7 +44,7 @@ vpx_rc_status_t rc_create_model(void *priv,
   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 @@ vpx_rc_status_t rc_send_firstpass_stats(
   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 @@ vpx_rc_status_t rc_get_encodeframe_decision(
   } else {
     frame_decision->q_index = 100;
   }
-  return vpx_rc_ok;
+  return VPX_RC_OK;
 }
 
 vpx_rc_status_t rc_update_encodeframe_result(
@@ -135,14 +135,14 @@ vpx_rc_status_t rc_update_encodeframe_result(
   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) {
   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,

diff --git a/vpx/vpx_ext_ratectrl.h b/vpx/vpx_ext_ratectrl.h
index 8aee4f4d8297fe6004e2cc9bb13ba3e66d3f73ed..bb3caa6148b4ed04e85d974cf141b72263224acb 100644 (file)
--- a/vpx/vpx_ext_ratectrl.h
+++ b/vpx/vpx_ext_ratectrl.h
@@ -73,8 +73,8 @@ typedef struct vpx_rc_encodeframe_result {
 /*!\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