ref: 272974af361993de7a38896155f9600cbe1c07ba
parent: 6cb50ce5274d9a992351971b8eba1f5c41ee1adb
parent: 8ee88da060140df61d937e633f718637a298f1fc
author: Yunqing Wang <yunqingwang@google.com>
date: Tue Aug 21 05:28:10 EDT 2012
Merge "Fix inter_zz_count calculation bug"
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -523,10 +523,6 @@
#endif
- /* Count of last ref frame 0,0 usage */
- if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME))
- cpi->inter_zz_count ++;
-
/* Special case code for cyclic refresh
* If cyclic update enabled then copy xd->mbmi.segment_id; (which
* may have been updated based on mode during
@@ -720,9 +716,6 @@
xd->subpixel_predict8x8 = vp8_bilinear_predict8x8;
xd->subpixel_predict16x16 = vp8_bilinear_predict16x16;
}
-
- /* Reset frame count of inter 0,0 motion vector usage. */
- cpi->inter_zz_count = 0;
cpi->prediction_error = 0;
cpi->intra_error = 0;
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -213,10 +213,6 @@
#endif
- /* Count of last ref frame 0,0 usage */
- if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME))
- cpi->inter_zz_count++;
-
/* Special case code for cyclic refresh
* If cyclic update enabled then copy
* xd->mbmi.segment_id; (which may have been updated
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -4298,6 +4298,30 @@
}
}
+ /* Count last ref frame 0,0 usage on current encoded frame. */
+ {+ int mb_row;
+ int mb_col;
+ /* Point to beginning of MODE_INFO arrays. */
+ MODE_INFO *tmp = cm->mi;
+
+ cpi->inter_zz_count = 0;
+
+ if(cm->frame_type != KEY_FRAME)
+ {+ for (mb_row = 0; mb_row < cm->mb_rows; mb_row ++)
+ {+ for (mb_col = 0; mb_col < cm->mb_cols; mb_col ++)
+ {+ if(tmp->mbmi.mode == ZEROMV && tmp->mbmi.ref_frame == LAST_FRAME)
+ cpi->inter_zz_count++;
+ tmp++;
+ }
+ tmp++;
+ }
+ }
+ }
+
#if CONFIG_MULTI_RES_ENCODING
vp8_cal_dissimilarity(cpi);
#endif
--
⑨