Commit f83c12b5 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "cosmetics: vp9_reconinter.h: make some variables const"

parents 01236769 44963dfd
......@@ -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,
uint8_t *const 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,
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,
if (src != NULL) {
int i;
uint8_t *const 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,
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);
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment