shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add second ref frame check back in rdcost hist"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -3544,8 +3544,9 @@

     }

     // Keep record of best inter rd with single reference

-    if (is_inter_block(&xd->mi_8x8[0]->mbmi) && !mode_excluded &&

-        this_rd < best_inter_rd) {

+    if (is_inter_block(&xd->mi_8x8[0]->mbmi) &&

+        !has_second_ref(&xd->mi_8x8[0]->mbmi) &&

+        !mode_excluded && this_rd < best_inter_rd) {

       best_inter_rd = this_rd;

       best_inter_ref_frame = ref_frame;

     }