diff options
| author | Angie Chiang <angiebird@google.com> | 2019-02-05 18:44:00 -0800 |
|---|---|---|
| committer | Angie Chiang <angiebird@google.com> | 2019-02-05 18:44:00 -0800 |
| commit | 32b75587a7e831daacb7424184055ce9c9485190 (patch) | |
| tree | 75c7b26644a44502031c07657cd323c8bb4bf9ed /vp9/encoder | |
| parent | e43f0a4bef8475149c75186ad0d76bf4b1d6ae80 (diff) | |
| download | libvpx-32b75587a7e831daacb7424184055ce9c9485190.tar libvpx-32b75587a7e831daacb7424184055ce9c9485190.tar.gz libvpx-32b75587a7e831daacb7424184055ce9c9485190.tar.bz2 libvpx-32b75587a7e831daacb7424184055ce9c9485190.zip | |
Add tpl_bsize to VP9_COMP
Change-Id: Ibbe12dade04b218a41de9b65bbedba0054a69d83
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 4a9b6d0a7..2087adc85 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -6870,7 +6870,7 @@ static void setup_tpl_stats(VP9_COMP *cpi) { const GF_GROUP *gf_group = &cpi->twopass.gf_group; int tpl_group_frames = 0; int frame_idx; - const BLOCK_SIZE bsize = BLOCK_32X32; + cpi->tpl_bsize = BLOCK_32X32; init_gop_frames(cpi, gf_picture, gf_group, &tpl_group_frames); @@ -6879,11 +6879,11 @@ static void setup_tpl_stats(VP9_COMP *cpi) { // Backward propagation from tpl_group_frames to 1. for (frame_idx = tpl_group_frames - 1; frame_idx > 0; --frame_idx) { if (gf_picture[frame_idx].update_type == USE_BUF_FRAME) continue; - mc_flow_dispenser(cpi, gf_picture, frame_idx, bsize); + mc_flow_dispenser(cpi, gf_picture, frame_idx, cpi->tpl_bsize); } #if CONFIG_NON_GREEDY_MV #if DUMP_TPL_STATS - dump_tpl_stats(cpi, tpl_group_frames, gf_picture, bsize); + dump_tpl_stats(cpi, tpl_group_frames, gf_picture, cpi->tpl_bsize); #endif // DUMP_TPL_STATS #endif // CONFIG_NON_GREEDY_MV } diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 1e1c6b715..485328321 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -583,6 +583,7 @@ typedef struct VP9_COMP { #endif YV12_BUFFER_CONFIG *raw_source_frame; + BLOCK_SIZE tpl_bsize; TplDepFrame tpl_stats[MAX_ARF_GOP_SIZE]; YV12_BUFFER_CONFIG *tpl_recon_frames[REF_FRAMES]; EncFrameBuf enc_frame_buf[REF_FRAMES]; |