diff options
| author | Johann <johannkoenig@google.com> | 2012-08-01 11:01:46 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2012-08-01 11:14:10 -0700 |
| commit | 41aede61e907d89d6b878b70d1f89a9687368af5 (patch) | |
| tree | 20e5cbc4eeec606119f1ac6cb15ddab49117d19d /vp8/decoder/decodframe.c | |
| parent | a82c58c40fe20532ef0bdadb6f8c1a397ea1c10a (diff) | |
| download | libvpx-41aede61e907d89d6b878b70d1f89a9687368af5.tar libvpx-41aede61e907d89d6b878b70d1f89a9687368af5.tar.gz libvpx-41aede61e907d89d6b878b70d1f89a9687368af5.tar.bz2 libvpx-41aede61e907d89d6b878b70d1f89a9687368af5.zip | |
Use intra4x4_predict_d parameter names
Rename the local variables for consistency.
Change-Id: Ic202ff54551332f706d97da9b67b2e0959ee7f61
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 1694b489f..8853b353b 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -177,7 +177,6 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, { short *DQC = xd->dequant_y1; int dst_stride = xd->dst.y_stride; - unsigned char *base_dst = xd->dst.y_buffer; /* clear out residual eob info */ if(xd->mode_info_context->mbmi.mb_skip_coeff) @@ -188,36 +187,28 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, for (i = 0; i < 16; i++) { BLOCKD *b = &xd->block[i]; + unsigned char *dst = xd->dst.y_buffer + b->offset; int b_mode = xd->mode_info_context->bmi[i].as_mode; - unsigned char *yabove; - unsigned char *yleft; - int left_stride; - unsigned char top_left; + unsigned char *Above = dst - dst_stride; + unsigned char *yleft = dst - 1; + int left_stride = dst_stride; + unsigned char top_left = Above[-1]; - yabove = base_dst + b->offset - dst_stride; - yleft = base_dst + b->offset - 1; - left_stride = dst_stride; - top_left = yabove[-1]; - - vp8_intra4x4_predict_d(yabove, yleft, left_stride, - b_mode, - base_dst + b->offset, dst_stride, - top_left); + vp8_intra4x4_predict_d(Above, yleft, left_stride, b_mode, + dst, dst_stride, top_left); if (xd->eobs[i]) { if (xd->eobs[i] > 1) { - vp8_dequant_idct_add - (b->qcoeff, DQC, - base_dst + b->offset, dst_stride); + vp8_dequant_idct_add(b->qcoeff, DQC, dst, dst_stride); } else { vp8_dc_only_idct_add (b->qcoeff[0] * DQC[0], - base_dst + b->offset, dst_stride, - base_dst + b->offset, dst_stride); + dst, dst_stride, + dst, dst_stride); ((int *)b->qcoeff)[0] = 0; } } |