Skip to content

Commit

Permalink
Analyse, Recalculate: Fix dct=5..10
Browse files Browse the repository at this point in the history
dct=5..10 was behaving the same as dct=0.

Bug introduced in v17.
  • Loading branch information
cantabile committed Jun 5, 2017
1 parent 96c76ff commit 7d737e0
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/PlaneOfBlocks.c
Original file line number Diff line number Diff line change
Expand Up @@ -1014,10 +1014,7 @@ void pobSearchMVs(PlaneOfBlocks *pob, MVFrame *pSrcFrame, MVFrame *pRefFrame,
int fieldShift, DCTFFTW *DCT, int dctmode, int *pmeanLumaChange,
int pzero, int pglobal, int64_t badSAD, int badrange, int meander, int tryMany) {
pob->DCT = DCT;
if (pob->DCT == 0)
pob->dctmode = 0;
else
pob->dctmode = dctmode;
pob->dctmode = dctmode;
pob->dctweight16 = VSMIN(16, abs(*pmeanLumaChange) / (pob->nBlkSizeX * pob->nBlkSizeY)); //equal dct and spatial weights for meanLumaChange=8 (empirical)
pob->badSAD = badSAD;
pob->badrange = badrange;
Expand Down Expand Up @@ -1174,10 +1171,7 @@ void pobRecalculateMVs(PlaneOfBlocks *pob, const FakeGroupOfPlanes *fgop, MVFram
SearchType st, int stp, int lambda, int pnew, uint8_t *out,
int fieldShift, int64_t thSAD, DCTFFTW *DCT, int dctmode, int smooth, int meander) {
pob->DCT = DCT;
if (pob->DCT == 0)
pob->dctmode = 0;
else
pob->dctmode = dctmode;
pob->dctmode = dctmode;
pob->dctweight16 = 8; //min(16,abs(*pmeanLumaChange)/(nBlkSizeX*nBlkSizeY)); //equal dct and spatial weights for meanLumaChange=8 (empirical)
pob->zeroMVfieldShifted.x = 0;
pob->zeroMVfieldShifted.y = fieldShift;
Expand Down

0 comments on commit 7d737e0

Please sign in to comment.