diff options
| author | Angie Chiang <angiebird@google.com> | 2019-02-06 13:52:48 -0800 |
|---|---|---|
| committer | Angie Chiang <angiebird@google.com> | 2019-02-13 11:10:48 -0800 |
| commit | e3fae047856e622ffd04330f935cbdebdd625aa5 (patch) | |
| tree | 2a0befaa456801f393da4d4feac1d82a861c6f48 /vp9/encoder/vp9_encoder.c | |
| parent | 36f42a3769e6f15ca4b9bd64d1bc26311ef588a5 (diff) | |
| download | libvpx-e3fae047856e622ffd04330f935cbdebdd625aa5.tar libvpx-e3fae047856e622ffd04330f935cbdebdd625aa5.tar.gz libvpx-e3fae047856e622ffd04330f935cbdebdd625aa5.tar.bz2 libvpx-e3fae047856e622ffd04330f935cbdebdd625aa5.zip | |
Use mv_mode_arr to decide the newmv discount place
Change-Id: I98c32aba4c9e81380b588dcdbfa991468487ce73
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index a5da54283..c69f581d6 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -6040,11 +6040,6 @@ static int get_block_src_pred_buf(MACROBLOCKD *xd, GF_PICTURE *gf_picture, #define kMvPreCheckLines 5 #define kMvPreCheckSize 15 -#define ZERO_MV_MODE 0 -#define NEW_MV_MODE 1 -#define NEAREST_MV_MODE 2 -#define NEAR_MV_MODE 3 -#define MAX_MV_MODE 4 #define MV_REF_POS_NUM 3 POSITION mv_ref_pos[MV_REF_POS_NUM] = { @@ -6631,6 +6626,7 @@ static void mc_flow_dispenser(VP9_COMP *cpi, GF_PICTURE *gf_picture, int64_t recon_error, sse; #if CONFIG_NON_GREEDY_MV int square_block_idx; + int rf_idx; #endif // Setup scaling factor @@ -6677,6 +6673,13 @@ static void mc_flow_dispenser(VP9_COMP *cpi, GF_PICTURE *gf_picture, BLOCK_SIZE square_bsize = square_block_idx_to_bsize(square_block_idx); build_motion_field(cpi, xd, frame_idx, ref_frame, square_bsize); } + for (rf_idx = 0; rf_idx < 3; ++rf_idx) { + int ref_frame_idx = gf_picture[frame_idx].ref_frame[rf_idx]; + if (ref_frame_idx != -1) { + predict_mv_mode_arr(cpi, x, gf_picture, frame_idx, tpl_frame, rf_idx, + bsize); + } + } #endif for (mi_row = 0; mi_row < cm->mi_rows; mi_row += mi_height) { |