mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

working progressive Original Method DWT 

Implemented decoding utilizing Original Method DWT
(See [MS-RDPEGFX] 3.2.8.1.2.2 Reduce-Extrapolate Method)
This commit is contained in:
Armin Novak 2019-12-16 08:34:42 +01:00 committed by akallabeth
parent 1fa00c4318
commit c0bf6c0768
3 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
libfreerdp/codec/progressive.c
View File

@ -35,6 +35,7 @@
#include "rfx_differential.h" #include "rfx_differential.h"
#include "rfx_quantization.h" #include "rfx_quantization.h"
#include "rfx_dwt.h"
#include "rfx_rlgr.h" #include "rfx_rlgr.h"
#include "progressive.h" #include "progressive.h"
@ -764,8 +765,7 @@ static INLINE size_t progressive_rfx_get_band_h_count(size_t level)
return (64 + (1 << (level - 1))) >> level; return (64 + (1 << (level - 1))) >> level;
} }
static INLINE void progressive_rfx_dwt_2d_decode_block(INT16* buffer, INT16* temp, size_t level, static INLINE void progressive_rfx_dwt_2d_decode_block(INT16* buffer, INT16* temp, size_t level)
BOOL extrapolate)
{ {
size_t nDstStepX; size_t nDstStepX;
size_t nDstStepY; size_t nDstStepY;
@ -776,6 +776,7 @@ static INLINE void progressive_rfx_dwt_2d_decode_block(INT16* buffer, INT16* tem
const size_t nBandL = progressive_rfx_get_band_l_count(level); const size_t nBandL = progressive_rfx_get_band_l_count(level);
const size_t nBandH = progressive_rfx_get_band_h_count(level); const size_t nBandH = progressive_rfx_get_band_h_count(level);
size_t offset = 0; size_t offset = 0;
HL = &buffer[offset]; HL = &buffer[offset];
offset += (nBandH * nBandL); offset += (nBandH * nBandL);
LH = &buffer[offset]; LH = &buffer[offset];
@ -802,18 +803,40 @@ static INLINE void progressive_rfx_dwt_2d_decode_block(INT16* buffer, INT16* tem
nBandL + nBandH); nBandL + nBandH);
} }
static INLINE void progressive_rfx_dwt_2d_decode(INT16* buffer, INT16* temp, INT16* current, static INLINE int progressive_rfx_dwt_2d_decode(PROGRESSIVE_CONTEXT* progressive, INT16* buffer,
INT16* sign, BOOL diff, BOOL extrapolate) INT16* current, BOOL coeffDiff, BOOL extrapolate,
BOOL reverse)
{ {
const primitives_t* prims = primitives_get(); const primitives_t* prims = primitives_get();
INT16* temp;
if (diff) if (!progressive || !buffer || !current)
return -1;
if (coeffDiff)
prims->add_16s(buffer, current, buffer, 4096); prims->add_16s(buffer, current, buffer, 4096);
CopyMemory(current, buffer, 4096 * 2); if (reverse)
progressive_rfx_dwt_2d_decode_block(&buffer[3807], temp, 3, extrapolate); CopyMemory(buffer, current, 4096 * 2);
progressive_rfx_dwt_2d_decode_block(&buffer[3007], temp, 2, extrapolate); else
progressive_rfx_dwt_2d_decode_block(&buffer[0], temp, 1, extrapolate); CopyMemory(current, buffer, 4096 * 2);
temp = (INT16*)BufferPool_Take(progressive->bufferPool, -1); /* DWT buffer */
if (!temp)
return -2;
if (!extrapolate)
{
rfx_dwt_2d_decode_block(&buffer[3840], temp, 8);
rfx_dwt_2d_decode_block(&buffer[3072], temp, 16);
rfx_dwt_2d_decode_block(&buffer[0], temp, 32);
}
else
{
progressive_rfx_dwt_2d_decode_block(&buffer[3807], temp, 3);
progressive_rfx_dwt_2d_decode_block(&buffer[3007], temp, 2);
progressive_rfx_dwt_2d_decode_block(&buffer[0], temp, 1);
}
BufferPool_Return(progressive->bufferPool, temp);
return 1;
} }
static INLINE void progressive_rfx_decode_block(const primitives_t* prims, INT16* buffer, static INLINE void progressive_rfx_decode_block(const primitives_t* prims, INT16* buffer,
@ -828,12 +851,15 @@ static INLINE void progressive_rfx_decode_block(const primitives_t* prims, INT16
static INLINE int progressive_rfx_decode_component(PROGRESSIVE_CONTEXT* progressive, static INLINE int progressive_rfx_decode_component(PROGRESSIVE_CONTEXT* progressive,
const RFX_COMPONENT_CODEC_QUANT* shift, const RFX_COMPONENT_CODEC_QUANT* shift,
const BYTE* data, UINT32 length, INT16* buffer, const BYTE* data, UINT32 length, INT16* buffer,
INT16* current, INT16* sign, BOOL diff, INT16* current, INT16* sign, BOOL coeffDiff,
BOOL subbandDiff, BOOL extrapolate) BOOL subbandDiff, BOOL extrapolate)
{ {
int status; int status;
INT16* temp;
const primitives_t* prims = primitives_get(); const primitives_t* prims = primitives_get();
if (!subbandDiff)
WLog_WARN(TAG, "PROGRESSIVE_BLOCK_CONTEXT::flags & RFX_SUBBAND_DIFFING not set");
status = rfx_rlgr_decode(RLGR1, data, length, buffer, 4096); status = rfx_rlgr_decode(RLGR1, data, length, buffer, 4096);
if (status < 0) if (status < 0)
@ -853,10 +879,8 @@ static INLINE int progressive_rfx_decode_component(PROGRESSIVE_CONTEXT* progress
rfx_differential_decode(&buffer[4015], 81); /* LL3 */ rfx_differential_decode(&buffer[4015], 81); /* LL3 */
progressive_rfx_decode_block(prims, &buffer[4015], 81, shift->LL3); /* LL3 */ progressive_rfx_decode_block(prims, &buffer[4015], 81, shift->LL3); /* LL3 */
temp = (INT16*)BufferPool_Take(progressive->bufferPool, -1); /* DWT buffer */ return progressive_rfx_dwt_2d_decode(progressive, buffer, current, coeffDiff, extrapolate,
progressive_rfx_dwt_2d_decode(buffer, temp, current, sign, diff, extrapolate); FALSE);
BufferPool_Return(progressive->bufferPool, temp);
return 1;
} }
static INLINE int progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* progressive, static INLINE int progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* progressive,
@ -949,13 +973,6 @@ static INLINE int progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* progres
tile->cbProgQuant = *quantProgCb; tile->cbProgQuant = *quantProgCb;
tile->crProgQuant = *quantProgCr; tile->crProgQuant = *quantProgCr;
if (!(region->flags & RFX_DWT_REDUCE_EXTRAPOLATE))
WLog_Print(progressive->log, WLOG_WARN,
"RFX_PROGRESSIVE_REGION::flags & RFX_DWT_REDUCE_EXTRAPOLATE not set");
if (!(context->flags & RFX_SUBBAND_DIFFING))
WLog_WARN(TAG, "PROGRESSIVE_BLOCK_CONTEXT::flags & RFX_SUBBAND_DIFFING not set");
progressive_rfx_quant_add(quantY, quantProgY, &(tile->yBitPos)); progressive_rfx_quant_add(quantY, quantProgY, &(tile->yBitPos));
progressive_rfx_quant_add(quantCb, quantProgCb, &(tile->cbBitPos)); progressive_rfx_quant_add(quantCb, quantProgCb, &(tile->cbBitPos));
progressive_rfx_quant_add(quantCr, quantProgCr, &(tile->crBitPos)); progressive_rfx_quant_add(quantCr, quantProgCr, &(tile->crBitPos));
@ -991,6 +1008,7 @@ static INLINE int progressive_decompress_tile_first(PROGRESSIVE_CONTEXT* progres
rc = progressive_rfx_decode_component(progressive, &shiftCr, tile->crData, tile->crLen, rc = progressive_rfx_decode_component(progressive, &shiftCr, tile->crData, tile->crLen,
pSrcDst[2], pCurrent[2], pSign[2], diff, sub, pSrcDst[2], pCurrent[2], pSign[2], diff, sub,
extrapolate); /* Cr */ extrapolate); /* Cr */
if (rc < 0) if (rc < 0)
goto fail; goto fail;
@ -1175,10 +1193,9 @@ static INLINE int progressive_rfx_upgrade_component(
PROGRESSIVE_CONTEXT* progressive, const RFX_COMPONENT_CODEC_QUANT* shift, PROGRESSIVE_CONTEXT* progressive, const RFX_COMPONENT_CODEC_QUANT* shift,
const RFX_COMPONENT_CODEC_QUANT* bitPos, const RFX_COMPONENT_CODEC_QUANT* numBits, const RFX_COMPONENT_CODEC_QUANT* bitPos, const RFX_COMPONENT_CODEC_QUANT* numBits,
INT16* buffer, INT16* current, INT16* sign, const BYTE* srlData, UINT32 srlLen, INT16* buffer, INT16* current, INT16* sign, const BYTE* srlData, UINT32 srlLen,
const BYTE* rawData, UINT32 rawLen, BOOL subbandDiff, BOOL extrapolate) const BYTE* rawData, UINT32 rawLen, BOOL coeffDiff, BOOL subbandDiff, BOOL extrapolate)
{ {
int rc; int rc;
INT16* temp;
UINT32 aRawLen; UINT32 aRawLen;
UINT32 aSrlLen; UINT32 aSrlLen;
wBitStream s_srl = { 0 }; wBitStream s_srl = { 0 };
@ -1263,13 +1280,8 @@ static INLINE int progressive_rfx_upgrade_component(
return -1; return -1;
} }
temp = (INT16*)BufferPool_Take(progressive->bufferPool, -1); /* DWT buffer */ return progressive_rfx_dwt_2d_decode(progressive, buffer, current, coeffDiff, extrapolate,
CopyMemory(buffer, current, 4096 * 2); TRUE);
progressive_rfx_dwt_2d_decode_block(&buffer[3807], temp, 3, extrapolate);
progressive_rfx_dwt_2d_decode_block(&buffer[3007], temp, 2, extrapolate);
progressive_rfx_dwt_2d_decode_block(&buffer[0], temp, 1, extrapolate);
BufferPool_Return(progressive->bufferPool, temp);
return 1;
} }
static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progressive, static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progressive,
@ -1278,7 +1290,7 @@ static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progr
const PROGRESSIVE_BLOCK_CONTEXT* context) const PROGRESSIVE_BLOCK_CONTEXT* context)
{ {
int status; int status;
BOOL sub, extrapolate; BOOL coeffDiff, sub, extrapolate;
BYTE* pBuffer; BYTE* pBuffer;
INT16* pSign[3] = { 0 }; INT16* pSign[3] = { 0 };
INT16* pSrcDst[3] = { 0 }; INT16* pSrcDst[3] = { 0 };
@ -1302,6 +1314,7 @@ static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progr
static const prim_size_t roi_64x64 = { 64, 64 }; static const prim_size_t roi_64x64 = { 64, 64 };
const primitives_t* prims = primitives_get(); const primitives_t* prims = primitives_get();
coeffDiff = tile->flags & RFX_TILE_DIFFERENCE;
sub = context->flags & RFX_SUBBAND_DIFFING; sub = context->flags & RFX_SUBBAND_DIFFING;
extrapolate = region->flags & RFX_DWT_REDUCE_EXTRAPOLATE; extrapolate = region->flags & RFX_DWT_REDUCE_EXTRAPOLATE;
@ -1370,10 +1383,6 @@ static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progr
if (!progressive_rfx_quant_cmp_equal(quantCr, &(tile->crQuant))) if (!progressive_rfx_quant_cmp_equal(quantCr, &(tile->crQuant)))
WLog_Print(progressive->log, WLOG_WARN, "non-progressive quantCr has changed!"); WLog_Print(progressive->log, WLOG_WARN, "non-progressive quantCr has changed!");
if (!(region->flags & RFX_DWT_REDUCE_EXTRAPOLATE))
WLog_Print(progressive->log, WLOG_WARN,
"RFX_PROGRESSIVE_REGION::flags & RFX_DWT_REDUCE_EXTRAPOLATE not set");
if (!(context->flags & RFX_SUBBAND_DIFFING)) if (!(context->flags & RFX_SUBBAND_DIFFING))
WLog_WARN(TAG, "PROGRESSIVE_BLOCK_CONTEXT::flags & RFX_SUBBAND_DIFFING not set"); WLog_WARN(TAG, "PROGRESSIVE_BLOCK_CONTEXT::flags & RFX_SUBBAND_DIFFING not set");
@ -1413,25 +1422,26 @@ static INLINE int progressive_decompress_tile_upgrade(PROGRESSIVE_CONTEXT* progr
pSrcDst[1] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 1) + 16])); /* Cb/G buffer */ pSrcDst[1] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 1) + 16])); /* Cb/G buffer */
pSrcDst[2] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 2) + 16])); /* Cr/B buffer */ pSrcDst[2] = (INT16*)((BYTE*)(&pBuffer[((8192 + 32) * 2) + 16])); /* Cr/B buffer */
status = progressive_rfx_upgrade_component( status = progressive_rfx_upgrade_component(progressive, &shiftY, quantProgY, &yNumBits,
progressive, &shiftY, quantProgY, &yNumBits, pSrcDst[0], pCurrent[0], pSign[0], pSrcDst[0], pCurrent[0], pSign[0], tile->ySrlData,
tile->ySrlData, tile->ySrlLen, tile->yRawData, tile->yRawLen, sub, extrapolate); /* Y */ tile->ySrlLen, tile->yRawData, tile->yRawLen,
coeffDiff, sub, extrapolate); /* Y */
if (status < 0) if (status < 0)
goto fail; goto fail;
status = progressive_rfx_upgrade_component(progressive, &shiftCb, quantProgCb, &cbNumBits, status = progressive_rfx_upgrade_component(progressive, &shiftCb, quantProgCb, &cbNumBits,
pSrcDst[1], pCurrent[1], pSign[1], tile->cbSrlData, pSrcDst[1], pCurrent[1], pSign[1], tile->cbSrlData,
tile->cbSrlLen, tile->cbRawData, tile->cbRawLen, sub, tile->cbSrlLen, tile->cbRawData, tile->cbRawLen,
extrapolate); /* Cb */ coeffDiff, sub, extrapolate); /* Cb */
if (status < 0) if (status < 0)
goto fail; goto fail;
status = progressive_rfx_upgrade_component(progressive, &shiftCr, quantProgCr, &crNumBits, status = progressive_rfx_upgrade_component(progressive, &shiftCr, quantProgCr, &crNumBits,
pSrcDst[2], pCurrent[2], pSign[2], tile->crSrlData, pSrcDst[2], pCurrent[2], pSign[2], tile->crSrlData,
tile->crSrlLen, tile->crRawData, tile->crRawLen, sub, tile->crSrlLen, tile->crRawData, tile->crRawLen,
extrapolate); /* Cr */ coeffDiff, sub, extrapolate); /* Cr */
if (status < 0) if (status < 0)
goto fail; goto fail;

