diff options
| author | Linfeng Zhang <linfengz@google.com> | 2018-04-02 16:05:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-02 16:05:05 +0000 |
| commit | c3ba5c521e2b8f8059ff697347f4f0a1f8b1da11 (patch) | |
| tree | 5baedf368ce88362911bc48506e6017bf1befb25 /vp9 | |
| parent | eae638db1524b4b6ff1a34e078e6b1a1a4427849 (diff) | |
| parent | cd838028857dd1185290f6a7ffb7a135cdf61f7f (diff) | |
| download | libvpx-c3ba5c521e2b8f8059ff697347f4f0a1f8b1da11.tar libvpx-c3ba5c521e2b8f8059ff697347f4f0a1f8b1da11.tar.gz libvpx-c3ba5c521e2b8f8059ff697347f4f0a1f8b1da11.tar.bz2 libvpx-c3ba5c521e2b8f8059ff697347f4f0a1f8b1da11.zip | |
Merge changes I5704bd66,I4d548e97
* changes:
Shrink size of mode_map in struct TileDataEnc
Update sad4d x86 functions
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 2989af35e..05bfd6930 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -282,7 +282,7 @@ static INLINE int is_lossless_requested(const VP9EncoderConfig *cfg) { typedef struct TileDataEnc { TileInfo tile_info; int thresh_freq_fact[BLOCK_SIZES][MAX_MODES]; - int mode_map[BLOCK_SIZES][MAX_MODES]; + int8_t mode_map[BLOCK_SIZES][MAX_MODES]; FIRSTPASS_DATA fp_data; VP9RowMTSync row_mt_sync; diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 90f06720b..b6541b0f7 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3074,10 +3074,10 @@ void vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, TileDataEnc *tile_data, const int *const rd_threshes = rd_opt->threshes[segment_id][bsize]; const int *const rd_thresh_freq_fact = tile_data->thresh_freq_fact[bsize]; int64_t mode_threshold[MAX_MODES]; - int *tile_mode_map = tile_data->mode_map[bsize]; - int mode_map[MAX_MODES]; // Maintain mode_map information locally to avoid - // lock mechanism involved with reads from - // tile_mode_map + int8_t *tile_mode_map = tile_data->mode_map[bsize]; + int8_t mode_map[MAX_MODES]; // Maintain mode_map information locally to avoid + // lock mechanism involved with reads from + // tile_mode_map const int mode_search_skip_flags = sf->mode_search_skip_flags; int64_t mask_filter = 0; int64_t filter_cache[SWITCHABLE_FILTER_CONTEXTS]; |