Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Color profile check #3

Merged
merged 3 commits into from
Nov 2, 2021
Merged

Color profile check #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e497cf
use 516 instead of 517 constant
alexandru-bagu Oct 22, 2021
88fa7cc
add missing +128 from formula on Wikipedia
alexandru-bagu Oct 23, 2021
3cb07fd
fix type for neon_YuvToRgbPixel Y
alexandru-bagu Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions libfreerdp/primitives/prim_YUV.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,9 +460,9 @@ static pstatus_t general_YUV444ToRGB_8u_P3AC4R(const BYTE* const pSrc[3], const
}
}
/**
* | R | ( | 256 0 403 | | Y | )
* | G | = ( | 256 -48 -120 | | U - 128 | ) >> 8
* | B | ( | 256 475 0 | | V - 128 | )
* | R | ( | 298 0 409 | | Y - 16 | )
* | G | = ( | 298 -100 -208 | | U - 128 | ) >> 8
* | B | ( | 298 516 0 | | V - 128 | )
*/
static pstatus_t general_YUV420ToRGB_8u_P3AC4R(const BYTE* const pSrc[3], const UINT32 srcStep[3],
BYTE* pDst, UINT32 dstStep, UINT32 DstFormat,
Expand Down Expand Up @@ -589,23 +589,24 @@ static pstatus_t general_YUV420ToRGB_8u_P3AC4R(const BYTE* const pSrc[3], const
}

/**
* | Y | ( | 66 129 25 | | R | ) | 16 |
* | U | = ( | -38 -74 112 | | G | ) >> 8 + | 128 |
* | V | ( | 112 -94 -18 | | B | ) | 128 |
* | Y | ( ( | 66 129 25 | | R | ) | 128 | ) | 16 |
* | U | = ( ( | -38 -74 112 | | G | ) + | 128 | ) >> 8 + | 128 |
* | V | ( ( | 112 -94 -18 | | B | ) | 128 | ) | 128 |
*/

static INLINE BYTE RGB2Y(BYTE R, BYTE G, BYTE B)
{
return ((66 * R + 129 * G + 25 * B) >> 8) + 16u;
return ((66lu * R + 129lu * G + 25lu * B + 128lu) >> 8lu) + 16lu;
}

static INLINE BYTE RGB2U(BYTE R, BYTE G, BYTE B)
{
return ((-38u * R - 74u * G + 112u * B) >> 8u) + 128u;
return ((-38lu * R - 74lu * G + 112lu * B + 128lu) >> 8lu) + 128lu;
}

static INLINE BYTE RGB2V(INT32 R, INT32 G, INT32 B)
{
return ((112lu * R - 94lu * G - 18lu * B) >> 8lu) + 128lu;
return ((112lu * R - 94lu * G - 18lu * B + 128lu) >> 8lu) + 128lu;
}

static pstatus_t general_RGBToYUV444_8u_P3AC4R(const BYTE* pSrc, UINT32 SrcFormat,
Expand Down
22 changes: 11 additions & 11 deletions libfreerdp/primitives/prim_YUV_neon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static primitives_t* generic = NULL;
/**
* | R | ( | 298 0 409 | | Y - 16 | )
* | G | = ( | 298 -100 -208 | | U - 128 | ) >> 8
* | B | ( | 298 517 0 | | V - 128 | )
* | B | ( | 298 516 0 | | V - 128 | )
*/

static INLINE uint8x8_t neon_YUV2R(int32x4_t Ch, int32x4_t Cl, int16x4_t Dh, int16x4_t Dl,
Expand Down Expand Up @@ -77,10 +77,10 @@ static INLINE uint8x8_t neon_YUV2G(int32x4_t Ch, int32x4_t Cl, int16x4_t Dh, int
static INLINE uint8x8_t neon_YUV2B(int32x4_t Ch, int32x4_t Cl, int16x4_t Dh, int16x4_t Dl,
int16x4_t Eh, int16x4_t El)
{
/* B = (298 * (Y - 16) + 517 * (U - 128)) >> 8*/
const int16x4_t c517 = { 517, 517, 517, 517 };
const int32x4_t CDh = vmlal_s16(Ch, Dh, c517);
const int32x4_t CDl = vmlal_s16(Ch, Dl, c517);
/* B = (298 * (Y - 16) + 516 * (U - 128)) >> 8*/
const int16x4_t c516 = { 516, 516, 516, 516 };
const int32x4_t CDh = vmlal_s16(Ch, Dh, c516);
const int32x4_t CDl = vmlal_s16(Ch, Dl, c516);
const int32x4_t Bh = vrshrq_n_s32(CDh, 8);
const int32x4_t Bl = vrshrq_n_s32(CDl, 8);
const int16x8_t B = vcombine_s16(vqmovn_s32(Bl), vqmovn_s32(Bh));
Expand All @@ -93,19 +93,19 @@ static INLINE BYTE* neon_YuvToRgbPixel(BYTE* pRGB, int16x8_t Y, int16x8_t D, int
{
uint8x8x4_t bgrx;
const int16x4_t c16 = { 16, 16, 16, 16 };
const int32x4_t Yh = vsub_s16(vget_high_s16(Y), c16);
const int32x4_t Yl = vsub_s16(vget_low_s16(Y), c16);
const int16x4_t Yh = vsub_s16(vget_high_s16(Y), c16);
const int16x4_t Yl = vsub_s16(vget_low_s16(Y), c16);
const int32x4_t Ch = vmulq_n_s32(vmovl_s16(Yh), 298); /* Y * 298 */
const int32x4_t Cl = vmulq_n_s32(vmovl_s16(Yl), 298); /* Y * 298 */
const int16x4_t Dh = vget_high_s16(D);
const int16x4_t Dl = vget_low_s16(D);
const int16x4_t Eh = vget_high_s16(E);
const int16x4_t El = vget_low_s16(E);
{
/* B = (298 * (Y - 16) + 517 * (U - 128)) >> 8*/
const int16x4_t c517 = { 517, 517, 517, 517 };
const int32x4_t CDh = vmlal_s16(Ch, Dh, c517);
const int32x4_t CDl = vmlal_s16(Cl, Dl, c517);
/* B = (298 * (Y - 16) + 516 * (U - 128)) >> 8*/
const int16x4_t c516 = { 516, 516, 516, 516 };
const int32x4_t CDh = vmlal_s16(Ch, Dh, c516);
const int32x4_t CDl = vmlal_s16(Cl, Dl, c516);
const int32x4_t Bh = vrshrq_n_s32(CDh, 8);
const int32x4_t Bl = vrshrq_n_s32(CDl, 8);
const int16x8_t B = vcombine_s16(vqmovn_s32(Bl), vqmovn_s32(Bh));
Expand Down