Merge "vp9: Compute source sad for every superblock when partition copy is on."

Jerome Jiang committed 9 years ago

Commit b87ebd72 parents 2d12a52 afc8c482 files · +7 −5Browse files

Unified · Split

2 files

@@ -3133,7 +3133,7 @@ static void encode_without_recode_loop(VP9_COMP cpi, size_t size, · 3132 unmodified lines
3133	if (cpi->oxcf.pass == 0 && cpi->oxcf.mode == REALTIME &&	3133	if (cpi->oxcf.pass == 0 && cpi->oxcf.mode == REALTIME &&
3134	cpi->oxcf.speed >= 5 && cpi->resize_state == 0 &&	3134	cpi->oxcf.speed >= 5 && cpi->resize_state == 0 &&
3135	(cpi->oxcf.content == VP9E_CONTENT_SCREEN \|\|	3135	(cpi->oxcf.content == VP9E_CONTENT_SCREEN \|\|
3136	cpi->oxcf.rc_mode == VPX_VBR) &&	3136	cpi->oxcf.rc_mode == VPX_VBR \|\| cpi->sf.copy_partition_flag) &&
3137	cm->show_frame)	3137	cm->show_frame)
3138	vp9_avg_source_sad(cpi);	3138	vp9_avg_source_sad(cpi);
3139		3139

         for (sbi_row = 0; sbi_row < sb_rows; ++sbi_row) {
           for (sbi_col = 0; sbi_col < sb_cols; ++sbi_col) {
             // Checker-board pattern, ignore boundary.
-            if ((sbi_row > 0 && sbi_col > 0) &&
+            // If the partition copy is on, compute for every superblock.
-                (sbi_row < sb_rows - 1 && sbi_col < sb_cols - 1) &&
+            if (cpi->sf.copy_partition_flag ||
-                ((sbi_row % 2 == 0 && sbi_col % 2 == 0) ||
+                ((sbi_row > 0 && sbi_col > 0) &&
-                 (sbi_row % 2 != 0 && sbi_col % 2 != 0))) {
+                 (sbi_row < sb_rows - 1 && sbi_col < sb_cols - 1) &&
+                 ((sbi_row % 2 == 0 && sbi_col % 2 == 0) ||
+                  (sbi_row % 2 != 0 && sbi_col % 2 != 0)))) {
               num_samples++;
               avg_sad += cpi->fn_ptr[bsize].sdf(src_y, src_ystride, last_src_y,
                                                 last_src_ystride);

Keyboard shortcuts