diff options
| author | Jerome Jiang <jianj@google.com> | 2018-03-23 01:41:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-23 01:41:21 +0000 |
| commit | 4bff5bca928de32122cb8fb5615e9aec2f8e3b9b (patch) | |
| tree | 5cf9130eba4b761296953d4ea27845a6d54a807a /vp9/encoder | |
| parent | 3cb9c5ffe93f32d3299389f3e756941524e2b223 (diff) | |
| parent | 1ae97b4a4db010ee87bedca5943c64f55d43f6f7 (diff) | |
| download | libvpx-4bff5bca928de32122cb8fb5615e9aec2f8e3b9b.tar libvpx-4bff5bca928de32122cb8fb5615e9aec2f8e3b9b.tar.gz libvpx-4bff5bca928de32122cb8fb5615e9aec2f8e3b9b.tar.bz2 libvpx-4bff5bca928de32122cb8fb5615e9aec2f8e3b9b.zip | |
Merge "vp9 svc frame drop: enable adaptive rd for row mt."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_multi_thread.c | 8 | ||||
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_multi_thread.c b/vp9/encoder/vp9_multi_thread.c index da06fb151..381edca99 100644 --- a/vp9/encoder/vp9_multi_thread.c +++ b/vp9/encoder/vp9_multi_thread.c @@ -146,11 +146,9 @@ void vp9_row_mt_mem_dealloc(VP9_COMP *cpi) { TileDataEnc *this_tile = &cpi->tile_data[tile_row * multi_thread_ctxt->allocated_tile_cols + tile_col]; - if (cpi->sf.adaptive_rd_thresh_row_mt) { - if (this_tile->row_base_thresh_freq_fact != NULL) { - vpx_free(this_tile->row_base_thresh_freq_fact); - this_tile->row_base_thresh_freq_fact = NULL; - } + if (this_tile->row_base_thresh_freq_fact != NULL) { + vpx_free(this_tile->row_base_thresh_freq_fact); + this_tile->row_base_thresh_freq_fact = NULL; } } } diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index cfa6aa403..879cd2070 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -667,11 +667,6 @@ static void set_rt_speed_feature_framesize_independent( (uint8_t *)vpx_calloc((cm->mi_stride >> 3) * ((cm->mi_rows >> 3) + 1), sizeof(*cpi->count_lastgolden_frame_usage)); } - // Disable adaptive_rd_thresh for row_mt for SVC with frame dropping. - // This is causing some tests to fail. - // TODO(marpan/jianj): Look into this failure and re-enable later. - if (cpi->use_svc && cpi->oxcf.drop_frames_water_mark) - sf->adaptive_rd_thresh_row_mt = 0; } void vp9_set_speed_features_framesize_dependent(VP9_COMP *cpi) { |