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

Merging best_ref_mv and second_best_ref_mv into best_ref_mv[2].

Browse Source 
Change-Id: If04b57828847cee09a79c94e1098d1aa4990ea0d
This commit is contained in:
Dmitry Kovalev 2014-01-03 11:31:00 -08:00
parent f16b186b8e
commit 5b04962cf4
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vp9/encoder/vp9_block.h
View File

@ -41,8 +41,7 @@ typedef struct {
int is_coded;
int num_4x4_blk;
int skip;
int_mv best_ref_mv;
int_mv second_best_ref_mv;
int_mv best_ref_mv[2];
int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REF_CANDIDATES];
int rate;
int distortion;

4
vp9/encoder/vp9_encodeframe.c
View File

@ -513,8 +513,8 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx,
int_mv best_mv[2];
const MV_REFERENCE_FRAME rf1 = mbmi->ref_frame[0];
const MV_REFERENCE_FRAME rf2 = mbmi->ref_frame[1];
best_mv[0].as_int = ctx->best_ref_mv.as_int;
best_mv[1].as_int = ctx->second_best_ref_mv.as_int;
best_mv[0].as_int = ctx->best_ref_mv[0].as_int;
best_mv[1].as_int = ctx->best_ref_mv[1].as_int;
if (mbmi->mode == NEWMV) {
best_mv[0].as_int = mbmi->ref_mvs[rf1][0].as_int;
if (rf2 > 0)

4
vp9/encoder/vp9_rdopt.c
View File

@ -2217,8 +2217,8 @@ static void store_coding_context(MACROBLOCK *x, PICK_MODE_CONTEXT *ctx,
ctx->best_mode_index = mode_index;
ctx->mic = *xd->mi_8x8[0];
ctx->best_ref_mv.as_int = ref_mv->as_int;
ctx->second_best_ref_mv.as_int = second_ref_mv->as_int;
ctx->best_ref_mv[0].as_int = ref_mv->as_int;
ctx->best_ref_mv[1].as_int = second_ref_mv->as_int;
ctx->single_pred_diff = (int)comp_pred_diff[SINGLE_REFERENCE];
ctx->comp_pred_diff = (int)comp_pred_diff[COMPOUND_REFERENCE];