2
libfreerdp/codec/rfx_dwt.c
View File

@ -27,7 +27,7 @@
#include "rfx_dwt.h" #include "rfx_dwt.h"
static void rfx_dwt_2d_decode_block(INT16* buffer, INT16* idwt, int subband_width) void rfx_dwt_2d_decode_block(INT16* buffer, INT16* idwt, int subband_width)
{ {
INT16 *dst, *l, *h; INT16 *dst, *l, *h;
INT16 *l_dst, *h_dst; INT16 *l_dst, *h_dst;

1
libfreerdp/codec/rfx_dwt.h
View File

@ -23,6 +23,7 @@
#include <freerdp/codec/rfx.h> #include <freerdp/codec/rfx.h>
#include <freerdp/api.h> #include <freerdp/api.h>
FREERDP_LOCAL void rfx_dwt_2d_decode_block(INT16* buffer, INT16* idwt, int subband_width);
FREERDP_LOCAL void rfx_dwt_2d_decode(INT16* buffer, INT16* dwt_buffer); FREERDP_LOCAL void rfx_dwt_2d_decode(INT16* buffer, INT16* dwt_buffer);
FREERDP_LOCAL void rfx_dwt_2d_encode(INT16* buffer, INT16* dwt_buffer); FREERDP_LOCAL void rfx_dwt_2d_encode(INT16* buffer, INT16* dwt_buffer);