shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Skip comp inter mode test in RD loop with same frame bias signs"

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

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

@@ -2779,9 +2779,8 @@

     comp_pred = second_ref_frame > INTRA_FRAME;

     if (comp_pred) {

-      if (cpi->sf.alt_ref_search_fp)

-        if (!cm->show_frame)

-          continue;

+      if (!cm->allow_comp_inter_inter)

+        continue;

       if ((mode_search_skip_flags & FLAG_SKIP_COMP_BESTINTRA) &&

           best_mode_index >=0 &&

@@ -3384,6 +3383,9 @@

     comp_pred = second_ref_frame > INTRA_FRAME;

     if (comp_pred) {

+      if (!cm->allow_comp_inter_inter)

+        continue;

+

       if (!(cpi->ref_frame_flags & flag_list[second_ref_frame]))

         continue;

       // Do not allow compound prediction if the segment level reference frame