diff options
author | James Zern <jzern@google.com> | 2014-01-11 12:39:32 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-11 12:39:32 -0800 |
commit | f83c12b540780cd07ec275c725d490480f5b8986 (patch) | |
tree | a77862fe626bf09fc7b84166d01e5281c78ce723 /vp9/common | |
parent | 01236769abb3081a7e69ad8f03a1de9c83fe7756 (diff) | |
parent | 44963dfd370d7042dfb01cfea4c20986add2526e (diff) | |
download | libvpx-f83c12b540780cd07ec275c725d490480f5b8986.tar libvpx-f83c12b540780cd07ec275c725d490480f5b8986.tar.gz libvpx-f83c12b540780cd07ec275c725d490480f5b8986.tar.bz2 libvpx-f83c12b540780cd07ec275c725d490480f5b8986.zip |
Merge "cosmetics: vp9_reconinter.h: make some variables const"
Diffstat (limited to 'vp9/common')
-rw-r--r-- | vp9/common/vp9_reconinter.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h index 9f379399c..3cc16d94e 100644 --- a/vp9/common/vp9_reconinter.h +++ b/vp9/common/vp9_reconinter.h @@ -58,34 +58,34 @@ static void setup_pred_plane(struct buf_2d *dst, static void setup_dst_planes(MACROBLOCKD *xd, const YV12_BUFFER_CONFIG *src, int mi_row, int mi_col) { - uint8_t *buffers[4] = {src->y_buffer, src->u_buffer, src->v_buffer, - src->alpha_buffer}; - int strides[4] = {src->y_stride, src->uv_stride, src->uv_stride, - src->alpha_stride}; + uint8_t *const buffers[4] = {src->y_buffer, src->u_buffer, src->v_buffer, + src->alpha_buffer}; + const int strides[4] = {src->y_stride, src->uv_stride, src->uv_stride, + src->alpha_stride}; int i; for (i = 0; i < MAX_MB_PLANE; ++i) { - struct macroblockd_plane *pd = &xd->plane[i]; + struct macroblockd_plane *const pd = &xd->plane[i]; setup_pred_plane(&pd->dst, buffers[i], strides[i], mi_row, mi_col, NULL, pd->subsampling_x, pd->subsampling_y); } } -static void setup_pre_planes(MACROBLOCKD *xd, int i, +static void setup_pre_planes(MACROBLOCKD *xd, int idx, const YV12_BUFFER_CONFIG *src, int mi_row, int mi_col, const struct scale_factors *sf) { - if (src) { - int j; - uint8_t* buffers[4] = {src->y_buffer, src->u_buffer, src->v_buffer, - src->alpha_buffer}; - int strides[4] = {src->y_stride, src->uv_stride, src->uv_stride, - src->alpha_stride}; + if (src != NULL) { + int i; + uint8_t *const buffers[4] = {src->y_buffer, src->u_buffer, src->v_buffer, + src->alpha_buffer}; + const int strides[4] = {src->y_stride, src->uv_stride, src->uv_stride, + src->alpha_stride}; - for (j = 0; j < MAX_MB_PLANE; ++j) { - struct macroblockd_plane *pd = &xd->plane[j]; - setup_pred_plane(&pd->pre[i], buffers[j], strides[j], - mi_row, mi_col, sf, pd->subsampling_x, pd->subsampling_y); + for (i = 0; i < MAX_MB_PLANE; ++i) { + struct macroblockd_plane *const pd = &xd->plane[i]; + setup_pred_plane(&pd->pre[idx], buffers[i], strides[i], mi_row, mi_col, + sf, pd->subsampling_x, pd->subsampling_y); } } } |