summaryrefslogtreecommitdiff
path: root/vp8/encoder/rdopt.c
diff options
context:
space:
mode:
authorJohann <johann.koenig@duck.com>2018-10-30 11:24:40 -0700
committerJohann <johann.koenig@duck.com>2018-10-30 12:04:25 -0700
commit9a978eb1d915badd6500ce4b1817bf3252226576 (patch)
tree386ceb96ee978ec4c2329c5984d96d42862853c4 /vp8/encoder/rdopt.c
parente018967dc4a8cfe472253bf70ed0af369ef14c64 (diff)
downloadlibvpx-9a978eb1d915badd6500ce4b1817bf3252226576.tar
libvpx-9a978eb1d915badd6500ce4b1817bf3252226576.tar.gz
libvpx-9a978eb1d915badd6500ce4b1817bf3252226576.tar.bz2
libvpx-9a978eb1d915badd6500ce4b1817bf3252226576.zip
clang-tidy: fix vp8/encoder parameters
BUG=webm:1444 Change-Id: I57a305cdab0d62b0745116272fbd5d9257c6e679
Diffstat (limited to 'vp8/encoder/rdopt.c')
-rw-r--r--vp8/encoder/rdopt.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index b4182c5cd..679d66bbf 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2358,11 +2358,11 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
rd_update_mvcount(x, &best_ref_mv);
}
-void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate_) {
+void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate) {
int error4x4, error16x16;
int rate4x4, rate16x16 = 0, rateuv;
int dist4x4, dist16x16, distuv;
- int rate;
+ int rate_;
int rate4x4_tokenonly = 0;
int rate16x16_tokenonly = 0;
int rateuv_tokenonly = 0;
@@ -2370,7 +2370,7 @@ void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate_) {
x->e_mbd.mode_info_context->mbmi.ref_frame = INTRA_FRAME;
rd_pick_intra_mbuv_mode(x, &rateuv, &rateuv_tokenonly, &distuv);
- rate = rateuv;
+ rate_ = rateuv;
error16x16 = rd_pick_intra16x16mby_mode(x, &rate16x16, &rate16x16_tokenonly,
&dist16x16);
@@ -2380,10 +2380,10 @@ void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate_) {
if (error4x4 < error16x16) {
x->e_mbd.mode_info_context->mbmi.mode = B_PRED;
- rate += rate4x4;
+ rate_ += rate4x4;
} else {
- rate += rate16x16;
+ rate_ += rate16x16;
}
- *rate_ = rate;
+ *rate = rate_;
}