shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9-svc: Fix to some frame metrics for real-time mode."

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -5354,7 +5354,8 @@

   for (y = 0; y < ymis; y++)

     for (x = 0; x < xmis; x++) {

       int map_offset = block_index + y * cm->mi_cols + x;

-      if (is_inter_block(mi) && mi->segment_id <= CR_SEGMENT_ID_BOOST2) {

+      if (mi->ref_frame[0] == LAST_FRAME && is_inter_block(mi) &&

+          mi->segment_id <= CR_SEGMENT_ID_BOOST2) {

         if (abs(mv.row) < 8 && abs(mv.col) < 8) {

           if (cpi->consec_zero_mv[map_offset] < 255)

             cpi->consec_zero_mv[map_offset]++;

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -1496,7 +1496,8 @@

   int cnt_zeromv = 0;

   for (mi_row = 0; mi_row < rows; mi_row++) {

     for (mi_col = 0; mi_col < cols; mi_col++) {

-      if (abs(mi[0]->mv[0].as_mv.row) < 16 && abs(mi[0]->mv[0].as_mv.col) < 16)

+      if (mi[0]->ref_frame[0] == LAST_FRAME &&

+          abs(mi[0]->mv[0].as_mv.row) < 16 && abs(mi[0]->mv[0].as_mv.col) < 16)

         cnt_zeromv++;

       mi++;

     }