Commit 5c60cdf2 authored by Jingning Han's avatar Jingning Han
Browse files

Sync assign_mv format

Change-Id: I4fea280d72d7e428f2ab0820fd728997d5a903c9
parent 3b0a3f3a
...@@ -938,10 +938,7 @@ static INLINE int is_mv_valid(const MV *mv) { ...@@ -938,10 +938,7 @@ static INLINE int is_mv_valid(const MV *mv) {
static INLINE int assign_mv(AV1_COMMON *cm, MACROBLOCKD *xd, static INLINE int assign_mv(AV1_COMMON *cm, MACROBLOCKD *xd,
PREDICTION_MODE mode, PREDICTION_MODE mode,
MV_REFERENCE_FRAME ref_frame[2], MV_REFERENCE_FRAME ref_frame[2], int block,
#if CONFIG_REF_MV
int block,
#endif
int_mv mv[2], int_mv ref_mv[2], int_mv mv[2], int_mv ref_mv[2],
int_mv nearest_mv[2], int_mv near_mv[2], int_mv nearest_mv[2], int_mv near_mv[2],
int is_compound, int allow_hp, aom_reader *r) { int is_compound, int allow_hp, aom_reader *r) {
...@@ -952,6 +949,8 @@ static INLINE int assign_mv(AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -952,6 +949,8 @@ static INLINE int assign_mv(AV1_COMMON *cm, MACROBLOCKD *xd,
BLOCK_SIZE bsize = mbmi->sb_type; BLOCK_SIZE bsize = mbmi->sb_type;
int_mv *pred_mv = int_mv *pred_mv =
(bsize >= BLOCK_8X8) ? mbmi->pred_mv : xd->mi[0]->bmi[block].pred_mv; (bsize >= BLOCK_8X8) ? mbmi->pred_mv : xd->mi[0]->bmi[block].pred_mv;
#else
(void)block;
#endif #endif
(void)ref_frame; (void)ref_frame;
...@@ -1466,11 +1465,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi, ...@@ -1466,11 +1465,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
(void)ref_mv_s8; (void)ref_mv_s8;
#endif #endif
if (!assign_mv(cm, xd, b_mode, mbmi->ref_frame, if (!assign_mv(cm, xd, b_mode, mbmi->ref_frame, j, block,
#if CONFIG_REF_MV
j,
#endif
block,
#if CONFIG_EXT_INTER #if CONFIG_EXT_INTER
ref_mv[mv_idx], ref_mv[mv_idx],
#else #else
...@@ -1518,11 +1513,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi, ...@@ -1518,11 +1513,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
} }
xd->corrupted |= xd->corrupted |=
!assign_mv(cm, xd, mbmi->mode, mbmi->ref_frame, !assign_mv(cm, xd, mbmi->mode, mbmi->ref_frame, 0, mbmi->mv,
#if CONFIG_REF_MV
0,
#endif
mbmi->mv,
#if CONFIG_EXT_INTER #if CONFIG_EXT_INTER
mbmi->mode == NEWFROMNEARMV ? nearmv : nearestmv, mbmi->mode == NEWFROMNEARMV ? nearmv : nearestmv,
#else #else
......
Supports Markdown
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