diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 19:41:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 20:00:54 +0200 |
| commit | e2e9bee2daef9d5d5169f5360737eec8b76d7e0c (patch) | |
| tree | 22ba6e50d34a036832d4ef8f903df335d3c9d63a /libavcodec/mqcdec.c | |
| parent | c1c2b0b3390482bba39534f2f125d97e8964d7d5 (diff) | |
| parent | f13888afcc5e528b80e4ae5bc4f0d9dadc76f6aa (diff) | |
| download | ffmpeg-e2e9bee2daef9d5d5169f5360737eec8b76d7e0c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: Bump minor for JPEG 2000 decoder
JPEG 2000 decoder for DCinema
The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/mqc.c
libavcodec/mqc.h
libavcodec/mqcdec.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mqcdec.c')
| -rw-r--r-- | libavcodec/mqcdec.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/mqcdec.c b/libavcodec/mqcdec.c index 56e22f88c7..362506992a 100644 --- a/libavcodec/mqcdec.c +++ b/libavcodec/mqcdec.c @@ -29,14 +29,14 @@ static void bytein(MqcState *mqc) { - if (*mqc->bp == 0xff){ - if (*(mqc->bp+1) > 0x8f) + if (*mqc->bp == 0xff) { + if (*(mqc->bp + 1) > 0x8f) mqc->c++; - else{ + else { mqc->bp++; mqc->c += 2 + 0xfe00 - (*mqc->bp << 9); } - } else{ + } else { mqc->bp++; mqc->c += 1 + 0xff00 - (*mqc->bp << 8); } @@ -45,20 +45,20 @@ static void bytein(MqcState *mqc) static int exchange(MqcState *mqc, uint8_t *cxstate, int lps) { int d; - if ((mqc->a < ff_mqc_qe[*cxstate]) ^ (!lps)){ + if ((mqc->a < ff_mqc_qe[*cxstate]) ^ (!lps)) { if (lps) mqc->a = ff_mqc_qe[*cxstate]; d = *cxstate & 1; *cxstate = ff_mqc_nmps[*cxstate]; - } else{ + } else { if (lps) mqc->a = ff_mqc_qe[*cxstate]; d = 1 - (*cxstate & 1); *cxstate = ff_mqc_nlps[*cxstate]; } - // renormd: - do{ - if (!(mqc->c & 0xff)){ + // do RENORMD: see ISO/IEC 15444-1:2002 §C.3.3 + do { + if (!(mqc->c & 0xff)) { mqc->c -= 0x100; bytein(mqc); } @@ -72,7 +72,7 @@ void ff_mqc_initdec(MqcState *mqc, uint8_t *bp) { ff_mqc_init_contexts(mqc); mqc->bp = bp; - mqc->c = (*mqc->bp ^ 0xff) << 16; + mqc->c = (*mqc->bp ^ 0xff) << 16; bytein(mqc); mqc->c = mqc->c << 7; mqc->a = 0x8000; @@ -81,7 +81,7 @@ void ff_mqc_initdec(MqcState *mqc, uint8_t *bp) int ff_mqc_decode(MqcState *mqc, uint8_t *cxstate) { mqc->a -= ff_mqc_qe[*cxstate]; - if ((mqc->c >> 16) < mqc->a){ + if ((mqc->c >> 16) < mqc->a) { if (mqc->a & 0x8000) return *cxstate & 1; else |