hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-28 03:34:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix luma large block deblocking bug

Browse source
This commit is contained in:
Jaakko Laitinen 2021-01-14 17:22:12 +02:00
parent f19c049db7
commit 1c6bef2514
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/filter.c
View file

@ -365,10 +365,10 @@ static INLINE int kvz_filter_deblock_large_block(kvz_pixel *line, kvz_pixel *lin
const int *coeffs_Q = NULL; const int *coeffs_Q = NULL;
//Form P/Q arrays that contain all of the samples to make things simpler later //Form P/Q arrays that contain all of the samples to make things simpler later
const kvz_pixel* lineP[8] = { line + 3, line + 2, line + 1, line + 0, const kvz_pixel lineP[8] = { line[3], line[2], line[1], line[0],
lineL + 3, lineL + 2, lineL + 1, lineL + 0 }; lineL[3], lineL[2], lineL[1], lineL[0] };
const kvz_pixel* lineQ[8] = { line + 4, line + 5, line + 6, line + 7, const kvz_pixel lineQ[8] = { line[4], line[5], line[6], line[7],
lineL + 4, lineL + 5, lineL + 6, lineL + 7 }; lineL[4], lineL[5], lineL[6], lineL[7] };
//Separate destination arrays with only six output pixels going in line and rest to lineL to simplify things later //Separate destination arrays with only six output pixels going in line and rest to lineL to simplify things later
kvz_pixel* dstP[7] = { line + 3, line + 2, line + 1, kvz_pixel* dstP[7] = { line + 3, line + 2, line + 1,
lineL + 3, lineL + 2, lineL + 1, lineL + 0 }; lineL + 3, lineL + 2, lineL + 1, lineL + 0 };
@ -379,17 +379,17 @@ static INLINE int kvz_filter_deblock_large_block(kvz_pixel *line, kvz_pixel *lin
switch (filter_length_P) switch (filter_length_P)
{ {
case 7: case 7:
ref_P = (*lineP[6] + *lineP[7] + 1) >> 1; ref_P = (lineP[6] + lineP[7] + 1) >> 1;
coeffs_P = coeffs7; coeffs_P = coeffs7;
break; break;
case 5: case 5:
ref_P = (*lineP[4] + *lineP[5] + 1) >> 1; ref_P = (lineP[4] + lineP[5] + 1) >> 1;
coeffs_P = coeffs5; coeffs_P = coeffs5;
break; break;
case 3: case 3:
ref_P = (*lineP[2] + *lineP[3] + 1) >> 1; ref_P = (lineP[2] + lineP[3] + 1) >> 1;
coeffs_P = coeffs3; coeffs_P = coeffs3;
break; break;
} }
@ -397,17 +397,17 @@ static INLINE int kvz_filter_deblock_large_block(kvz_pixel *line, kvz_pixel *lin
switch (filter_length_Q) switch (filter_length_Q)
{ {
case 7: case 7:
ref_Q = (*lineQ[6] + *lineQ[7] + 1) >> 1; ref_Q = (lineQ[6] + lineQ[7] + 1) >> 1;
coeffs_Q = coeffs7; coeffs_Q = coeffs7;
break; break;
case 5: case 5:
ref_Q = (*lineQ[4] + *lineQ[5] + 1) >> 1; ref_Q = (lineQ[4] + lineQ[5] + 1) >> 1;
coeffs_Q = coeffs5; coeffs_Q = coeffs5;
break; break;
case 3: case 3:
ref_Q = (*lineQ[2] + *lineQ[3] + 1) >> 1; ref_Q = (lineQ[2] + lineQ[3] + 1) >> 1;
coeffs_Q = coeffs3; coeffs_Q = coeffs3;
break; break;
} }
@ -415,34 +415,34 @@ static INLINE int kvz_filter_deblock_large_block(kvz_pixel *line, kvz_pixel *lin
//Get middle samples //Get middle samples
if (filter_length_P == filter_length_Q) { if (filter_length_P == filter_length_Q) {
if (filter_length_P == 7) { if (filter_length_P == 7) {
ref_middle = (*lineP[6] + *lineP[5] + *lineP[4] + *lineP[3] + *lineP[2] + *lineP[1] ref_middle = (lineP[6] + lineP[5] + lineP[4] + lineP[3] + lineP[2] + lineP[1]
+ 2 * (*lineP[0] + *lineQ[0]) + 2 * (lineP[0] + lineQ[0])
+ *lineQ[1] + *lineQ[2] + *lineQ[3] + *lineQ[4] + *lineQ[5] + *lineQ[6] + 8) >> 4; + lineQ[1] + lineQ[2] + lineQ[3] + lineQ[4] + lineQ[5] + lineQ[6] + 8) >> 4;
} }
else { //filter_length_P == 5 else { //filter_length_P == 5
ref_middle = (*lineP[4] + *lineP[3] ref_middle = (lineP[4] + lineP[3]
+ 2 * (*lineP[2] + *lineP[1] + *lineP[0] + *lineQ[0] + *lineQ[1] + *lineQ[2]) + 2 * (lineP[2] + lineP[1] + lineP[0] + lineQ[0] + lineQ[1] + lineQ[2])
+ *lineQ[3] + *lineQ[4] + 8) >> 4; + lineQ[3] + lineQ[4] + 8) >> 4;
} }
} }
else { else {
const uint8_t lenS = MIN(filter_length_P, filter_length_Q); const uint8_t lenS = MIN(filter_length_P, filter_length_Q);
const uint8_t lenL = MAX(filter_length_P, filter_length_Q); const uint8_t lenL = MAX(filter_length_P, filter_length_Q);
const kvz_pixel **refS = filter_length_P < filter_length_Q ? lineP : lineQ; const kvz_pixel *refS = filter_length_P < filter_length_Q ? lineP : lineQ;
const kvz_pixel **refL = filter_length_P < filter_length_Q ? lineQ : lineP; const kvz_pixel *refL = filter_length_P < filter_length_Q ? lineQ : lineP;
if (lenL == 7 && lenS == 5) { if (lenL == 7 && lenS == 5) {
ref_middle = (*lineP[5] + *lineP[4] + *lineP[3] + *lineP[2] ref_middle = (lineP[5] + lineP[4] + lineP[3] + lineP[2]
+ 2 * (*lineP[1] + *lineP[0] + *lineQ[0] + *lineQ[1]) + 2 * (lineP[1] + lineP[0] + lineQ[0] + lineQ[1])
+ *lineQ[2] + *lineQ[3] + *lineQ[4] + *lineQ[5] + 8) >> 4; + lineQ[2] + lineQ[3] + lineQ[4] + lineQ[5] + 8) >> 4;
} }
else if (lenL == 7 && lenS == 3) { else if (lenL == 7 && lenS == 3) {
ref_middle = (3 * *refS[0] + 2 * *refL[0] + 3 * *refS[1] + *refL[1] + 2 * *refS[2] ref_middle = (3 * refS[0] + 2 * refL[0] + 3 * refS[1] + refL[1] + 2 * refS[2]
+ *refL[2] + *refL[3] + *refL[4] + *refL[5] + *refL[6] + 8) >> 4; + refL[2] + refL[3] + refL[4] + refL[5] + refL[6] + 8) >> 4;
} }
else { //lenL == 5 && lenS == 3 else { //lenL == 5 && lenS == 3
ref_middle = (*lineP[3] + *lineP[2] + *lineP[1] + *lineP[0] ref_middle = (lineP[3] + lineP[2] + lineP[1] + lineP[0]
+ *lineQ[0] + *lineQ[1] + *lineQ[2] + *lineQ[3] + 4) >> 3; + lineQ[0] + lineQ[1] + lineQ[2] + lineQ[3] + 4) >> 3;
} }
} }
@ -458,13 +458,13 @@ static INLINE int kvz_filter_deblock_large_block(kvz_pixel *line, kvz_pixel *lin
for (size_t i = 0; i < filter_length_P; i++) for (size_t i = 0; i < filter_length_P; i++)
{ {
int range = (tc * tc_coeff_P[i]) >> 1; int range = (tc * tc_coeff_P[i]) >> 1;
*dstP[i] = CLIP(*lineP[i] - range, *lineP[i] + range, (ref_middle * coeffs_P[i] + ref_P * (64 - coeffs_P[i]) + 32) >> 6); *dstP[i] = CLIP(lineP[i] - range, lineP[i] + range, (ref_middle * coeffs_P[i] + ref_P * (64 - coeffs_P[i]) + 32) >> 6);
} }
for (size_t i = 0; i < filter_length_Q; i++) for (size_t i = 0; i < filter_length_Q; i++)
{ {
int range = (tc * tc_coeff_Q[i]) >> 1; int range = (tc * tc_coeff_Q[i]) >> 1;
*dstQ[i] = CLIP(*lineQ[i] - range, *lineQ[i] + range, (ref_middle * coeffs_Q[i] + ref_Q * (64 - coeffs_Q[i]) + 32) >> 6); *dstQ[i] = CLIP(lineQ[i] - range, lineQ[i] + range, (ref_middle * coeffs_Q[i] + ref_Q * (64 - coeffs_Q[i]) + 32) >> 6);
} }
return 3; return 3;