generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup in mvref_common.{h, c}.

Browse Source 
Making code more compact, adding consts, removing redundant arguments,
adding do/while(0) for macros.

Change-Id: Ic9ec0bc58cee0910a5450b7fb8cfbf35fa9d0d16
This commit is contained in:
Dmitry Kovalev 2013-08-23 12:00:14 -07:00
parent 1c159c470a
commit 21d8e8590b
5 changed files with 102 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vp9/common/vp9_findnearmv.c
View File

@ -8,8 +8,6 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <limits.h>
#include "vp9/common/vp9_findnearmv.h" #include "vp9/common/vp9_findnearmv.h"
#include "vp9/common/vp9_mvref_common.h" #include "vp9/common/vp9_mvref_common.h"
@ -45,17 +43,14 @@ void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *cm, MACROBLOCKD *xd,
int mi_row, int mi_col) { int mi_row, int mi_col) {
int_mv dst_list[MAX_MV_REF_CANDIDATES]; int_mv dst_list[MAX_MV_REF_CANDIDATES];
int_mv mv_list[MAX_MV_REF_CANDIDATES]; int_mv mv_list[MAX_MV_REF_CANDIDATES];
MODE_INFO *mi = xd->mode_info_context; MODE_INFO *const mi = xd->mode_info_context;
MB_MODE_INFO *const mbmi = &mi->mbmi;
assert(ref_idx == 0 || ref_idx == 1); assert(ref_idx == 0 || ref_idx == 1);
assert(MAX_MV_REF_CANDIDATES == 2); // makes code here slightly easier assert(MAX_MV_REF_CANDIDATES == 2); // makes code here slightly easier
vp9_find_mv_refs_idx(cm, xd, xd->mode_info_context, vp9_find_mv_refs_idx(cm, xd, mi, xd->prev_mode_info_context,
xd->prev_mode_info_context, mi->mbmi.ref_frame[ref_idx],
mbmi->ref_frame[ref_idx], mv_list, block_idx, mi_row, mi_col);
mv_list, cm->ref_frame_sign_bias, block_idx,
mi_row, mi_col);
dst_list[1].as_int = 0; dst_list[1].as_int = 0;
if (block_idx == 0) { if (block_idx == 0) {

183
vp9/common/vp9_mvref_common.c
View File

@ -121,10 +121,10 @@ static void clamp_mv_ref(MV *mv, const MACROBLOCKD *xd) {
static INLINE int_mv get_sub_block_mv(const MODE_INFO *candidate, static INLINE int_mv get_sub_block_mv(const MODE_INFO *candidate,
int check_sub_blocks, int which_mv, int check_sub_blocks, int which_mv,
int search_col, int block_idx) { int search_col, int block_idx) {
return (check_sub_blocks && candidate->mbmi.sb_type < BLOCK_8X8 return check_sub_blocks && candidate->mbmi.sb_type < BLOCK_8X8
? candidate->bmi[idx_n_column_to_subblock[block_idx][search_col == 0]] ? candidate->bmi[idx_n_column_to_subblock[block_idx][search_col == 0]]
.as_mv[which_mv] .as_mv[which_mv]
: candidate->mbmi.mv[which_mv]); : candidate->mbmi.mv[which_mv];
} }
@ -144,54 +144,52 @@ static INLINE int_mv scale_mv(const MB_MODE_INFO *mbmi, int ref,
// already in the list. If it's the second motion vector it will also // already in the list. If it's the second motion vector it will also
// skip all additional processing and jump to done! // skip all additional processing and jump to done!
#define ADD_MV_REF_LIST(MV) \ #define ADD_MV_REF_LIST(MV) \
if (refmv_count) { \ do { \
if ((MV).as_int != mv_ref_list[0].as_int) { \ if (refmv_count) { \
mv_ref_list[refmv_count] = (MV); \ if ((MV).as_int != mv_ref_list[0].as_int) { \
goto Done; \ mv_ref_list[refmv_count] = (MV); \
goto Done; \
} \
} else { \
mv_ref_list[refmv_count++] = (MV); \
} \ } \
} else { \ } while (0)
mv_ref_list[refmv_count++] = (MV); \
}
// If either reference frame is different, not INTRA, and they // If either reference frame is different, not INTRA, and they
// are different from each other scale and add the mv to our list. // are different from each other scale and add the mv to our list.
#define IF_DIFF_REF_FRAME_ADD_MV(CANDIDATE) \ #define IF_DIFF_REF_FRAME_ADD_MV(CANDIDATE) \
if ((CANDIDATE)->ref_frame[0] != ref_frame) { \ do { \
ADD_MV_REF_LIST(scale_mv((CANDIDATE), 0, ref_frame, ref_sign_bias)); \ if ((CANDIDATE)->ref_frame[0] != ref_frame) \
} \ ADD_MV_REF_LIST(scale_mv((CANDIDATE), 0, ref_frame, ref_sign_bias)); \
if ((CANDIDATE)->ref_frame[1] != ref_frame && \ if ((CANDIDATE)->ref_frame[1] != ref_frame && \
(CANDIDATE)->ref_frame[1] > INTRA_FRAME && \ has_second_ref(CANDIDATE) && \
(CANDIDATE)->mv[1].as_int != (CANDIDATE)->mv[0].as_int) { \ (CANDIDATE)->mv[1].as_int != (CANDIDATE)->mv[0].as_int) \
ADD_MV_REF_LIST(scale_mv((CANDIDATE), 1, ref_frame, ref_sign_bias)); \ ADD_MV_REF_LIST(scale_mv((CANDIDATE), 1, ref_frame, ref_sign_bias)); \
} } while (0)
// Checks that the given mi_row, mi_col and search point // Checks that the given mi_row, mi_col and search point
// are inside the borders of the tile. // are inside the borders of the tile.
static INLINE int is_inside(int mi_col, int mi_row, static INLINE int is_inside(const VP9_COMMON *cm, int mi_col, int mi_row,
int cur_tile_mi_col_start, const MV *mv) {
int cur_tile_mi_col_end, return !(mi_row + mv->row < 0 ||
int mi_rows, mi_col + mv->col < cm->cur_tile_mi_col_start ||
const MV *mv_ref) { mi_row + mv->row >= cm->mi_rows ||
return !(mi_row + mv_ref->row < 0 || mi_col + mv->col >= cm->cur_tile_mi_col_end);
mi_col + mv_ref->col < cur_tile_mi_col_start ||
mi_row + mv_ref->row >= mi_rows ||
mi_col + mv_ref->col >= cur_tile_mi_col_end);
} }
// This function searches the neighbourhood of a given MB/SB // This function searches the neighbourhood of a given MB/SB
// to try and find candidate reference vectors. // to try and find candidate reference vectors.
void vp9_find_mv_refs_idx(VP9_COMMON *cm, MACROBLOCKD *xd, MODE_INFO *here, void vp9_find_mv_refs_idx(const VP9_COMMON *cm, const MACROBLOCKD *xd,
const MODE_INFO *lf_here, MODE_INFO *mi, const MODE_INFO *prev_mi,
const MV_REFERENCE_FRAME ref_frame, MV_REFERENCE_FRAME ref_frame,
int_mv *mv_ref_list, const int *ref_sign_bias, int_mv *mv_ref_list,
const int block_idx, int block_idx,
const int mi_row, const int mi_col) { int mi_row, int mi_col) {
int idx; const int *ref_sign_bias = cm->ref_frame_sign_bias;
MB_MODE_INFO *mbmi = &xd->mode_info_context->mbmi; int i, refmv_count = 0;
int refmv_count = 0; const MV *const mv_ref_search = mv_ref_blocks[mi->mbmi.sb_type];
const MV *mv_ref_search = mv_ref_blocks[mbmi->sb_type]; const MB_MODE_INFO *const prev_mbmi = prev_mi ? &prev_mi->mbmi : NULL;
const MODE_INFO *candidate;
const int check_sub_blocks = block_idx >= 0;
int different_ref_found = 0; int different_ref_found = 0;
int context_counter = 0; int context_counter = 0;
@ -201,29 +199,27 @@ void vp9_find_mv_refs_idx(VP9_COMMON *cm, MACROBLOCKD *xd, MODE_INFO *here,
// The nearest 2 blocks are treated differently // The nearest 2 blocks are treated differently
// if the size < 8x8 we get the mv from the bmi substructure, // if the size < 8x8 we get the mv from the bmi substructure,
// and we also need to keep a mode count. // and we also need to keep a mode count.
for (idx = 0; idx < 2; ++idx) { for (i = 0; i < 2; ++i) {
const MV *mv_ref = &mv_ref_search[idx]; const MV *const mv_ref = &mv_ref_search[i];
if (is_inside(cm, mi_col, mi_row, mv_ref)) {
const int check_sub_blocks = block_idx >= 0;
const MODE_INFO *const candidate_mi = &mi[mv_ref->col + mv_ref->row
* xd->mode_info_stride];
const MB_MODE_INFO *const candidate = &candidate_mi->mbmi;
// Keep counts for entropy encoding.
context_counter += mode_2_counter[candidate->mode];
if (!is_inside(mi_col, mi_row, cm->cur_tile_mi_col_start, // Check if the candidate comes from the same reference frame.
cm->cur_tile_mi_col_end, cm->mi_rows, mv_ref)) if (candidate->ref_frame[0] == ref_frame) {
continue; ADD_MV_REF_LIST(get_sub_block_mv(candidate_mi, check_sub_blocks, 0,
candidate = here + mv_ref->col + mv_ref->row * xd->mode_info_stride;
// Keep counts for entropy encoding.
context_counter += mode_2_counter[candidate->mbmi.mode];
// Check if the candidate comes from the same reference frame.
if (candidate->mbmi.ref_frame[0] == ref_frame) {
ADD_MV_REF_LIST(get_sub_block_mv(candidate, check_sub_blocks, 0,
mv_ref->col, block_idx));
different_ref_found = candidate->mbmi.ref_frame[1] != ref_frame;
} else {
different_ref_found = 1;
if (candidate->mbmi.ref_frame[1] == ref_frame) {
// Add second motion vector if it has the same ref_frame.
ADD_MV_REF_LIST(get_sub_block_mv(candidate, check_sub_blocks, 1,
mv_ref->col, block_idx)); mv_ref->col, block_idx));
different_ref_found = candidate->ref_frame[1] != ref_frame;
} else {
if (candidate->ref_frame[1] == ref_frame)
// Add second motion vector if it has the same ref_frame.
ADD_MV_REF_LIST(get_sub_block_mv(candidate_mi, check_sub_blocks, 1,
mv_ref->col, block_idx));
different_ref_found = 1;
} }
} }
} }
@ -231,64 +227,57 @@ void vp9_find_mv_refs_idx(VP9_COMMON *cm, MACROBLOCKD *xd, MODE_INFO *here,
// Check the rest of the neighbors in much the same way // Check the rest of the neighbors in much the same way
// as before except we don't need to keep track of sub blocks or // as before except we don't need to keep track of sub blocks or
// mode counts. // mode counts.
for (; idx < MVREF_NEIGHBOURS; ++idx) { for (; i < MVREF_NEIGHBOURS; ++i) {
const MV *mv_ref = &mv_ref_search[idx]; const MV *const mv_ref = &mv_ref_search[i];
if (!is_inside(mi_col, mi_row, cm->cur_tile_mi_col_start, if (is_inside(cm, mi_col, mi_row, mv_ref)) {
cm->cur_tile_mi_col_end, cm->mi_rows, mv_ref)) const MB_MODE_INFO *const candidate = &mi[mv_ref->col + mv_ref->row
continue; * xd->mode_info_stride].mbmi;
candidate = here + mv_ref->col + mv_ref->row * xd->mode_info_stride; if (candidate->ref_frame[0] == ref_frame) {
ADD_MV_REF_LIST(candidate->mv[0]);
if (candidate->mbmi.ref_frame[0] == ref_frame) { different_ref_found = candidate->ref_frame[1] != ref_frame;
ADD_MV_REF_LIST(candidate->mbmi.mv[0]); } else {
different_ref_found = candidate->mbmi.ref_frame[1] != ref_frame; if (candidate->ref_frame[1] == ref_frame)
} else { ADD_MV_REF_LIST(candidate->mv[1]);
different_ref_found = 1; different_ref_found = 1;
if (candidate->mbmi.ref_frame[1] == ref_frame) {
ADD_MV_REF_LIST(candidate->mbmi.mv[1]);
} }
} }
} }
// Check the last frame's mode and mv info. // Check the last frame's mode and mv info.
if (lf_here != NULL) { if (prev_mbmi) {
if (lf_here->mbmi.ref_frame[0] == ref_frame) { if (prev_mbmi->ref_frame[0] == ref_frame)
ADD_MV_REF_LIST(lf_here->mbmi.mv[0]); ADD_MV_REF_LIST(prev_mbmi->mv[0]);
} else if (lf_here->mbmi.ref_frame[1] == ref_frame) { else if (prev_mbmi->ref_frame[1] == ref_frame)
ADD_MV_REF_LIST(lf_here->mbmi.mv[1]); ADD_MV_REF_LIST(prev_mbmi->mv[1]);
}
} }
// Since we couldn't find 2 mvs from the same reference frame // Since we couldn't find 2 mvs from the same reference frame
// go back through the neighbors and find motion vectors from // go back through the neighbors and find motion vectors from
// different reference frames. // different reference frames.
if (different_ref_found) { if (different_ref_found) {
for (idx = 0; idx < MVREF_NEIGHBOURS; ++idx) { for (i = 0; i < MVREF_NEIGHBOURS; ++i) {
const MV *mv_ref = &mv_ref_search[idx]; const MV *mv_ref = &mv_ref_search[i];
if (!is_inside(mi_col, mi_row, cm->cur_tile_mi_col_start, if (is_inside(cm, mi_col, mi_row, mv_ref)) {
cm->cur_tile_mi_col_end, cm->mi_rows, mv_ref)) const MB_MODE_INFO *const candidate = &mi[mv_ref->col + mv_ref->row
continue; * xd->mode_info_stride].mbmi;
candidate = here + mv_ref->col + mv_ref->row * xd->mode_info_stride; // If the candidate is INTRA we don't want to consider its mv.
if (is_inter_block(candidate))
// If the candidate is INTRA we don't want to consider its mv. IF_DIFF_REF_FRAME_ADD_MV(candidate);
if (!is_inter_block(&candidate->mbmi)) }
continue;
IF_DIFF_REF_FRAME_ADD_MV(&candidate->mbmi);
} }
} }
// Since we still don't have a candidate we'll try the last frame. // Since we still don't have a candidate we'll try the last frame.
if (lf_here != NULL && is_inter_block(&lf_here->mbmi)) { if (prev_mbmi && is_inter_block(prev_mbmi))
IF_DIFF_REF_FRAME_ADD_MV(&lf_here->mbmi); IF_DIFF_REF_FRAME_ADD_MV(prev_mbmi);
}
Done: Done:
mbmi->mode_context[ref_frame] = counter_to_context[context_counter]; mi->mbmi.mode_context[ref_frame] = counter_to_context[context_counter];
// Clamp vectors // Clamp vectors
for (idx = 0; idx < MAX_MV_REF_CANDIDATES; ++idx) for (i = 0; i < MAX_MV_REF_CANDIDATES; ++i)
clamp_mv_ref(&mv_ref_list[idx].as_mv, xd); clamp_mv_ref(&mv_ref_list[i].as_mv, xd);
} }

25
vp9/common/vp9_mvref_common.h
View File

@ -14,27 +14,20 @@
#ifndef VP9_COMMON_VP9_MVREF_COMMON_H_ #ifndef VP9_COMMON_VP9_MVREF_COMMON_H_
#define VP9_COMMON_VP9_MVREF_COMMON_H_ #define VP9_COMMON_VP9_MVREF_COMMON_H_
void vp9_find_mv_refs_idx(VP9_COMMON *cm, void vp9_find_mv_refs_idx(const VP9_COMMON *cm, const MACROBLOCKD *xd,
MACROBLOCKD *xd, MODE_INFO *mi, const MODE_INFO *prev_mi,
MODE_INFO *here, MV_REFERENCE_FRAME ref_frame,
const MODE_INFO *lf_here,
const MV_REFERENCE_FRAME ref_frame,
int_mv *mv_ref_list, int_mv *mv_ref_list,
const int *ref_sign_bias, int block_idx,
const int block_idx, int mi_row, int mi_col);
const int mi_row,
const int mi_col);
static INLINE void vp9_find_mv_refs(VP9_COMMON *cm, static INLINE void vp9_find_mv_refs(const VP9_COMMON *cm, const MACROBLOCKD *xd,
MACROBLOCKD *xd, MODE_INFO *mi, const MODE_INFO *prev_mi,
MODE_INFO *here,
MODE_INFO *lf_here,
MV_REFERENCE_FRAME ref_frame, MV_REFERENCE_FRAME ref_frame,
int_mv *mv_ref_list, int_mv *mv_ref_list,
int *ref_sign_bias,
int mi_row, int mi_col) { int mi_row, int mi_col) {
vp9_find_mv_refs_idx(cm, xd, here, lf_here, ref_frame, vp9_find_mv_refs_idx(cm, xd, mi, prev_mi, ref_frame,
mv_ref_list, ref_sign_bias, -1, mi_row, mi_col); mv_ref_list, -1, mi_row, mi_col);
} }
#endif // VP9_COMMON_VP9_MVREF_COMMON_H_ #endif // VP9_COMMON_VP9_MVREF_COMMON_H_

6
vp9/decoder/vp9_decodemv.c
View File

@ -454,8 +454,7 @@ static void read_inter_block_mode_info(VP9D_COMP *pbi, MODE_INFO *mi,
is_compound = ref1 > INTRA_FRAME; is_compound = ref1 > INTRA_FRAME;
vp9_find_mv_refs(cm, xd, mi, xd->prev_mode_info_context, vp9_find_mv_refs(cm, xd, mi, xd->prev_mode_info_context,
ref0, mbmi->ref_mvs[ref0], cm->ref_frame_sign_bias, ref0, mbmi->ref_mvs[ref0], mi_row, mi_col);
mi_row, mi_col);
inter_mode_ctx = mbmi->mode_context[ref0]; inter_mode_ctx = mbmi->mode_context[ref0];
@ -478,8 +477,7 @@ static void read_inter_block_mode_info(VP9D_COMP *pbi, MODE_INFO *mi,
if (is_compound) { if (is_compound) {
vp9_find_mv_refs(cm, xd, mi, xd->prev_mode_info_context, vp9_find_mv_refs(cm, xd, mi, xd->prev_mode_info_context,
ref1, mbmi->ref_mvs[ref1], cm->ref_frame_sign_bias, ref1, mbmi->ref_mvs[ref1], mi_row, mi_col);
mi_row, mi_col);
if (bsize < BLOCK_8X8 || mbmi->mode != ZEROMV) { if (bsize < BLOCK_8X8 || mbmi->mode != ZEROMV) {
vp9_find_best_ref_mvs(xd, mbmi->ref_mvs[ref1], vp9_find_best_ref_mvs(xd, mbmi->ref_mvs[ref1],

3
vp9/encoder/vp9_rdopt.c
View File

@ -2273,8 +2273,7 @@ static void setup_buffer_inter(VP9_COMP *cpi, MACROBLOCK *x,
vp9_find_mv_refs(&cpi->common, xd, xd->mode_info_context, vp9_find_mv_refs(&cpi->common, xd, xd->mode_info_context,
xd->prev_mode_info_context, xd->prev_mode_info_context,
frame_type, frame_type,
mbmi->ref_mvs[frame_type], mbmi->ref_mvs[frame_type], mi_row, mi_col);
cpi->common.ref_frame_sign_bias, mi_row, mi_col);
// Candidate refinement carried out at encoder and decoder // Candidate refinement carried out at encoder and decoder
vp9_find_best_ref_mvs(xd, vp9_find_best_ref_mvs(xd,