shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add ref frame rate cost to non-RD mode decision"

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

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

@@ -577,6 +577,9 @@

     ZEROMV, NEARESTMV, NEARMV, NEWMV,

 };

+static const int ref_frame_cost[MAX_REF_FRAMES] = {

+    1235, 229, 530, 615,

+};

 // TODO(jingning) placeholder for inter-frame non-RD mode decision.

 // this needs various further optimizations. to be continued..

 void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,

@@ -865,6 +868,7 @@

       this_rdc.rate += rate_mv;

       this_rdc.rate += cpi->inter_mode_cost[mbmi->mode_context[ref_frame]]

                                   [INTER_OFFSET(this_mode)];

+      this_rdc.rate += ref_frame_cost[ref_frame];

       this_rdc.rdcost = RDCOST(x->rdmult, x->rddiv,

                                this_rdc.rate, this_rdc.dist);

@@ -971,6 +975,7 @@

       this_rdc.rate = args.rate;

       this_rdc.dist = args.dist;

       this_rdc.rate += cpi->mbmode_cost[this_mode];

+      this_rdc.rate += ref_frame_cost[INTRA_FRAME];

       this_rdc.rate += intra_cost_penalty;

       this_rdc.rdcost = RDCOST(x->rdmult, x->rddiv,

                                this_rdc.rate, this_rdc.dist);