Commit 41048aab authored by Karsten Suehring's avatar Karsten Suehring

Merge branch 'affine_fix' into 'master'

patch from bug report #84: encoder bug for affine 6-parameter search

See merge request !102
parents 483716c6 6eda345f
Pipeline #89 pending with stage
...@@ -4396,7 +4396,7 @@ void InterSearch::xCheckBestAffineMVP( PredictionUnit &pu, AffineAMVPInfo &affin ...@@ -4396,7 +4396,7 @@ void InterSearch::xCheckBestAffineMVP( PredictionUnit &pu, AffineAMVPInfo &affin
if ( iVerIdx != 0 ) if ( iVerIdx != 0 )
{ {
#if JVET_K0185_AFFINE_6PARA_ENC #if JVET_K0185_AFFINE_6PARA_ENC
secondPred = (iVerIdx == 1 ? affineAMVPInfo.mvCandRT[iMVPIdx] : affineAMVPInfo.mvCandLT[iMVPIdx]) + (acMv[0] - affineAMVPInfo.mvCandLT[iMVPIdx]); secondPred = (iVerIdx == 1 ? affineAMVPInfo.mvCandRT[iMVPIdx] : affineAMVPInfo.mvCandLB[iMVPIdx]) + (acMv[0] - affineAMVPInfo.mvCandLT[iMVPIdx]);
#else #else
secondPred = affineAMVPInfo.mvCandRT[iMVPIdx] + (acMv[0] - affineAMVPInfo.mvCandLT[iMVPIdx]); secondPred = affineAMVPInfo.mvCandRT[iMVPIdx] + (acMv[0] - affineAMVPInfo.mvCandLT[iMVPIdx]);
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment