diff options
author | Jerome Jiang <jianj@google.com> | 2018-08-14 18:58:19 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-14 18:58:19 +0000 |
commit | fd1de451cd4dde9c8248fe706a67e31dedb0f4b8 (patch) | |
tree | 4901094984ce51552604420640dfd0e9c2088763 /vp9/encoder/vp9_encodeframe.c | |
parent | 7b925825a1668ab26b80c163d1b507e607a5254d (diff) | |
parent | b4e783da577bc3631a48e071b67931b7833ec651 (diff) | |
download | libvpx-fd1de451cd4dde9c8248fe706a67e31dedb0f4b8.tar libvpx-fd1de451cd4dde9c8248fe706a67e31dedb0f4b8.tar.gz libvpx-fd1de451cd4dde9c8248fe706a67e31dedb0f4b8.tar.bz2 libvpx-fd1de451cd4dde9c8248fe706a67e31dedb0f4b8.zip |
Merge "vp9: fix memory alloc for adaptive_rd_thresh_row_mt."
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a450ae752..674fce9cc 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -42,6 +42,7 @@ #include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_ethread.h" #include "vp9/encoder/vp9_extend.h" +#include "vp9/encoder/vp9_multi_thread.h" #include "vp9/encoder/vp9_pickmode.h" #include "vp9/encoder/vp9_rd.h" #include "vp9/encoder/vp9_rdopt.h" @@ -5362,6 +5363,9 @@ void vp9_init_tile_data(VP9_COMP *cpi) { for (tile_col = 0; tile_col < tile_cols; ++tile_col) { TileDataEnc *this_tile = &cpi->tile_data[tile_row * tile_cols + tile_col]; TileInfo *tile_info = &this_tile->tile_info; + if (cpi->sf.adaptive_rd_thresh_row_mt && + this_tile->row_base_thresh_freq_fact == NULL) + vp9_row_mt_alloc_rd_thresh(cpi, this_tile); vp9_tile_init(tile_info, cm, tile_row, tile_col); cpi->tile_tok[tile_row][tile_col] = pre_tok + tile_tok; |