morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[codec,progressive] clamp values instead of assert

Browse Source
This commit is contained in:
akallabeth
2025-03-11 12:00:08 +01:00
parent c085b6fc4f
commit 85fdbc3b71
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
libfreerdp/codec/progressive.c
View File

@@ -518,27 +518,32 @@ int progressive_delete_surface_context(PROGRESSIVE_CONTEXT* WINPR_RESTRICT progr
* LL3 4015 9x9 81
*/
static int16_t clampi16(int val)
{
if (val < INT16_MIN)
return INT16_MIN;
if (val > INT16_MAX)
return INT16_MAX;
return (int16_t)val;
}
static INLINE void progressive_rfx_idwt_x(const INT16* WINPR_RESTRICT pLowBand, size_t nLowStep,
const INT16* WINPR_RESTRICT pHighBand, size_t nHighStep,
INT16* WINPR_RESTRICT pDstBand, size_t nDstStep,
size_t nLowCount, size_t nHighCount, size_t nDstCount)
{
INT16 L0 = 0;
INT16 H0 = 0;
INT16 H1 = 0;
INT16 X0 = 0;
INT16 X1 = 0;
INT16 X2 = 0;
for (size_t i = 0; i < nDstCount; i++)
{
const INT16* pL = pLowBand;
const INT16* pH = pHighBand;
INT16* pX = pDstBand;
H0 = *pH++;
L0 = *pL++;
X0 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - H0);
X2 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - H0);
INT16 H0 = *pH++;
INT16 L0 = *pL++;
INT16 X0 = clampi16((int32_t)L0 - H0);
INT16 X2 = clampi16((int32_t)L0 - H0);
for (size_t j = 0; j < (nHighCount - 1); j++)
{
@@ -546,8 +551,8 @@ static INLINE void progressive_rfx_idwt_x(const INT16* WINPR_RESTRICT pLowBand,
pH++;
L0 = *pL;
pL++;
X2 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - ((H0 + H1) / 2));
X1 = WINPR_ASSERTING_INT_CAST(int16_t, ((X0 + X2) / 2) + (2 * H0));
X2 = clampi16((int32_t)L0 - ((H0 + H1) / 2));
X1 = clampi16((int32_t)((X0 + X2) / 2) + (2 * H0));
pX[0] = X0;
pX[1] = X1;
pX += 2;
@@ -560,15 +565,15 @@ static INLINE void progressive_rfx_idwt_x(const INT16* WINPR_RESTRICT pLowBand,
if (nLowCount <= nHighCount)
{
pX[0] = X2;
pX[1] = WINPR_ASSERTING_INT_CAST(int16_t, X2 + (2 * H0));
pX[1] = clampi16((int32_t)X2 + (2 * H0));
}
else
{
L0 = *pL;
pL++;
X0 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - H0);
X0 = clampi16((int32_t)L0 - H0);
pX[0] = X2;
pX[1] = WINPR_ASSERTING_INT_CAST(int16_t, ((X0 + X2) / 2) + (2 * H0));
pX[1] = clampi16((int32_t)((X0 + X2) / 2) + (2 * H0));
pX[2] = X0;
}
}
@@ -576,13 +581,13 @@ static INLINE void progressive_rfx_idwt_x(const INT16* WINPR_RESTRICT pLowBand,
{
L0 = *pL;
pL++;
X0 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - (H0 / 2));
X0 = clampi16((int32_t)L0 - (H0 / 2));
pX[0] = X2;
pX[1] = WINPR_ASSERTING_INT_CAST(int16_t, ((X0 + X2) / 2) + (2 * H0));
pX[1] = clampi16((int32_t)((X0 + X2) / 2) + (2 * H0));
pX[2] = X0;
L0 = *pL;
pL++;
pX[3] = WINPR_ASSERTING_INT_CAST(int16_t, (X0 + L0) / 2);
pX[3] = clampi16((int32_t)(X0 + L0) / 2);
}
pLowBand += nLowStep;
@@ -596,24 +601,19 @@ static INLINE void progressive_rfx_idwt_y(const INT16* WINPR_RESTRICT pLowBand,
INT16* WINPR_RESTRICT pDstBand, size_t nDstStep,
size_t nLowCount, size_t nHighCount, size_t nDstCount)
{
INT16 L0 = 0;
INT16 H0 = 0;
INT16 H1 = 0;
INT16 X0 = 0;
INT16 X1 = 0;
INT16 X2 = 0;
for (size_t i = 0; i < nDstCount; i++)
{
INT16 H1 = 0;
INT16 X1 = 0;
const INT16* pL = pLowBand;
const INT16* pH = pHighBand;
INT16* pX = pDstBand;
H0 = *pH;
INT16 H0 = *pH;
pH += nHighStep;
L0 = *pL;
INT16 L0 = *pL;
pL += nLowStep;
X0 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - H0);
X2 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - H0);
int16_t X0 = clampi16((int32_t)L0 - H0);
int16_t X2 = clampi16((int32_t)L0 - H0);
for (size_t j = 0; j < (nHighCount - 1); j++)
{
@@ -621,8 +621,8 @@ static INLINE void progressive_rfx_idwt_y(const INT16* WINPR_RESTRICT pLowBand,
pH += nHighStep;
L0 = *pL;
pL += nLowStep;
X2 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - ((H0 + H1) / 2));
X1 = WINPR_ASSERTING_INT_CAST(int16_t, ((X0 + X2) / 2) + (2 * H0));
X2 = clampi16((int32_t)L0 - ((H0 + H1) / 2));
X1 = clampi16((int32_t)((X0 + X2) / 2) + (2 * H0));
*pX = X0;
pX += nDstStep;
*pX = X1;
@@ -637,15 +637,15 @@ static INLINE void progressive_rfx_idwt_y(const INT16* WINPR_RESTRICT pLowBand,
{
*pX = X2;
pX += nDstStep;
*pX = WINPR_ASSERTING_INT_CAST(int16_t, X2 + (2 * H0));
*pX = clampi16((int32_t)X2 + (2 * H0));
}
else
{
L0 = *pL;
X0 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - H0);
X0 = clampi16((int32_t)L0 - H0);
*pX = X2;
pX += nDstStep;
*pX = WINPR_ASSERTING_INT_CAST(int16_t, ((X0 + X2) / 2) + (2 * H0));
*pX = clampi16((int32_t)((X0 + X2) / 2) + (2 * H0));
pX += nDstStep;
*pX = X0;
}
@@ -654,15 +654,15 @@ static INLINE void progressive_rfx_idwt_y(const INT16* WINPR_RESTRICT pLowBand,
{
L0 = *pL;
pL += nLowStep;
X0 = WINPR_ASSERTING_INT_CAST(int16_t, L0 - (H0 / 2));
X0 = clampi16((int32_t)L0 - (H0 / 2));
*pX = X2;
pX += nDstStep;
*pX = WINPR_ASSERTING_INT_CAST(int16_t, ((X0 + X2) / 2) + (2 * H0));
*pX = clampi16((int32_t)((X0 + X2) / 2) + (2 * H0));
pX += nDstStep;
*pX = X0;
pX += nDstStep;
L0 = *pL;
*pX = WINPR_ASSERTING_INT_CAST(int16_t, (X0 + L0) / 2);
*pX = clampi16((int32_t)(X0 + L0) / 2);
}
pLowBand++;