Merge "Set mv to zero if the second ref does not exist"

Cheng Chen committed 6 years ago

Commit 6ca77eb2 parents b7075bc 9d5bc183 files · +12 −0Browse files

Unified · Split

3 files

       const int col_4x4 = col_start_4x4 + j;
       const int unit_index = row_4x4 * num_unit_cols + col_4x4;
       if (row_4x4 >= num_unit_rows || col_4x4 >= num_unit_cols) continue;
+      if (source_ref_frame[1] == NONE) {
+        assert(source_mv[1]->row == 0 && source_mv[1]->col == 0);
+      }
       motion_vector_info[unit_index].ref_frame[0] = source_ref_frame[0];
       motion_vector_info[unit_index].ref_frame[1] = source_ref_frame[1];
       motion_vector_info[unit_index].mv[0].as_mv.row = source_mv[0]->row;

@@ -4733,6 +4733,13 @@ void vp9_rd_pick_inter_mode_sub8x8(VP9_COMP cpi, TileDataEnc tile_data, · 4732 unmodified lines
4733	mi->mv[0].as_int = xd->mi[0]->bmi[3].as_mv[0].as_int;	4733	mi->mv[0].as_int = xd->mi[0]->bmi[3].as_mv[0].as_int;
4734	mi->mv[1].as_int = xd->mi[0]->bmi[3].as_mv[1].as_int;	4734	mi->mv[1].as_int = xd->mi[0]->bmi[3].as_mv[1].as_int;
4735	}	4735	}
		4736	// If the second reference does not exist, set the corresponding mv to zero.
		4737	if (mi->ref_frame[1] == NONE) {
		4738	mi->mv[1].as_int = 0;
		4739	for (i = 0; i < 4; ++i) {
		4740	mi->bmi[i].as_mv[1].as_int = 0;
		4741	}
		4742	}
4736		4743
4737	for (i = 0; i < REFERENCE_MODES; ++i) {	4744	for (i = 0; i < REFERENCE_MODES; ++i) {
4738	if (best_pred_rd[i] == INT64_MAX)	4745	if (best_pred_rd[i] == INT64_MAX)

   // or kAltRefFrame.
   RefFrameType ref_frame[2];
   // The row offset of motion vectors in the unit of pixel.
+  // If the second motion vector does not exist, the value is 0.
   double mv_row[2];
   // The column offset of motion vectors in the unit of pixel.
+  // If the second motion vector does not exist, the value is 0.
   double mv_column[2];
 };

Keyboard shortcuts