mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed obsolete primitive usage.

Browse Source
This commit is contained in:
Armin Novak 2017-01-16 12:40:39 +01:00
parent 7e4c6c6a48
commit 7198970a4e
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/codec/progressive.h
View File

@ -208,8 +208,6 @@ struct _PROGRESSIVE_CONTEXT
{ {
BOOL Compressor; BOOL Compressor;
BOOL invert;
wBufferPool* bufferPool; wBufferPool* bufferPool;
UINT32 cRects; UINT32 cRects;

26
libfreerdp/codec/progressive.c
View File

@ -844,16 +844,9 @@ static INLINE int progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* progres
progressive_rfx_decode_component(progressive, &shiftCr, tile->crData, progressive_rfx_decode_component(progressive, &shiftCr, tile->crData,
tile->crLen, tile->crLen,
pSrcDst[2], pCurrent[2], pSign[2], diff); /* Cr */ pSrcDst[2], pCurrent[2], pSign[2], diff); /* Cr */
prims->yCbCrToRGB_16s8u_P3AC4R((const INT16**) pSrcDst, 64 * 2,
if (!progressive->invert) tile->data, PIXEL_FORMAT_BGRX32,
prims->yCbCrToRGB_16s8u_P3AC4R((const INT16**) pSrcDst, 64 * 2, 64 * 4, &roi_64x64);
tile->data, PIXEL_FORMAT_BGRX32,
64 * 4, &roi_64x64);
else
prims->yCbCrToBGR_16s8u_P3AC4R((const INT16**) pSrcDst, 64 * 2,
tile->data, PIXEL_FORMAT_BGRX32,
64 * 4, &roi_64x64);
BufferPool_Return(progressive->bufferPool, pBuffer); BufferPool_Return(progressive->bufferPool, pBuffer);
return 1; return 1;
} }
@ -1266,15 +1259,9 @@ static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progr
if (status < 0) if (status < 0)
return -1; return -1;
if (!progressive->invert) prims->yCbCrToRGB_16s8u_P3AC4R((const INT16**) pSrcDst, 64 * 2,
prims->yCbCrToRGB_16s8u_P3AC4R((const INT16**) pSrcDst, 64 * 2, tile->data, PIXEL_FORMAT_BGRX32,
tile->data, PIXEL_FORMAT_BGRX32, 64 * 4, &roi_64x64);
64 * 4, &roi_64x64);
else
prims->yCbCrToBGR_16s8u_P3AC4R((const INT16**) pSrcDst, 64 * 2,
tile->data, PIXEL_FORMAT_BGRX32,
64 * 4, &roi_64x64);
BufferPool_Return(progressive->bufferPool, pBuffer); BufferPool_Return(progressive->bufferPool, pBuffer);
return 1; return 1;
} }
@ -1572,7 +1559,6 @@ INT32 progressive_decompress(PROGRESSIVE_CONTEXT* progressive,
REGION16 clippingRects, updateRegion; REGION16 clippingRects, updateRegion;
PROGRESSIVE_SURFACE_CONTEXT* surface; PROGRESSIVE_SURFACE_CONTEXT* surface;
PROGRESSIVE_BLOCK_REGION* region; PROGRESSIVE_BLOCK_REGION* region;
progressive->invert = FREERDP_PIXEL_FORMAT_IS_ABGR(DstFormat) ? TRUE : FALSE;
surface = (PROGRESSIVE_SURFACE_CONTEXT*) progressive_get_surface_data( surface = (PROGRESSIVE_SURFACE_CONTEXT*) progressive_get_surface_data(
progressive, surfaceId); progressive, surfaceId);