]> granicus.if.org Git - libvpx/commitdiff
Fix multi-thread encoder result test
authorHui Su <huisu@google.com>
Thu, 26 Jul 2018 23:10:08 +0000 (16:10 -0700)
committerHui Su <huisu@google.com>
Thu, 26 Jul 2018 23:10:08 +0000 (16:10 -0700)
Fix multi-thread encoder result test induced by
the prune_ref_frame_for_rect_partitions speed feature.

BUG=webm:1552

Change-Id: Idc3b3759651f76285ffd90059c6a2846c4d91a00

vp9/encoder/vp9_encodeframe.c

index f3a4ae7fe42b98c857622971818eaa06b89cc9ad..e1207fea77f262c6e825271ea20f4f4b8aa4d080 100644 (file)
@@ -4008,6 +4008,8 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td,
         if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx);
 
         pc_tree->split[i]->index = i;
+        if (cpi->sf.prune_ref_frame_for_rect_partitions)
+          pc_tree->split[i]->none.rate = INT_MAX;
         rd_pick_partition(cpi, td, tile_data, tp, mi_row + y_idx,
                           mi_col + x_idx, subsize, &this_rdc,
                           // A must split test here increases the number of sub