diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 17:39:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 18:07:48 +0200 |
| commit | b67fe48f3418e385acb1b4f6e8d640effa250dab (patch) | |
| tree | affbd8b5210671a51c1e6bee6c34c1653661dc07 /libavcodec/j2k.c | |
| parent | 69b97739806f618b1931741fa0b42d0cf03e9c31 (diff) | |
jpeg2000/j2k: merge getsigctxno()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2k.c')
| -rw-r--r-- | libavcodec/j2k.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c index af23ef8226..d5591b622b 100644 --- a/libavcodec/j2k.c +++ b/libavcodec/j2k.c @@ -107,43 +107,43 @@ static int getsigctxno(int flag, int bandno) { int h, v, d; - h = ((flag & JPEG2000_T1_SIG_E) ? 1:0)+ - ((flag & JPEG2000_T1_SIG_W) ? 1:0); - v = ((flag & JPEG2000_T1_SIG_N) ? 1:0); - v = v + ((flag & JPEG2000_T1_SIG_S) ? 1:0); - d = ((flag & JPEG2000_T1_SIG_NE) ? 1:0)+ - ((flag & JPEG2000_T1_SIG_NW) ? 1:0); - d = d + ((flag & JPEG2000_T1_SIG_SE) ? 1:0)+ - ((flag & JPEG2000_T1_SIG_SW) ? 1:0); + h = ((flag & JPEG2000_T1_SIG_E) ? 1 : 0) + + ((flag & JPEG2000_T1_SIG_W) ? 1 : 0); + v = ((flag & JPEG2000_T1_SIG_N) ? 1 : 0) + + ((flag & JPEG2000_T1_SIG_S) ? 1 : 0); + d = ((flag & JPEG2000_T1_SIG_NE) ? 1 : 0) + + ((flag & JPEG2000_T1_SIG_NW) ? 1 : 0) + + ((flag & JPEG2000_T1_SIG_SE) ? 1 : 0) + + ((flag & JPEG2000_T1_SIG_SW) ? 1 : 0); + if (bandno < 3){ - if (bandno == 1) - FFSWAP(int, h, v); - if (h == 2) return 8; - if (h == 1){ - if (v >= 1) return 7; - if (d >= 1) return 6; - return 5; - } - if (v == 2) return 4; - if (v == 1) return 3; - if (d >= 2) return 2; - if (d == 1) return 1; - return 0; + if (bandno == 1) + FFSWAP(int, h, v); + if (h == 2) return 8; + if (h == 1){ + if (v >= 1) return 7; + if (d >= 1) return 6; + return 5; + } + if (v == 2) return 4; + if (v == 1) return 3; + if (d >= 2) return 2; + if (d == 1) return 1; } else{ - if (d >= 3) return 8; - if (d == 2){ - if (h+v >= 1) return 7; - return 6; - } - if (d == 1){ - if (h+v >= 2) return 5; - if (h+v == 1) return 4; - return 3; - } - if (h+v >= 2) return 2; - if (h+v == 1) return 1; - return 0; + if (d >= 3) return 8; + if (d == 2){ + if (h+v >= 1) return 7; + return 6; + } + if (d == 1){ + if (h+v >= 2) return 5; + if (h+v == 1) return 4; + return 3; + } + if (h+v >= 2) return 2; + if (h+v == 1) return 1; } + return 0; } static int getsgnctxno(int flag, uint8_t *xorbit) |