shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Compute prediction filter type cost only when needed"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1347,9 +1347,6 @@

         model_rd_for_sb_y(cpi, bsize, x, xd, &this_rdc.rate, &this_rdc.dist,

                           &var_y, &sse_y);

       }

-      this_rdc.rate +=

-          cm->interp_filter == SWITCHABLE ?

-              vp9_get_switchable_rate(cpi, xd) : 0;

     }

     if (!this_early_term) {

@@ -1375,6 +1372,8 @@

           this_rdc.rate += vp9_get_switchable_rate(cpi, xd);

       }

     } else {

+      this_rdc.rate += cm->interp_filter == SWITCHABLE ?

+          vp9_get_switchable_rate(cpi, xd) : 0;

       this_rdc.rate += vp9_cost_bit(vp9_get_skip_prob(cm, xd), 1);

     }