Commit df76a617 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Cleanup of set_offsets function.

Adding ALLOWED_REFS_PER_FRAME constant instead of hard coded number 3.

Change-Id: I46146aa837896936f920c748c7d4aa4c27f026e4
parent 0e7b7e47
...@@ -40,6 +40,8 @@ void vp9_initialize_common(void); ...@@ -40,6 +40,8 @@ void vp9_initialize_common(void);
#define NUM_REF_FRAMES 3 #define NUM_REF_FRAMES 3
#define NUM_REF_FRAMES_LG2 2 #define NUM_REF_FRAMES_LG2 2
#define ALLOWED_REFS_PER_FRAME 3
// 1 scratch frame for the new frame, 3 for scaled references on the encoder // 1 scratch frame for the new frame, 3 for scaled references on the encoder
// TODO(jkoleszar): These 3 extra references could probably come from the // TODO(jkoleszar): These 3 extra references could probably come from the
// normal reference pool. // normal reference pool.
......
...@@ -944,31 +944,26 @@ static void set_offsets(VP9D_COMP *pbi, int block_size, ...@@ -944,31 +944,26 @@ static void set_offsets(VP9D_COMP *pbi, int block_size,
int mb_row, int mb_col) { int mb_row, int mb_col) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
MACROBLOCKD *const xd = &pbi->mb; MACROBLOCKD *const xd = &pbi->mb;
const int mis = cm->mode_info_stride;
const int idx = mis * mb_row + mb_col;
const int dst_fb_idx = cm->new_fb_idx;
const int recon_y_stride = cm->yv12_fb[dst_fb_idx].y_stride;
const int recon_uv_stride = cm->yv12_fb[dst_fb_idx].uv_stride;
const int recon_yoffset = mb_row * 16 * recon_y_stride + 16 * mb_col;
const int recon_uvoffset = mb_row * 8 * recon_uv_stride + 8 * mb_col;
xd->mode_info_context = cm->mi + idx;
xd->mode_info_context->mbmi.sb_type = block_size >> 5;
xd->prev_mode_info_context = cm->prev_mi + idx;
xd->above_context = cm->above_context + mb_col;
xd->left_context = cm->left_context + (mb_row & 3);
// Distance of Mb to the various image edges. const int mb_idx = mb_row * cm->mode_info_stride + mb_col;
// These are specified to 8th pel as they are always compared to const YV12_BUFFER_CONFIG *dst_fb = &cm->yv12_fb[cm->new_fb_idx];
// values that are in 1/8th pel units const int recon_yoffset = (16 * mb_row) * dst_fb->y_stride + (16 * mb_col);
block_size >>= 4; // in mb units const int recon_uvoffset = (8 * mb_row) * dst_fb->uv_stride + (8 * mb_col);
xd->mode_info_context = cm->mi + mb_idx;
xd->mode_info_context->mbmi.sb_type = (BLOCK_SIZE_TYPE)(block_size / 32);
xd->prev_mode_info_context = cm->prev_mi + mb_idx;
xd->above_context = cm->above_context + mb_col;
xd->left_context = cm->left_context + mb_row % 4;
set_mb_row(cm, xd, mb_row, block_size); // Distance of Mb to the various image edges. These are specified to 8th pel
set_mb_col(cm, xd, mb_col, block_size); // as they are always compared to values that are in 1/8th pel units
set_mb_row(cm, xd, mb_row, block_size / 16);
set_mb_col(cm, xd, mb_col, block_size / 16);
xd->dst.y_buffer = cm->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset; xd->dst.y_buffer = dst_fb->y_buffer + recon_yoffset;
xd->dst.u_buffer = cm->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset; xd->dst.u_buffer = dst_fb->u_buffer + recon_uvoffset;
xd->dst.v_buffer = cm->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset; xd->dst.v_buffer = dst_fb->v_buffer + recon_uvoffset;
} }
static void set_refs(VP9D_COMP *pbi, int block_size, int mb_row, int mb_col) { static void set_refs(VP9D_COMP *pbi, int block_size, int mb_row, int mb_col) {
...@@ -1732,15 +1727,14 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { ...@@ -1732,15 +1727,14 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
// For all non key frames the GF and ARF refresh flags and sign bias // For all non key frames the GF and ARF refresh flags and sign bias
// flags must be set explicitly. // flags must be set explicitly.
if (pc->frame_type == KEY_FRAME) { if (pc->frame_type == KEY_FRAME) {
pc->active_ref_idx[0] = pc->new_fb_idx; for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i)
pc->active_ref_idx[1] = pc->new_fb_idx; pc->active_ref_idx[i] = pc->new_fb_idx;
pc->active_ref_idx[2] = pc->new_fb_idx;
} else { } else {
// Should the GF or ARF be updated from the current frame // Should the GF or ARF be updated from the current frame
pbi->refresh_frame_flags = vp9_read_literal(&header_bc, NUM_REF_FRAMES); pbi->refresh_frame_flags = vp9_read_literal(&header_bc, NUM_REF_FRAMES);
// Select active reference frames // Select active reference frames
for (i = 0; i < 3; i++) { for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
int ref_frame_num = vp9_read_literal(&header_bc, NUM_REF_FRAMES_LG2); int ref_frame_num = vp9_read_literal(&header_bc, NUM_REF_FRAMES_LG2);
pc->active_ref_idx[i] = pc->ref_frame_map[ref_frame_num]; pc->active_ref_idx[i] = pc->ref_frame_map[ref_frame_num];
} }
...@@ -1760,19 +1754,18 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { ...@@ -1760,19 +1754,18 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
pc->use_interintra = vp9_read_bit(&header_bc); pc->use_interintra = vp9_read_bit(&header_bc);
#endif #endif
/* Calculate scaling factors for each of the 3 available references */ // Calculate scaling factors for each of the 3 available references
for (i = 0; i < 3; ++i) { for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
if (pc->active_ref_idx[i] >= NUM_YV12_BUFFERS) { const int idx = pc->active_ref_idx[i];
memset(&pc->active_ref_scale[i], 0, sizeof(pc->active_ref_scale[i])); struct scale_factors *sf = &pc->active_ref_scale[i];
continue; if (idx >= NUM_YV12_BUFFERS)
} memset(sf, 0, sizeof(*sf));
else
vp9_setup_scale_factors_for_frame(&pc->active_ref_scale[i], vp9_setup_scale_factors_for_frame(sf, &pc->yv12_fb[idx],
&pc->yv12_fb[pc->active_ref_idx[i]], pc->width, pc->height);
pc->width, pc->height);
} }
// To enable choice of different interploation filters // To enable choice of different interpolation filters
vp9_setup_interp_filters(xd, pc->mcomp_filter_type, pc); vp9_setup_interp_filters(xd, pc->mcomp_filter_type, pc);
} }
......
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