diff options
Diffstat (limited to 'src/motion_vector.cc')
| -rw-r--r-- | src/motion_vector.cc | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/motion_vector.cc b/src/motion_vector.cc index fdb1875..36018ab 100644 --- a/src/motion_vector.cc +++ b/src/motion_vector.cc @@ -83,14 +83,12 @@ void SetupGlobalMv(const Tile::Block& block, int index, (gm.params[5] - (1 << kWarpedModelPrecisionBits)) * y + gm.params[1]; if (frame_header.allow_high_precision_mv) { - mv->mv[MotionVector::kRow] = - RightShiftWithRoundingSigned(yc, kWarpedModelPrecisionBits - 3); - mv->mv[MotionVector::kColumn] = - RightShiftWithRoundingSigned(xc, kWarpedModelPrecisionBits - 3); + mv->mv[0] = RightShiftWithRoundingSigned(yc, kWarpedModelPrecisionBits - 3); + mv->mv[1] = RightShiftWithRoundingSigned(xc, kWarpedModelPrecisionBits - 3); } else { - mv->mv[MotionVector::kRow] = MultiplyBy2( + mv->mv[0] = MultiplyBy2( RightShiftWithRoundingSigned(yc, kWarpedModelPrecisionBits - 2)); - mv->mv[MotionVector::kColumn] = MultiplyBy2( + mv->mv[1] = MultiplyBy2( RightShiftWithRoundingSigned(xc, kWarpedModelPrecisionBits - 2)); LowerMvPrecision(frame_header, mv); } @@ -115,7 +113,7 @@ void SearchStack(const Tile::Block& block, const BlockParameters& mv_bp, // LowerMvPrecision() is not necessary, since the values in // |prediction_parameters.global_mv| and |mv_bp.mv| were generated by it. const auto global_motion_type = global_motion[bp.reference_frame[0]].type; - if (IsGlobalMvBlock(mv_bp.is_global_mv_block, global_motion_type)) { + if (IsGlobalMvBlock(mv_bp, global_motion_type)) { candidate_mv = prediction_parameters.global_mv[0]; } else { candidate_mv = mv_bp.mv.mv[index]; @@ -126,7 +124,7 @@ void SearchStack(const Tile::Block& block, const BlockParameters& mv_bp, const int num_found = *num_mv_found; const auto result = std::find_if(ref_mv_stack, ref_mv_stack + num_found, [&candidate_mv](const MotionVector& ref_mv) { - return ref_mv == candidate_mv; + return ref_mv.mv32 == candidate_mv.mv32; }); if (result != ref_mv_stack + num_found) { prediction_parameters.IncreaseWeight(std::distance(ref_mv_stack, result), @@ -152,7 +150,7 @@ void CompoundSearchStack(const Tile::Block& block, const BlockParameters& mv_bp, CompoundMotionVector candidate_mv = mv_bp.mv; for (int i = 0; i < 2; ++i) { const auto global_motion_type = global_motion[bp.reference_frame[i]].type; - if (IsGlobalMvBlock(mv_bp.is_global_mv_block, global_motion_type)) { + if (IsGlobalMvBlock(mv_bp, global_motion_type)) { candidate_mv.mv[i] = prediction_parameters.global_mv[i]; } } @@ -164,7 +162,7 @@ void CompoundSearchStack(const Tile::Block& block, const BlockParameters& mv_bp, const auto result = std::find_if(compound_ref_mv_stack, compound_ref_mv_stack + num_found, [&candidate_mv](const CompoundMotionVector& ref_mv) { - return ref_mv == candidate_mv; + return ref_mv.mv64 == candidate_mv.mv64; }); if (result != compound_ref_mv_stack + num_found) { prediction_parameters.IncreaseWeight( @@ -172,7 +170,7 @@ void CompoundSearchStack(const Tile::Block& block, const BlockParameters& mv_bp, return; } if (num_found >= kMaxRefMvStackSize) return; - compound_ref_mv_stack[num_found] = candidate_mv; + compound_ref_mv_stack[num_found].mv64 = candidate_mv.mv64; prediction_parameters.SetWeightIndexStackEntry(num_found, weight); ++*num_mv_found; } @@ -284,7 +282,8 @@ void AddTemporalReferenceMvCandidate( frame_header.allow_high_precision_mv ? 2 : frame_header.force_integer_mv; const MotionVector* const global_mv = prediction_parameters->global_mv; if (is_compound) { - CompoundMotionVector candidate_mvs[kMaxTemporalMvCandidatesWithPadding]; + alignas(kMaxAlignment) + CompoundMotionVector candidate_mvs[kMaxTemporalMvCandidatesWithPadding]; const dsp::Dsp& dsp = *dsp::GetDspTable(8); dsp.mv_projection_compound[mv_projection_function_index]( temporal_mvs, temporal_reference_offsets, reference_offsets, count, @@ -310,7 +309,7 @@ void AddTemporalReferenceMvCandidate( const auto result = std::find_if(compound_ref_mv_stack, compound_ref_mv_stack + num_found, [&candidate_mv](const CompoundMotionVector& ref_mv) { - return ref_mv == candidate_mv; + return ref_mv.mv64 == candidate_mv.mv64; }); if (result != compound_ref_mv_stack + num_found) { prediction_parameters->IncreaseWeight( @@ -318,7 +317,7 @@ void AddTemporalReferenceMvCandidate( continue; } if (num_found >= kMaxRefMvStackSize) continue; - compound_ref_mv_stack[num_found] = candidate_mv; + compound_ref_mv_stack[num_found].mv64 = candidate_mv.mv64; prediction_parameters->SetWeightIndexStackEntry(num_found, 2); ++num_found; } while (++index < count); @@ -337,7 +336,7 @@ void AddTemporalReferenceMvCandidate( const auto result = std::find_if(ref_mv_stack, ref_mv_stack + num_found, [&candidate_mv](const MotionVector& ref_mv) { - return ref_mv == candidate_mv; + return ref_mv.mv32 == candidate_mv.mv32; }); if (result != ref_mv_stack + num_found) { prediction_parameters->IncreaseWeight(std::distance(ref_mv_stack, result), @@ -369,7 +368,7 @@ void AddTemporalReferenceMvCandidate( const auto result = std::find_if(ref_mv_stack, ref_mv_stack + num_found, [&candidate_mv](const MotionVector& ref_mv) { - return ref_mv == candidate_mv; + return ref_mv.mv32 == candidate_mv.mv32; }); if (result != ref_mv_stack + num_found) { prediction_parameters->IncreaseWeight(std::distance(ref_mv_stack, result), @@ -563,8 +562,8 @@ void AddExtraSingleMvCandidate(const Tile::Block& block, int mv_row, candidate_mv.mv[1] *= -1; } assert(num_found <= 2); - if ((num_found != 0 && ref_mv_stack[0] == candidate_mv) || - (num_found == 2 && ref_mv_stack[1] == candidate_mv)) { + if ((num_found != 0 && ref_mv_stack[0].mv32 == candidate_mv.mv32) || + (num_found == 2 && ref_mv_stack[1].mv32 == candidate_mv.mv32)) { continue; } ref_mv_stack[num_found] = candidate_mv; @@ -624,16 +623,16 @@ void ExtraSearch(const Tile::Block& block, bool is_compound, } } if (*num_mv_found == 1) { - if (combined_mvs[0] == compound_ref_mv_stack[0]) { - compound_ref_mv_stack[1] = combined_mvs[1]; + if (combined_mvs[0].mv64 == compound_ref_mv_stack[0].mv64) { + compound_ref_mv_stack[1].mv64 = combined_mvs[1].mv64; } else { - compound_ref_mv_stack[1] = combined_mvs[0]; + compound_ref_mv_stack[1].mv64 = combined_mvs[0].mv64; } prediction_parameters.SetWeightIndexStackEntry(1, 0); } else { assert(*num_mv_found == 0); for (int i = 0; i < 2; ++i) { - compound_ref_mv_stack[i] = combined_mvs[i]; + compound_ref_mv_stack[i].mv64 = combined_mvs[i].mv64; prediction_parameters.SetWeightIndexStackEntry(i, 0); } } |