Skip to content

Commit

Permalink
Add comments about non successfull attempt of implementing alternate …
Browse files Browse the repository at this point in the history
…INITDEC, DECODE and BYTEIN procedures (refs #921)
  • Loading branch information
rouault committed May 15, 2017
1 parent f7a126a commit 4431fa7
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/lib/openjp2/mqc.c
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,11 @@ void opj_mqc_segmark_enc(opj_mqc_t *mqc)

OPJ_BOOL opj_mqc_init_dec(opj_mqc_t *mqc, OPJ_BYTE *bp, OPJ_UINT32 len)
{
/* Implements ISO 15444-1 C.3.5 Initialization of the decoder (INITDEC) */
/* Note: alternate "J.1 - Initialization of the software-conventions */
/* decoder" has been tried, but does */
/* not bring any improvement. */
/* See https://github.com/uclouvain/openjpeg/issues/921 */
opj_mqc_setcurctx(mqc, 0);
mqc->start = bp;
mqc->end = bp + len;
Expand Down
8 changes: 8 additions & 0 deletions src/lib/openjp2/mqc_inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ static INLINE void opj_mqc_bytein(opj_mqc_t *const mqc)
#else
static INLINE void opj_mqc_bytein(opj_mqc_t *const mqc)
{
/* Implements ISO 15444-1 C.3.4 Compressed image data input (BYTEIN) */
/* Note: alternate "J.3 - Inserting a new byte into the C register in the */
/* software-conventions decoder" has been tried, but does not bring any */
/* improvement. See https://github.com/uclouvain/openjpeg/issues/921 */
if (mqc->bp != mqc->end) {
OPJ_UINT32 c;
if (mqc->bp + 1 != mqc->end) {
Expand Down Expand Up @@ -144,6 +148,10 @@ Decode a symbol
*/
static INLINE OPJ_INT32 opj_mqc_decode(opj_mqc_t *const mqc)
{
/* Implements ISO 15444-1 C.3.2 Decoding a decision (DECODE) */
/* Note: alternate "J.2 - Decoding an MPS or an LPS in the */
/* software-conventions decoder" has been tried, but does not bring any */
/* improvement. See https://github.com/uclouvain/openjpeg/issues/921 */
OPJ_INT32 d;
mqc->a -= (*mqc->curctx)->qeval;
if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
Expand Down

0 comments on commit 4431fa7

Please sign in to comment.