annotate jpeg_ls.c @ 4535:e3b224087a85 libavcodec

10l: forgot break statement
author kostya
date Sat, 17 Feb 2007 11:39:54 +0000
parents 895b076101a8
children a96d905dcbaa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
1 /*
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
2 * JPEG-LS encoder and decoder
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
3 * Copyright (c) 2003 Michael Niedermayer
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
4 * Copyright (c) 2006 Konstantin Shishkov
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
5 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3773
diff changeset
6 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3773
diff changeset
7 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3773
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3773
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
12 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3773
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
16 * Lesser General Public License for more details.
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
17 *
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3773
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2970
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
21 */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
22
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
23 #include "golomb.h"
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
24
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
25 /**
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
26 * @file jpeg_ls.c
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
27 * JPEG-LS encoder and decoder.
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
28 */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
29
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
30 typedef struct JpeglsContext{
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
31 AVCodecContext *avctx;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
32 AVFrame picture;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
33 }JpeglsContext;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
34
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
35 typedef struct JLSState{
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
36 int T1, T2, T3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
37 int A[367], B[367], C[365], N[367];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
38 int limit, reset, bpp, qbpp, maxval, range;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
39 int near, twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
40 int run_index[3];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
41 }JLSState;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
42
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
43 static const uint8_t log2_run[32]={
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
44 0, 0, 0, 0, 1, 1, 1, 1,
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
45 2, 2, 2, 2, 3, 3, 3, 3,
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
46 4, 4, 5, 5, 6, 6, 7, 7,
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
47 8, 9,10,11,12,13,14,15
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
48 };
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
49
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
50 /*
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
51 * Uncomment this to significantly speed up decoding of broken JPEG-LS
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
52 * (or test broken JPEG-LS decoder) and slow down ordinary decoding a bit.
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
53 *
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
54 * There is no Golomb code with length >= 32 bits possible, so check and
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
55 * avoid situation of 32 zeros, FFmpeg Golomb decoder is painfully slow
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
56 * on this errors.
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
57 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
58 //#define JLS_BROKEN
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
59
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
60 /********** Functions for both encoder and decoder **********/
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
61
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
62 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
63 * Calculate initial JPEG-LS parameters
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
64 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
65 static void ls_init_state(JLSState *state){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
66 int i;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
67
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
68 state->twonear = state->near * 2 + 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
69 state->range = ((state->maxval + state->twonear - 1) / state->twonear) + 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
70
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
71 // QBPP = ceil(log2(RANGE))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
72 for(state->qbpp = 0; (1 << state->qbpp) < state->range; state->qbpp++);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
73
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
74 if(state->bpp < 8)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
75 state->limit = 16 + 2 * state->bpp - state->qbpp;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
76 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
77 state->limit = (4 * state->bpp) - state->qbpp;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
78
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
79 for(i = 0; i < 367; i++) {
4073
michael
parents: 4072
diff changeset
80 state->A[i] = FFMAX((state->range + 32) >> 6, 2);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
81 state->N[i] = 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
82 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
83
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
84 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
85
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
86 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
87 * Calculate quantized gradient value, used for context determination
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
88 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
89 static inline int quantize(JLSState *s, int v){ //FIXME optimize
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
90 if(v==0) return 0;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
91 if(v < 0){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
92 if(v <= -s->T3) return -4;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
93 if(v <= -s->T2) return -3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
94 if(v <= -s->T1) return -2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
95 if(v < -s->near) return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
96 return 0;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
97 }else{
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
98 if(v <= s->near) return 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
99 if(v < s->T1) return 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
100 if(v < s->T2) return 2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
101 if(v < s->T3) return 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
102 return 4;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
103 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
104 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
105
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
106 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
107 * Custom value clipping function used in T1, T2, T3 calculation
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
108 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
109 static inline int iso_clip(int v, int vmin, int vmax){
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
110 if(v > vmax || v < vmin) return vmin;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
111 else return v;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
112 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
113
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
114 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
115 * Calculate JPEG-LS codec values
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
116 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
117 static void reset_ls_coding_parameters(JLSState *s, int reset_all){
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
118 const int basic_t1= 3;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
119 const int basic_t2= 7;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
120 const int basic_t3= 21;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
121 int factor;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
122
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
123 if(s->maxval==0 || reset_all) s->maxval= (1 << s->bpp) - 1;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
124
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
125 if(s->maxval >=128){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
126 factor= (FFMIN(s->maxval, 4095) + 128)>>8;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
127
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
128 if(s->T1==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
129 s->T1= iso_clip(factor*(basic_t1-2) + 2 + 3*s->near, s->near+1, s->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
130 if(s->T2==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
131 s->T2= iso_clip(factor*(basic_t2-3) + 3 + 5*s->near, s->T1, s->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
132 if(s->T3==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
133 s->T3= iso_clip(factor*(basic_t3-4) + 4 + 7*s->near, s->T2, s->maxval);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
134 }else{
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
135 factor= 256 / (s->maxval + 1);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
136
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
137 if(s->T1==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
138 s->T1= iso_clip(FFMAX(2, basic_t1/factor + 3*s->near), s->near+1, s->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
139 if(s->T2==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
140 s->T2= iso_clip(FFMAX(3, basic_t2/factor + 5*s->near), s->T1, s->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
141 if(s->T3==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
142 s->T3= iso_clip(FFMAX(4, basic_t3/factor + 6*s->near), s->T2, s->maxval);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
143 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
144
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
145 if(s->reset==0 || reset_all) s->reset= 64;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
146 // av_log(NULL, AV_LOG_DEBUG, "[JPEG-LS RESET] T=%i,%i,%i\n", s->T1, s->T2, s->T3);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
147 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
148
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
149
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
150 /********** Decoder-specific functions **********/
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
151
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
152 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
153 * Decode LSE block with initialization parameters
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
154 */
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
155 static int decode_lse(MJpegDecodeContext *s)
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
156 {
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
157 int len, id;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
158
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
159 /* XXX: verify len field validity */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
160 len = get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
161 id = get_bits(&s->gb, 8);
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
162
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
163 switch(id){
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
164 case 1:
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
165 s->maxval= get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
166 s->t1= get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
167 s->t2= get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
168 s->t3= get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
169 s->reset= get_bits(&s->gb, 16);
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
170
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
171 // reset_ls_coding_parameters(s, 0);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
172 //FIXME quant table?
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
173 break;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
174 case 2:
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
175 case 3:
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
176 av_log(s->avctx, AV_LOG_ERROR, "palette not supported\n");
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
177 return -1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
178 case 4:
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
179 av_log(s->avctx, AV_LOG_ERROR, "oversize image not supported\n");
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
180 return -1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
181 default:
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
182 av_log(s->avctx, AV_LOG_ERROR, "invalid id %d\n", id);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
183 return -1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
184 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
185 // av_log(s->avctx, AV_LOG_DEBUG, "ID=%i, T=%i,%i,%i\n", id, s->t1, s->t2, s->t3);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
186
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
187 return 0;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
188 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
189
4074
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
190 static void inline downscale_state(JLSState *state, int Q){
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
191 if(state->N[Q] == state->reset){
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
192 state->A[Q] >>=1;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
193 state->B[Q] >>=1;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
194 state->N[Q] >>=1;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
195 }
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
196 state->N[Q]++;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
197 }
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
198
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
199 static inline int update_state_regular(JLSState *state, int Q, int err){
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
200 state->A[Q] += FFABS(err);
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
201 err *= state->twonear;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
202 state->B[Q] += err;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
203
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
204 downscale_state(state, Q);
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
205
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
206 if(state->B[Q] <= -state->N[Q]) {
4077
fc1235327725 simplify
michael
parents: 4076
diff changeset
207 state->B[Q]= FFMAX(state->B[Q] + state->N[Q], 1-state->N[Q]);
4074
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
208 if(state->C[Q] > -128)
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
209 state->C[Q]--;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
210 }else if(state->B[Q] > 0){
4077
fc1235327725 simplify
michael
parents: 4076
diff changeset
211 state->B[Q]= FFMIN(state->B[Q] - state->N[Q], 0);
4074
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
212 if(state->C[Q] < 127)
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
213 state->C[Q]++;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
214 }
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
215
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
216 return err;
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
217 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
218
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
219 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
220 * Get context-dependent Golomb code, decode it and update context
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
221 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
222 static inline int ls_get_code_regular(GetBitContext *gb, JLSState *state, int Q){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
223 int k, ret;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
224
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
225 for(k = 0; (state->N[Q] << k) < state->A[Q]; k++);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
226
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
227 #ifdef JLS_BROKEN
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
228 if(!show_bits_long(gb, 32))return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
229 #endif
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
230 ret = get_ur_golomb_jpegls(gb, k, state->limit, state->qbpp);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
231
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
232 /* decode mapped error */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
233 if(ret & 1)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
234 ret = -((ret + 1) >> 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
235 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
236 ret >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
237
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
238 /* for NEAR=0, k=0 and 2*B[Q] <= - N[Q] mapping is reversed */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
239 if(!state->near && !k && (2 * state->B[Q] <= -state->N[Q]))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
240 ret = -(ret + 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
241
4074
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
242 ret= update_state_regular(state, Q, ret);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
243
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
244 return ret;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
245 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
246
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
247 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
248 * Get Golomb code, decode it and update state for run termination
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
249 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
250 static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RItype, int limit_add){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
251 int k, ret, temp, map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
252 int Q = 365 + RItype;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
253
4072
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
254 temp= state->A[Q];
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
255 if(RItype)
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
256 temp += state->N[Q] >> 1;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
257
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
258 for(k = 0; (state->N[Q] << k) < temp; k++);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
259
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
260 #ifdef JLS_BROKEN
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
261 if(!show_bits_long(gb, 32))return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
262 #endif
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
263 ret = get_ur_golomb_jpegls(gb, k, state->limit - limit_add - 1, state->qbpp);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
264
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
265 /* decode mapped error */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
266 map = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
267 if(!k && (RItype || ret) && (2 * state->B[Q] < state->N[Q]))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
268 map = 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
269 ret += RItype + map;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
270
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
271 if(ret & 1){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
272 ret = map - ((ret + 1) >> 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
273 state->B[Q]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
274 } else {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
275 ret = ret >> 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
276 }
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
277
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
278 /* update state */
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
279 state->A[Q] += FFABS(ret) - RItype;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
280 ret *= state->twonear;
4074
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
281 downscale_state(state, Q);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
282
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
283 return ret;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
284 }
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
285
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
286 #define R(a, i ) (bits == 8 ? ((uint8_t*)(a))[i] : ((uint16_t*)(a))[i] )
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
287 #define W(a, i, v) (bits == 8 ? (((uint8_t*)(a))[i]=v) : (((uint16_t*)(a))[i]=v))
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
288 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
289 * Decode one line of image
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
290 */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
291 static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *last, void *dst, int last2, int w, int stride, int comp, int bits){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
292 int i, x = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
293 int Ra, Rb, Rc, Rd;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
294 int D0, D1, D2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
295
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
296 while(x < w) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
297 int err, pred;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
298
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
299 /* compute gradients */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
300 Ra = x ? R(dst, x - stride) : R(last, x);
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
301 Rb = R(last, x);
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
302 Rc = x ? R(last, x - stride) : last2;
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
303 Rd = (x >= w - stride) ? R(last, x) : R(last, x + stride);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
304 D0 = Rd - Rb;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
305 D1 = Rb - Rc;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
306 D2 = Rc - Ra;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
307 /* run mode */
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
308 if((FFABS(D0) <= state->near) && (FFABS(D1) <= state->near) && (FFABS(D2) <= state->near)) {
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
309 int r;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
310 int RItype;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
311
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
312 /* decode full runs while available */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
313 while(get_bits1(&s->gb)) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
314 int r;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
315 r = 1 << log2_run[state->run_index[comp]];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
316 if(x + r * stride > w) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
317 r = (w - x) / stride;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
318 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
319 for(i = 0; i < r; i++) {
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
320 W(dst, x, Ra);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
321 x += stride;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
322 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
323 /* if EOL reached, we stop decoding */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
324 if(r != (1 << log2_run[state->run_index[comp]]))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
325 return;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
326 if(state->run_index[comp] < 31)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
327 state->run_index[comp]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
328 if(x + stride > w)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
329 return;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
330 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
331 /* decode aborted run */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
332 r = log2_run[state->run_index[comp]];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
333 if(r)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
334 r = get_bits_long(&s->gb, r);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
335 for(i = 0; i < r; i++) {
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
336 W(dst, x, Ra);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
337 x += stride;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
338 }
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
339
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
340 /* decode run termination value */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
341 Rb = R(last, x);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
342 RItype = (FFABS(Ra - Rb) <= state->near) ? 1 : 0;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
343 err = ls_get_code_runterm(&s->gb, state, RItype, log2_run[state->run_index[comp]]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
344 if(state->run_index[comp])
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
345 state->run_index[comp]--;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
346
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
347 if(state->near && RItype){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
348 pred = Ra + err;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
349 } else {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
350 if(Rb < Ra)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
351 pred = Rb - err;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
352 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
353 pred = Rb + err;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
354 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
355 } else { /* regular mode */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
356 int context, sign;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
357
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
358 context = quantize(state, D0) * 81 + quantize(state, D1) * 9 + quantize(state, D2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
359 pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
360
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
361 if(context < 0){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
362 context = -context;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
363 sign = 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
364 }else{
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
365 sign = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
366 }
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
367
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
368 if(sign){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
369 pred = clip(pred - state->C[context], 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
370 err = -ls_get_code_regular(&s->gb, state, context);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
371 } else {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
372 pred = clip(pred + state->C[context], 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
373 err = ls_get_code_regular(&s->gb, state, context);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
374 }
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
375
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
376 /* we have to do something more for near-lossless coding */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
377 pred += err;
4072
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
378 }
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
379 if(state->near){
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
380 if(pred < -state->near)
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
381 pred += state->range * state->twonear;
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
382 else if(pred > state->maxval + state->near)
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
383 pred -= state->range * state->twonear;
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
384 pred = clip(pred, 0, state->maxval);
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
385 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
386
4147
c8fa103d8c75 Limit output sample to 0..maxval, fixes decoding of T16E0.JLS
kostya
parents: 4077
diff changeset
387 pred &= state->maxval;
4072
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
388 W(dst, x, pred);
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
389 x += stride;
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
390 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
391 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
392
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
393 static int ls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
394 int i, t = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
395 uint8_t *zero, *last, *cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
396 JLSState *state;
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
397 int off = 0, stride = 1, width, shift;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
398
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
399 zero = av_mallocz(s->picture.linesize[0]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
400 last = zero;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
401 cur = s->picture.data[0];
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
402
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
403 state = av_mallocz(sizeof(JLSState));
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
404 /* initialize JPEG-LS state from JPEG parameters */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
405 state->near = near;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
406 state->bpp = (s->bits < 2) ? 2 : s->bits;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
407 state->maxval = s->maxval;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
408 state->T1 = s->t1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
409 state->T2 = s->t2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
410 state->T3 = s->t3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
411 state->reset = s->reset;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
412 reset_ls_coding_parameters(state, 0);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
413 ls_init_state(state);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
414
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
415 if(s->bits <= 8)
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
416 shift = point_transform + (8 - s->bits);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
417 else
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
418 shift = point_transform + (16 - s->bits);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
419
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
420 // av_log(s->avctx, AV_LOG_DEBUG, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",s->width,s->height,state->near,state->maxval,state->T1,state->T2,state->T3,state->reset,state->limit,state->qbpp, state->range);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
421 // av_log(s->avctx, AV_LOG_DEBUG, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n", ilv, point_transform, s->bits, s->cur_scan);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
422 if(ilv == 0) { /* separate planes */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
423 off = s->cur_scan - 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
424 stride = (s->nb_components > 1) ? 3 : 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
425 width = s->width * stride;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
426 cur += off;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
427 for(i = 0; i < s->height; i++) {
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
428 if(s->bits <= 8){
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
429 ls_decode_line(state, s, last, cur, t, width, stride, off, 8);
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
430 t = last[0];
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
431 }else{
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
432 ls_decode_line(state, s, last, cur, t, width, stride, off, 16);
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
433 t = *((uint16_t*)last);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
434 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
435 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
436 cur += s->picture.linesize[0];
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
437
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
438 if (s->restart_interval && !--s->restart_count) {
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
439 align_get_bits(&s->gb);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
440 skip_bits(&s->gb, 16); /* skip RSTn */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
441 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
442 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
443 } else if(ilv == 1) { /* line interleaving */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
444 int j;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
445 int Rc[3] = {0, 0, 0};
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
446 memset(cur, 0, s->picture.linesize[0]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
447 width = s->width * 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
448 for(i = 0; i < s->height; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
449 for(j = 0; j < 3; j++) {
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
450 ls_decode_line(state, s, last + j, cur + j, Rc[j], width, 3, j, 8);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
451 Rc[j] = last[j];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
452
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
453 if (s->restart_interval && !--s->restart_count) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
454 align_get_bits(&s->gb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
455 skip_bits(&s->gb, 16); /* skip RSTn */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
456 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
457 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
458 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
459 cur += s->picture.linesize[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
460 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
461 } else if(ilv == 2) { /* sample interleaving */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
462 av_log(s->avctx, AV_LOG_ERROR, "Sample interleaved images are not supported.\n");
3773
7364a7e00e86 free memory before return
kostya
parents: 3079
diff changeset
463 av_free(state);
7364a7e00e86 free memory before return
kostya
parents: 3079
diff changeset
464 av_free(zero);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
465 return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
466 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
467
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
468 if(shift){ /* we need to do point transform or normalize samples */
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
469 int x, w;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
470
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
471 w = s->width * s->nb_components;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
472
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
473 if(s->bits <= 8){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
474 uint8_t *src = s->picture.data[0];
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
475
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
476 for(i = 0; i < s->height; i++){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
477 for(x = off; x < w; x+= stride){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
478 src[x] <<= shift;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
479 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
480 src += s->picture.linesize[0];
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
481 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
482 }else{
4522
895b076101a8 Fix one warning
mbardiaux
parents: 4297
diff changeset
483 uint16_t *src = (uint16_t*) s->picture.data[0];
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
484
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
485 for(i = 0; i < s->height; i++){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
486 for(x = 0; x < w; x++){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
487 src[x] <<= shift;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
488 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
489 src += s->picture.linesize[0]/2;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
490 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
491 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
492 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
493 av_free(state);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
494 av_free(zero);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
495
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
496 return 0;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
497 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
498
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
499 #if defined(CONFIG_ENCODERS) && defined(CONFIG_JPEGLS_ENCODER)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
500 /********** Encoder-specific functions **********/
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
501
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
502 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
503 * Encode error from regular symbol
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
504 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
505 static inline void ls_encode_regular(JLSState *state, PutBitContext *pb, int Q, int err){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
506 int k;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
507 int val;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
508 int map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
509
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
510 for(k = 0; (state->N[Q] << k) < state->A[Q]; k++);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
511
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
512 map = !state->near && !k && (2 * state->B[Q] <= -state->N[Q]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
513
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
514 if(err < 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
515 err += state->range;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
516 if(err >= ((state->range + 1) >> 1)) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
517 err -= state->range;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
518 val = 2 * FFABS(err) - 1 - map;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
519 } else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
520 val = 2 * err + map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
521
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
522 set_ur_golomb_jpegls(pb, val, k, state->limit, state->qbpp);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
523
4074
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
524 update_state_regular(state, Q, err);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
525 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
526
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
527 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
528 * Encode error from run termination
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
529 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
530 static inline void ls_encode_runterm(JLSState *state, PutBitContext *pb, int RItype, int err, int limit_add){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
531 int k;
4076
aeb514c163ad reverse my last change, it was wrong and broken
michael
parents: 4075
diff changeset
532 int val, map;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
533 int Q = 365 + RItype;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
534 int temp;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
535
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
536 temp = state->A[Q];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
537 if(RItype)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
538 temp += state->N[Q] >> 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
539 for(k = 0; (state->N[Q] << k) < temp; k++);
4076
aeb514c163ad reverse my last change, it was wrong and broken
michael
parents: 4075
diff changeset
540 map = 0;
aeb514c163ad reverse my last change, it was wrong and broken
michael
parents: 4075
diff changeset
541 if(!k && err && (2 * state->B[Q] < state->N[Q]))
aeb514c163ad reverse my last change, it was wrong and broken
michael
parents: 4075
diff changeset
542 map = 1;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
543
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
544 if(err < 0)
4076
aeb514c163ad reverse my last change, it was wrong and broken
michael
parents: 4075
diff changeset
545 val = - (2 * err) - 1 - RItype + map;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
546 else
4076
aeb514c163ad reverse my last change, it was wrong and broken
michael
parents: 4075
diff changeset
547 val = 2 * err - RItype - map;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
548 set_ur_golomb_jpegls(pb, val, k, state->limit - limit_add - 1, state->qbpp);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
549
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
550 if(err < 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
551 state->B[Q]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
552 state->A[Q] += (val + 1 - RItype) >> 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
553
4074
861a55e86ef0 factorize update state out
michael
parents: 4073
diff changeset
554 downscale_state(state, Q);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
555 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
556
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
557 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
558 * Encode run value as specified by JPEG-LS standard
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
559 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
560 static inline void ls_encode_run(JLSState *state, PutBitContext *pb, int run, int comp, int trail){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
561 while(run >= (1 << log2_run[state->run_index[comp]])){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
562 put_bits(pb, 1, 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
563 run -= 1 << log2_run[state->run_index[comp]];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
564 if(state->run_index[comp] < 31)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
565 state->run_index[comp]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
566 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
567 /* if hit EOL, encode another full run, else encode aborted run */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
568 if(!trail && run) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
569 put_bits(pb, 1, 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
570 }else if(trail){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
571 put_bits(pb, 1, 0);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
572 if(log2_run[state->run_index[comp]])
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
573 put_bits(pb, log2_run[state->run_index[comp]], run);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
574 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
575 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
576
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
577 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
578 * Encode one line of image
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
579 */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
580 static inline void ls_encode_line(JLSState *state, PutBitContext *pb, void *last, void *cur, int last2, int w, int stride, int comp, int bits){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
581 int x = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
582 int Ra, Rb, Rc, Rd;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
583 int D0, D1, D2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
584
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
585 while(x < w) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
586 int err, pred, sign;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
587
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
588 /* compute gradients */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
589 Ra = x ? R(cur, x - stride) : R(last, x);
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
590 Rb = R(last, x);
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
591 Rc = x ? R(last, x - stride) : last2;
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
592 Rd = (x >= w - stride) ? R(last, x) : R(last, x + stride);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
593 D0 = Rd - Rb;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
594 D1 = Rb - Rc;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
595 D2 = Rc - Ra;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
596
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
597 /* run mode */
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
598 if((FFABS(D0) <= state->near) && (FFABS(D1) <= state->near) && (FFABS(D2) <= state->near)) {
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
599 int RUNval, RItype, run;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
600
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
601 run = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
602 RUNval = Ra;
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
603 while(x < w && (FFABS(R(cur, x) - RUNval) <= state->near)){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
604 run++;
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
605 W(cur, x, Ra);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
606 x += stride;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
607 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
608 ls_encode_run(state, pb, run, comp, x < w);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
609 if(x >= w)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
610 return;
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
611 Rb = R(last, x);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
612 RItype = (FFABS(Ra - Rb) <= state->near);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
613 pred = RItype ? Ra : Rb;
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
614 err = R(cur, x) - pred;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
615
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
616 if(!RItype && Ra > Rb)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
617 err = -err;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
618
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
619 if(state->near){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
620 if(err > 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
621 err = (state->near + err) / state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
622 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
623 err = -(state->near - err) / state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
624
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
625 if(RItype || (Rb >= Ra))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
626 Ra = clip(pred + err * state->twonear, 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
627 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
628 Ra = clip(pred - err * state->twonear, 0, state->maxval);
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
629 W(cur, x, Ra);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
630 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
631 if(err < 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
632 err += state->range;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
633 if(err >= ((state->range + 1) >> 1))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
634 err -= state->range;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
635
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
636 ls_encode_runterm(state, pb, RItype, err, log2_run[state->run_index[comp]]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
637
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
638 if(state->run_index[comp] > 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
639 state->run_index[comp]--;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
640 } else { /* regular mode */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
641 int context;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
642
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
643 context = quantize(state, D0) * 81 + quantize(state, D1) * 9 + quantize(state, D2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
644 pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
645
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
646 if(context < 0){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
647 context = -context;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
648 sign = 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
649 pred = clip(pred - state->C[context], 0, state->maxval);
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
650 err = pred - R(cur, x);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
651 }else{
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
652 sign = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
653 pred = clip(pred + state->C[context], 0, state->maxval);
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
654 err = R(cur, x) - pred;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
655 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
656
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
657 if(state->near){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
658 if(err > 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
659 err = (state->near + err) / state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
660 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
661 err = -(state->near - err) / state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
662 if(!sign)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
663 Ra = clip(pred + err * state->twonear, 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
664 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
665 Ra = clip(pred - err * state->twonear, 0, state->maxval);
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
666 W(cur, x, Ra);
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
667 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
668
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
669 ls_encode_regular(state, pb, context, err);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
670 }
4072
db5d1a289b56 common subexpression elimination
michael
parents: 4071
diff changeset
671 x += stride;
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
672 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
673 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
674
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
675 static void ls_store_lse(JLSState *state, PutBitContext *pb){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
676 /* Test if we have default params and don't need to store LSE */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
677 JLSState state2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
678 memset(&state2, 0, sizeof(JLSState));
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
679 state2.bpp = state->bpp;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
680 state2.near = state->near;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
681 reset_ls_coding_parameters(&state2, 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
682 if(state->T1 == state2.T1 && state->T2 == state2.T2 && state->T3 == state2.T3 && state->reset == state2.reset)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
683 return;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
684 /* store LSE type 1 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
685 put_marker(pb, LSE);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
686 put_bits(pb, 16, 13);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
687 put_bits(pb, 8, 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
688 put_bits(pb, 16, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
689 put_bits(pb, 16, state->T1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
690 put_bits(pb, 16, state->T2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
691 put_bits(pb, 16, state->T3);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
692 put_bits(pb, 16, state->reset);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
693 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
694
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
695 static int encode_picture_ls(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
696 JpeglsContext * const s = avctx->priv_data;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
697 AVFrame *pict = data;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
698 AVFrame * const p= (AVFrame*)&s->picture;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
699 const int near = avctx->prediction_method;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
700 PutBitContext pb, pb2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
701 GetBitContext gb;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
702 uint8_t *buf2, *zero, *cur, *last;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
703 JLSState *state;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
704 int i, size;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
705 int comps;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
706
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
707 buf2 = av_malloc(buf_size);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
708
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
709 init_put_bits(&pb, buf, buf_size);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
710 init_put_bits(&pb2, buf2, buf_size);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
711
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
712 *p = *pict;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
713 p->pict_type= FF_I_TYPE;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
714 p->key_frame= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
715
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
716 if(avctx->pix_fmt == PIX_FMT_GRAY8 || avctx->pix_fmt == PIX_FMT_GRAY16)
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
717 comps = 1;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
718 else
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
719 comps = 3;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
720
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
721 /* write our own JPEG header, can't use mjpeg_picture_header */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
722 put_marker(&pb, SOI);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
723 put_marker(&pb, SOF48);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
724 put_bits(&pb, 16, 8 + comps * 3); // header size depends on components
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
725 put_bits(&pb, 8, (avctx->pix_fmt == PIX_FMT_GRAY16) ? 16 : 8); // bpp
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
726 put_bits(&pb, 16, avctx->height);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
727 put_bits(&pb, 16, avctx->width);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
728 put_bits(&pb, 8, comps); // components
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
729 for(i = 1; i <= comps; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
730 put_bits(&pb, 8, i); // component ID
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
731 put_bits(&pb, 8, 0x11); // subsampling: none
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
732 put_bits(&pb, 8, 0); // Tiq, used by JPEG-LS ext
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
733 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
734
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
735 put_marker(&pb, SOS);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
736 put_bits(&pb, 16, 6 + comps * 2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
737 put_bits(&pb, 8, comps);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
738 for(i = 1; i <= comps; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
739 put_bits(&pb, 8, i); // component ID
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
740 put_bits(&pb, 8, 0); // mapping index: none
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
741 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
742 put_bits(&pb, 8, near);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
743 put_bits(&pb, 8, (comps > 1) ? 1 : 0); // interleaving: 0 - plane, 1 - line
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
744 put_bits(&pb, 8, 0); // point transform: none
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
745
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
746 state = av_mallocz(sizeof(JLSState));
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
747 /* initialize JPEG-LS state from JPEG parameters */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
748 state->near = near;
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
749 state->bpp = (avctx->pix_fmt == PIX_FMT_GRAY16) ? 16 : 8;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
750 reset_ls_coding_parameters(state, 0);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
751 ls_init_state(state);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
752
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
753 ls_store_lse(state, &pb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
754
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
755 zero = av_mallocz(p->linesize[0]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
756 last = zero;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
757 cur = p->data[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
758 if(avctx->pix_fmt == PIX_FMT_GRAY8){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
759 int t = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
760
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
761 for(i = 0; i < avctx->height; i++) {
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
762 ls_encode_line(state, &pb2, last, cur, t, avctx->width, 1, 0, 8);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
763 t = last[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
764 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
765 cur += p->linesize[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
766 }
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
767 }else if(avctx->pix_fmt == PIX_FMT_GRAY16){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
768 int t = 0;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
769
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
770 for(i = 0; i < avctx->height; i++) {
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
771 ls_encode_line(state, &pb2, last, cur, t, avctx->width, 1, 0, 16);
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
772 t = *((uint16_t*)last);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
773 last = cur;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
774 cur += p->linesize[0];
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
775 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
776 }else if(avctx->pix_fmt == PIX_FMT_RGB24){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
777 int j, width;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
778 int Rc[3] = {0, 0, 0};
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
779
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
780 width = avctx->width * 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
781 for(i = 0; i < avctx->height; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
782 for(j = 0; j < 3; j++) {
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
783 ls_encode_line(state, &pb2, last + j, cur + j, Rc[j], width, 3, j, 8);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
784 Rc[j] = last[j];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
785 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
786 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
787 cur += s->picture.linesize[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
788 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
789 }else if(avctx->pix_fmt == PIX_FMT_BGR24){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
790 int j, width;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
791 int Rc[3] = {0, 0, 0};
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
792
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
793 width = avctx->width * 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
794 for(i = 0; i < avctx->height; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
795 for(j = 2; j >= 0; j--) {
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
796 ls_encode_line(state, &pb2, last + j, cur + j, Rc[j], width, 3, j, 8);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
797 Rc[j] = last[j];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
798 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
799 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
800 cur += s->picture.linesize[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
801 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
802 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
803
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
804 av_free(zero);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
805 av_free(state);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
806
4297
c5f74ebdba34 Fix JPEG-LS encoder 0xff-escaping writing too much or uninitialized data.
reimar
parents: 4147
diff changeset
807 // the specification says that after doing 0xff escaping unused bits in the
c5f74ebdba34 Fix JPEG-LS encoder 0xff-escaping writing too much or uninitialized data.
reimar
parents: 4147
diff changeset
808 // last byte must be set to 0, so just append 7 "optional" zero-bits to
c5f74ebdba34 Fix JPEG-LS encoder 0xff-escaping writing too much or uninitialized data.
reimar
parents: 4147
diff changeset
809 // avoid special-casing.
c5f74ebdba34 Fix JPEG-LS encoder 0xff-escaping writing too much or uninitialized data.
reimar
parents: 4147
diff changeset
810 put_bits(&pb2, 7, 0);
c5f74ebdba34 Fix JPEG-LS encoder 0xff-escaping writing too much or uninitialized data.
reimar
parents: 4147
diff changeset
811 size = put_bits_count(&pb2);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
812 flush_put_bits(&pb2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
813 /* do escape coding */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
814 init_get_bits(&gb, buf2, size);
4297
c5f74ebdba34 Fix JPEG-LS encoder 0xff-escaping writing too much or uninitialized data.
reimar
parents: 4147
diff changeset
815 size -= 7;
c5f74ebdba34 Fix JPEG-LS encoder 0xff-escaping writing too much or uninitialized data.
reimar
parents: 4147
diff changeset
816 while(get_bits_count(&gb) < size){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
817 int v;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
818 v = get_bits(&gb, 8);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
819 put_bits(&pb, 8, v);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
820 if(v == 0xFF){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
821 v = get_bits(&gb, 7);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
822 put_bits(&pb, 8, v);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
823 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
824 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
825 align_put_bits(&pb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
826 av_free(buf2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
827
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
828 /* End of image */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
829 put_marker(&pb, EOI);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
830 flush_put_bits(&pb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
831
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
832 emms_c();
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
833
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
834 return put_bits_count(&pb) >> 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
835 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
836
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
837 static int encode_init_ls(AVCodecContext *ctx) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
838 JpeglsContext *c = (JpeglsContext*)ctx->priv_data;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
839
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
840 c->avctx = ctx;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
841 ctx->coded_frame = &c->picture;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
842
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
843 if(ctx->pix_fmt != PIX_FMT_GRAY8 && ctx->pix_fmt != PIX_FMT_GRAY16 && ctx->pix_fmt != PIX_FMT_RGB24 && ctx->pix_fmt != PIX_FMT_BGR24){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
844 av_log(ctx, AV_LOG_ERROR, "Only grayscale and RGB24/BGR24 images are supported\n");
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
845 return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
846 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
847 return 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
848 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
849
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
850 AVCodec jpegls_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
851 "jpegls",
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
852 CODEC_TYPE_VIDEO,
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
853 CODEC_ID_JPEGLS,
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
854 sizeof(JpeglsContext),
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
855 encode_init_ls,
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
856 encode_picture_ls,
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
857 NULL,
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
858 .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, PIX_FMT_GRAY16, -1},
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
859 };
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
860 #endif