diff options
| author | Angie Chiang <angiebird@google.com> | 2019-08-22 17:55:19 -0700 |
|---|---|---|
| committer | Angie Chiang <angiebird@google.com> | 2019-08-28 13:39:33 -0700 |
| commit | f6251cc7a8dbbd01d918d3d9fac04276905fab42 (patch) | |
| tree | 81935dfe557d02dad4cfec8169ef75ee10b43d58 /vp9/encoder/vp9_encoder.h | |
| parent | f40c00b206ee6b405ce44a46f6e2adf6906bd41b (diff) | |
| download | libvpx-f6251cc7a8dbbd01d918d3d9fac04276905fab42.tar libvpx-f6251cc7a8dbbd01d918d3d9fac04276905fab42.tar.gz libvpx-f6251cc7a8dbbd01d918d3d9fac04276905fab42.tar.bz2 libvpx-f6251cc7a8dbbd01d918d3d9fac04276905fab42.zip | |
Move motion field from TplDepFrame to MotionField
Replace get_pyramid_mv by vp9_motion_field_mi_get_mv.
The goal is to modularize motion field related operations.
Change-Id: I33084e680567ab106659ba9389cc4b507b893c69
Diffstat (limited to 'vp9/encoder/vp9_encoder.h')
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 7e956a6df..bf29048de 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -293,12 +293,6 @@ typedef struct TplDepStats { int ref_frame_index; int_mv mv; - -#if CONFIG_NON_GREEDY_MV - int ready[3]; - int64_t sse_arr[3]; - double feature_score; -#endif } TplDepStats; #if CONFIG_NON_GREEDY_MV @@ -321,20 +315,11 @@ typedef struct TplDepFrame { int base_qindex; #if CONFIG_NON_GREEDY_MV int lambda; - int_mv *pyramid_mv_arr[3][SQUARE_BLOCK_SIZES]; int *mv_mode_arr[3]; double *rd_diff_arr[3]; #endif } TplDepFrame; -#if CONFIG_NON_GREEDY_MV -static INLINE int_mv *get_pyramid_mv(const TplDepFrame *tpl_frame, int rf_idx, - BLOCK_SIZE bsize, int mi_row, int mi_col) { - return &tpl_frame->pyramid_mv_arr[rf_idx][get_square_block_idx(bsize)] - [mi_row * tpl_frame->stride + mi_col]; -} -#endif - #define TPL_DEP_COST_SCALE_LOG2 4 // TODO(jingning) All spatially adaptive variables should go to TileDataEnc. |