diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-03 12:12:53 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-03 12:12:53 -0800 |
| commit | 38a478fc2c441d7f249d541a7e5248142f499de2 (patch) | |
| tree | eb949f59d108fd3bff59c59d7c900bdf98bb70d9 | |
| parent | f215c641bb0e3245302fe60e6f98a4583da59c54 (diff) | |
| parent | 5b04962cf4113b08c54d37e8e5de5863795c4e7b (diff) | |
| download | libvpx-38a478fc2c441d7f249d541a7e5248142f499de2.tar libvpx-38a478fc2c441d7f249d541a7e5248142f499de2.tar.gz libvpx-38a478fc2c441d7f249d541a7e5248142f499de2.tar.bz2 libvpx-38a478fc2c441d7f249d541a7e5248142f499de2.zip | |
Merge "Merging best_ref_mv and second_best_ref_mv into best_ref_mv[2]."
| -rw-r--r-- | vp9/encoder/vp9_block.h | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index 4b33f7a1f..374f42923 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -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; diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index dd81993dc..865959bea 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -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) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index f3eb996ab..22e480b11 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -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]; |