diff options
| author | James Zern <jzern@google.com> | 2014-03-14 18:37:20 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-03-15 10:37:49 -0700 |
| commit | 268f32db21a4427c01808477234a7480082b4692 (patch) | |
| tree | aa7577bb057dfc05b62f8b6925c743ee58adf7b9 /vp8/encoder/rdopt.c | |
| parent | 7c6337ba9e486c8066db83ea2d845c3e8b7697f8 (diff) | |
| download | libvpx-268f32db21a4427c01808477234a7480082b4692.tar libvpx-268f32db21a4427c01808477234a7480082b4692.tar.gz libvpx-268f32db21a4427c01808477234a7480082b4692.tar.bz2 libvpx-268f32db21a4427c01808477234a7480082b4692.zip | |
rdopt: quiet -Warray-bounds warnings
eob is limited by GetCoeffs
Change-Id: Id48a92e600375a1d4fb956757c93c91ebb5df59a
Diffstat (limited to 'vp8/encoder/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 5016cc422..387701c57 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -528,19 +528,16 @@ static int cost_coeffs(MACROBLOCK *mb, BLOCKD *b, int type, ENTROPY_CONTEXT *a, VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l); -# define QC( I) ( qcoeff_ptr [vp8_default_zig_zag1d[I]] ) - + assert(eob <= 16); for (; c < eob; c++) { - int v = QC(c); - int t = vp8_dct_value_tokens_ptr[v].Token; + const int v = qcoeff_ptr[vp8_default_zig_zag1d[c]]; + const int t = vp8_dct_value_tokens_ptr[v].Token; cost += mb->token_costs [type] [vp8_coef_bands[c]] [pt] [t]; cost += vp8_dct_value_cost_ptr[v]; pt = vp8_prev_token_class[t]; } -# undef QC - if (c < 16) cost += mb->token_costs [type] [vp8_coef_bands[c]] [pt] [DCT_EOB_TOKEN]; |