annotate jpeg_ls.c @ 4071:00ad06966bff libavcodec

merge 8 and 16bit functions, they are identical except the data type
author michael
date Tue, 24 Oct 2006 08:33:44 +0000
parents 0df780a93aa8
children db5d1a289b56
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++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
80 state->A[i] = (state->range + 32) >> 6;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
81 if(state->A[i] < 2)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
82 state->A[i] = 2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
83 state->N[i] = 1;
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
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 * Calculate quantized gradient value, used for context determination
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
90 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
91 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
92 if(v==0) return 0;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
93 if(v < 0){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
94 if(v <= -s->T3) return -4;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
95 if(v <= -s->T2) return -3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
96 if(v <= -s->T1) return -2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
97 if(v < -s->near) return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
98 return 0;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
99 }else{
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
100 if(v <= s->near) return 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
101 if(v < s->T1) return 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
102 if(v < s->T2) return 2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
103 if(v < s->T3) return 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
104 return 4;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
105 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
106 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
107
3078
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 * 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
110 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
111 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
112 if(v > vmax || v < vmin) return vmin;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
113 else return v;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
114 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
115
3078
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 * Calculate JPEG-LS codec values
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
118 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
119 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
120 const int basic_t1= 3;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
121 const int basic_t2= 7;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
122 const int basic_t3= 21;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
123 int factor;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
124
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
125 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
126
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
127 if(s->maxval >=128){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
128 factor= (FFMIN(s->maxval, 4095) + 128)>>8;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
129
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
130 if(s->T1==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
131 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
132 if(s->T2==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
133 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
134 if(s->T3==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
135 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
136 }else{
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
137 factor= 256 / (s->maxval + 1);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
138
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
139 if(s->T1==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
140 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
141 if(s->T2==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
142 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
143 if(s->T3==0 || reset_all)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
144 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
145 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
146
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
147 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
148 // 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
149 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
150
3078
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 /********** Decoder-specific functions **********/
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
153
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
154 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
155 * Decode LSE block with initialization parameters
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
156 */
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
157 static int decode_lse(MJpegDecodeContext *s)
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 int len, id;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
160
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
161 /* XXX: verify len field validity */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
162 len = get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
163 id = get_bits(&s->gb, 8);
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
164
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
165 switch(id){
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
166 case 1:
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
167 s->maxval= get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
168 s->t1= get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
169 s->t2= get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
170 s->t3= get_bits(&s->gb, 16);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
171 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
172
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
173 // reset_ls_coding_parameters(s, 0);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
174 //FIXME quant table?
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
175 break;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
176 case 2:
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
177 case 3:
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
178 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
179 return -1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
180 case 4:
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
181 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
182 return -1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
183 default:
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
184 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
185 return -1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
186 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
187 // 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
188
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
189 return 0;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
190 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
191
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
192
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
193 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
194 * 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
195 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
196 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
197 int k, ret;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
198
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
199 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
200
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
201 #ifdef JLS_BROKEN
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
202 if(!show_bits_long(gb, 32))return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
203 #endif
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
204 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
205
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
206 /* decode mapped error */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
207 if(ret & 1)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
208 ret = -((ret + 1) >> 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
209 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
210 ret >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
211
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
212 /* 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
213 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
214 ret = -(ret + 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
215
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
216 state->A[Q] += FFABS(ret);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
217 ret *= state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
218 state->B[Q] += ret;
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 if(state->N[Q] == state->reset) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
221 state->A[Q] >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
222 state->B[Q] >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
223 state->N[Q] >>= 1;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
224 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
225 state->N[Q]++;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
226
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
227 if(state->B[Q] <= -state->N[Q]) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
228 state->B[Q] += state->N[Q];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
229 if(state->C[Q] > -128)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
230 state->C[Q]--;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
231 if(state->B[Q] <= -state->N[Q])
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
232 state->B[Q] = -state->N[Q] + 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
233 }else if(state->B[Q] > 0){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
234 state->B[Q] -= state->N[Q];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
235 if(state->C[Q] < 127)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
236 state->C[Q]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
237 if(state->B[Q] > 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
238 state->B[Q] = 0;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
239 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
240
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
241 return ret;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
242 }
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 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
245 * 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
246 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
247 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
248 int k, ret, temp, map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
249 int Q = 365 + RItype;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
250
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
251 if(!RItype)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
252 temp = state->A[Q];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
253 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
254 temp = state->A[Q] + (state->N[Q] >> 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
255
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
256 for(k = 0; (state->N[Q] << k) < temp; k++);
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 #ifdef JLS_BROKEN
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
259 if(!show_bits_long(gb, 32))return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
260 #endif
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
261 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
262
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
263 /* decode mapped error */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
264 map = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
265 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
266 map = 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
267 ret += RItype + map;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
268
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
269 if(ret & 1){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
270 ret = map - ((ret + 1) >> 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
271 state->B[Q]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
272 } else {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
273 ret = ret >> 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
274 }
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
275
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
276 /* update state */
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
277 state->A[Q] += FFABS(ret) - RItype;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
278 ret *= state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
279 if(state->N[Q] == state->reset){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
280 state->A[Q] >>=1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
281 state->B[Q] >>=1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
282 state->N[Q] >>=1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
283 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
284 state->N[Q]++;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
285
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
286 return ret;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
287 }
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
288
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
289 #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
290 #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
291 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
292 * Decode one line of image
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
293 */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
294 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
295 int i, x = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
296 int Ra, Rb, Rc, Rd;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
297 int D0, D1, D2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
298
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
299 while(x < w) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
300 int err, pred;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
301
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
302 /* compute gradients */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
303 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
304 Rb = R(last, x);
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
305 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
306 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
307 D0 = Rd - Rb;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
308 D1 = Rb - Rc;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
309 D2 = Rc - Ra;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
310 /* run mode */
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
311 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
312 int r;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
313 int RItype;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
314
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
315 /* decode full runs while available */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
316 while(get_bits1(&s->gb)) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
317 int r;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
318 r = 1 << log2_run[state->run_index[comp]];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
319 if(x + r * stride > w) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
320 r = (w - x) / stride;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
321 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
322 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
323 W(dst, x, Ra);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
324 x += stride;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
325 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
326 /* if EOL reached, we stop decoding */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
327 if(r != (1 << log2_run[state->run_index[comp]]))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
328 return;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
329 if(state->run_index[comp] < 31)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
330 state->run_index[comp]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
331 if(x + stride > w)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
332 return;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
333 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
334 /* decode aborted run */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
335 r = log2_run[state->run_index[comp]];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
336 if(r)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
337 r = get_bits_long(&s->gb, r);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
338 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
339 W(dst, x, Ra);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
340 x += stride;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
341 }
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
342
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
343 /* decode run termination value */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
344 Rb = R(last, x);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
345 RItype = (FFABS(Ra - Rb) <= state->near) ? 1 : 0;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
346 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
347 if(state->run_index[comp])
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
348 state->run_index[comp]--;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
349
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
350 if(state->near && RItype){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
351 pred = Ra + 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 if(Rb < Ra)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
354 pred = Rb - err;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
355 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
356 pred = Rb + err;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
357 }
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
358
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
359 if(state->near){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
360 if(pred < -state->near)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
361 pred += state->range * state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
362 else if(pred > state->maxval + state->near)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
363 pred -= state->range * state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
364 pred = clip(pred, 0, state->maxval);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
365 }
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
366
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
367 W(dst, x, pred);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
368 x += stride;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
369 } else { /* regular mode */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
370 int context, sign;
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
371
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
372 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
373 pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
374
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
375 if(context < 0){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
376 context = -context;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
377 sign = 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
378 }else{
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
379 sign = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
380 }
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
381
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
382 if(sign){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
383 pred = clip(pred - state->C[context], 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
384 err = -ls_get_code_regular(&s->gb, state, context);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
385 } else {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
386 pred = clip(pred + state->C[context], 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
387 err = ls_get_code_regular(&s->gb, state, context);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
388 }
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
389
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
390 /* 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
391 pred += err;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
392 if(state->near) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
393 if(pred < -state->near)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
394 pred += state->range * state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
395 else if(pred > state->maxval + state->near)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
396 pred -= state->range * state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
397 pred = clip(pred, 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
398 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
399
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
400 W(dst, x, pred);
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
401 x += stride;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
402 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
403 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
404 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
405
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
406 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
407 int i, t = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
408 uint8_t *zero, *last, *cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
409 JLSState *state;
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
410 int off = 0, stride = 1, width, shift;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
411
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
412 zero = av_mallocz(s->picture.linesize[0]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
413 last = zero;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
414 cur = s->picture.data[0];
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
415
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
416 state = av_mallocz(sizeof(JLSState));
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
417 /* initialize JPEG-LS state from JPEG parameters */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
418 state->near = near;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
419 state->bpp = (s->bits < 2) ? 2 : s->bits;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
420 state->maxval = s->maxval;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
421 state->T1 = s->t1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
422 state->T2 = s->t2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
423 state->T3 = s->t3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
424 state->reset = s->reset;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
425 reset_ls_coding_parameters(state, 0);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
426 ls_init_state(state);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
427
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
428 if(s->bits <= 8)
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
429 shift = point_transform + (8 - s->bits);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
430 else
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
431 shift = point_transform + (16 - s->bits);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
432
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
433 // 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
434 // 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
435 if(ilv == 0) { /* separate planes */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
436 off = s->cur_scan - 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
437 stride = (s->nb_components > 1) ? 3 : 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
438 width = s->width * stride;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
439 cur += off;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
440 for(i = 0; i < s->height; i++) {
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
441 if(s->bits <= 8){
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
442 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
443 t = last[0];
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
444 }else{
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
445 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
446 t = *((uint16_t*)last);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
447 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
448 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
449 cur += s->picture.linesize[0];
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3036
diff changeset
450
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
451 if (s->restart_interval && !--s->restart_count) {
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
452 align_get_bits(&s->gb);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
453 skip_bits(&s->gb, 16); /* skip RSTn */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
454 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
455 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
456 } else if(ilv == 1) { /* line interleaving */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
457 int j;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
458 int Rc[3] = {0, 0, 0};
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
459 memset(cur, 0, s->picture.linesize[0]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
460 width = s->width * 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
461 for(i = 0; i < s->height; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
462 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
463 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
464 Rc[j] = last[j];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
465
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
466 if (s->restart_interval && !--s->restart_count) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
467 align_get_bits(&s->gb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
468 skip_bits(&s->gb, 16); /* skip RSTn */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
469 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
470 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
471 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
472 cur += s->picture.linesize[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
473 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
474 } else if(ilv == 2) { /* sample interleaving */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
475 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
476 av_free(state);
7364a7e00e86 free memory before return
kostya
parents: 3079
diff changeset
477 av_free(zero);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
478 return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
479 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
480
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
481 if(shift){ /* we need to do point transform or normalize samples */
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
482 int x, w;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
483
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
484 w = s->width * s->nb_components;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
485
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
486 if(s->bits <= 8){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
487 uint8_t *src = s->picture.data[0];
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 for(i = 0; i < s->height; i++){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
490 for(x = off; x < w; x+= stride){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
491 src[x] <<= shift;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
492 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
493 src += s->picture.linesize[0];
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
494 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
495 }else{
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
496 uint16_t *src = s->picture.data[0];
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
497
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
498 for(i = 0; i < s->height; i++){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
499 for(x = 0; x < w; x++){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
500 src[x] <<= shift;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
501 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
502 src += s->picture.linesize[0]/2;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
503 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
504 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
505 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
506 av_free(state);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
507 av_free(zero);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
508
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
509 return 0;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
510 }
3078
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 #if defined(CONFIG_ENCODERS) && defined(CONFIG_JPEGLS_ENCODER)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
513 /********** Encoder-specific functions **********/
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
514
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
515 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
516 * Encode error from regular symbol
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
517 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
518 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
519 int k;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
520 int val;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
521 int map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
522
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
523 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
524
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
525 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
526
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
527 if(err < 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
528 err += state->range;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
529 if(err >= ((state->range + 1) >> 1)) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
530 err -= state->range;
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
531 val = 2 * FFABS(err) - 1 - map;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
532 } else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
533 val = 2 * err + map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
534
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
535 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
536
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
537 state->A[Q] += FFABS(err);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
538 state->B[Q] += err * state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
539
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
540 if(state->N[Q] == state->reset) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
541 state->A[Q] >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
542 state->B[Q] >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
543 state->N[Q] >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
544 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
545 state->N[Q]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
546
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
547 if(state->B[Q] <= -state->N[Q]) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
548 state->B[Q] += state->N[Q];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
549 if(state->C[Q] > -128)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
550 state->C[Q]--;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
551 if(state->B[Q] <= -state->N[Q])
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
552 state->B[Q] = -state->N[Q] + 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
553 }else if(state->B[Q] > 0){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
554 state->B[Q] -= state->N[Q];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
555 if(state->C[Q] < 127)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
556 state->C[Q]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
557 if(state->B[Q] > 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
558 state->B[Q] = 0;
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 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
561
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
562 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
563 * Encode error from run termination
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
564 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
565 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
566 int k;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
567 int val, map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
568 int Q = 365 + RItype;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
569 int temp;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
570
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
571 temp = state->A[Q];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
572 if(RItype)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
573 temp += state->N[Q] >> 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
574 for(k = 0; (state->N[Q] << k) < temp; k++);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
575 map = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
576 if(!k && err && (2 * state->B[Q] < state->N[Q]))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
577 map = 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
578
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
579 if(err < 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
580 val = - (2 * err) - 1 - RItype + map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
581 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
582 val = 2 * err - RItype - map;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
583 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
584
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
585 if(err < 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
586 state->B[Q]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
587 state->A[Q] += (val + 1 - RItype) >> 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
588
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
589 if(state->N[Q] == state->reset) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
590 state->A[Q] >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
591 state->B[Q] >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
592 state->N[Q] >>= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
593 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
594 state->N[Q]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
595 }
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 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
598 * Encode run value as specified by JPEG-LS standard
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
599 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
600 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
601 while(run >= (1 << log2_run[state->run_index[comp]])){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
602 put_bits(pb, 1, 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
603 run -= 1 << log2_run[state->run_index[comp]];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
604 if(state->run_index[comp] < 31)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
605 state->run_index[comp]++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
606 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
607 /* 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
608 if(!trail && run) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
609 put_bits(pb, 1, 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
610 }else if(trail){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
611 put_bits(pb, 1, 0);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
612 if(log2_run[state->run_index[comp]])
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
613 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
614 }
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
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
617 /**
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
618 * Encode one line of image
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
619 */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
620 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
621 int x = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
622 int Ra, Rb, Rc, Rd;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
623 int D0, D1, D2;
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 while(x < w) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
626 int err, pred, sign;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
627
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
628 /* compute gradients */
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
629 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
630 Rb = R(last, x);
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
631 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
632 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
633 D0 = Rd - Rb;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
634 D1 = Rb - Rc;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
635 D2 = Rc - Ra;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
636
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
637 /* run mode */
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
638 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
639 int RUNval, RItype, run;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
640
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
641 run = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
642 RUNval = Ra;
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
643 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
644 run++;
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
645 W(cur, x, Ra);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
646 x += stride;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
647 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
648 ls_encode_run(state, pb, run, comp, x < w);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
649 if(x >= w)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
650 return;
4071
00ad06966bff merge 8 and 16bit functions, they are identical except the data type
michael
parents: 4069
diff changeset
651 Rb = R(last, x);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
652 RItype = (FFABS(Ra - Rb) <= state->near);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
653 pred = RItype ? Ra : Rb;
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 if(!RItype && Ra > Rb)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
657 err = -err;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
658
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
659 if(state->near){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
660 if(err > 0)
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 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
663 err = -(state->near - err) / state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
664
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
665 if(RItype || (Rb >= Ra))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
666 Ra = clip(pred + err * state->twonear, 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
667 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
668 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
669 W(cur, x, Ra);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
670 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
671 if(err < 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
672 err += state->range;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
673 if(err >= ((state->range + 1) >> 1))
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
674 err -= state->range;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
675
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
676 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
677
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
678 if(state->run_index[comp] > 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
679 state->run_index[comp]--;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
680 x += stride;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
681 } else { /* regular mode */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
682 int context;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
683
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
684 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
685 pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
686
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
687 if(context < 0){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
688 context = -context;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
689 sign = 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
690 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
691 err = pred - R(cur, x);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
692 }else{
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
693 sign = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
694 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
695 err = R(cur, x) - pred;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
696 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
697
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
698 if(state->near){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
699 if(err > 0)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
700 err = (state->near + err) / state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
701 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
702 err = -(state->near - err) / state->twonear;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
703 if(!sign)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
704 Ra = clip(pred + err * state->twonear, 0, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
705 else
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
706 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
707 W(cur, x, Ra);
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
708 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
709
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
710 ls_encode_regular(state, pb, context, err);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
711 x += stride;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
712 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
713 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
714 }
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
715
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
716 static void ls_store_lse(JLSState *state, PutBitContext *pb){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
717 /* 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
718 JLSState state2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
719 memset(&state2, 0, sizeof(JLSState));
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
720 state2.bpp = state->bpp;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
721 state2.near = state->near;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
722 reset_ls_coding_parameters(&state2, 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
723 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
724 return;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
725 /* store LSE type 1 */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
726 put_marker(pb, LSE);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
727 put_bits(pb, 16, 13);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
728 put_bits(pb, 8, 1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
729 put_bits(pb, 16, state->maxval);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
730 put_bits(pb, 16, state->T1);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
731 put_bits(pb, 16, state->T2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
732 put_bits(pb, 16, state->T3);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
733 put_bits(pb, 16, state->reset);
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
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
736 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
737 JpeglsContext * const s = avctx->priv_data;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
738 AVFrame *pict = data;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
739 AVFrame * const p= (AVFrame*)&s->picture;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
740 const int near = avctx->prediction_method;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
741 PutBitContext pb, pb2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
742 GetBitContext gb;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
743 uint8_t *buf2, *zero, *cur, *last;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
744 JLSState *state;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
745 int i, size;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
746 int comps;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
747
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
748 buf2 = av_malloc(buf_size);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
749
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
750 init_put_bits(&pb, buf, buf_size);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
751 init_put_bits(&pb2, buf2, buf_size);
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 *p = *pict;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
754 p->pict_type= FF_I_TYPE;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
755 p->key_frame= 1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
756
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
757 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
758 comps = 1;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
759 else
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
760 comps = 3;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
761
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
762 /* 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
763 put_marker(&pb, SOI);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
764 put_marker(&pb, SOF48);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
765 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
766 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
767 put_bits(&pb, 16, avctx->height);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
768 put_bits(&pb, 16, avctx->width);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
769 put_bits(&pb, 8, comps); // components
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
770 for(i = 1; i <= comps; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
771 put_bits(&pb, 8, i); // component ID
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
772 put_bits(&pb, 8, 0x11); // subsampling: none
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
773 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
774 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
775
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
776 put_marker(&pb, SOS);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
777 put_bits(&pb, 16, 6 + comps * 2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
778 put_bits(&pb, 8, comps);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
779 for(i = 1; i <= comps; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
780 put_bits(&pb, 8, i); // component ID
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
781 put_bits(&pb, 8, 0); // mapping index: none
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
782 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
783 put_bits(&pb, 8, near);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
784 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
785 put_bits(&pb, 8, 0); // point transform: none
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
786
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
787 state = av_mallocz(sizeof(JLSState));
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
788 /* initialize JPEG-LS state from JPEG parameters */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
789 state->near = near;
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
790 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
791 reset_ls_coding_parameters(state, 0);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
792 ls_init_state(state);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
793
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
794 ls_store_lse(state, &pb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
795
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
796 zero = av_mallocz(p->linesize[0]);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
797 last = zero;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
798 cur = p->data[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
799 if(avctx->pix_fmt == PIX_FMT_GRAY8){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
800 int t = 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 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
803 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
804 t = last[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
805 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
806 cur += p->linesize[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
807 }
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
808 }else if(avctx->pix_fmt == PIX_FMT_GRAY16){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
809 int t = 0;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
810
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
811 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
812 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
813 t = *((uint16_t*)last);
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
814 last = cur;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
815 cur += p->linesize[0];
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
816 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
817 }else if(avctx->pix_fmt == PIX_FMT_RGB24){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
818 int j, width;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
819 int Rc[3] = {0, 0, 0};
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
820
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
821 width = avctx->width * 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
822 for(i = 0; i < avctx->height; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
823 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
824 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
825 Rc[j] = last[j];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
826 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
827 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
828 cur += s->picture.linesize[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
829 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
830 }else if(avctx->pix_fmt == PIX_FMT_BGR24){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
831 int j, width;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
832 int Rc[3] = {0, 0, 0};
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 width = avctx->width * 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
835 for(i = 0; i < avctx->height; i++) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
836 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
837 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
838 Rc[j] = last[j];
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 last = cur;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
841 cur += s->picture.linesize[0];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
842 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
843 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
844
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
845 av_free(zero);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
846 av_free(state);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
847
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
848 flush_put_bits(&pb2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
849 /* do escape coding */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
850 size = put_bits_count(&pb2) >> 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
851 init_get_bits(&gb, buf2, size);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
852 while(get_bits_count(&gb) < size * 8){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
853 int v;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
854 v = get_bits(&gb, 8);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
855 put_bits(&pb, 8, v);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
856 if(v == 0xFF){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
857 v = get_bits(&gb, 7);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
858 put_bits(&pb, 8, v);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
859 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
860 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
861 align_put_bits(&pb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
862 av_free(buf2);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
863
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
864 /* End of image */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
865 put_marker(&pb, EOI);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
866 flush_put_bits(&pb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
867
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
868 emms_c();
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
869
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
870 return put_bits_count(&pb) >> 3;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
871 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
872
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
873 static int encode_init_ls(AVCodecContext *ctx) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
874 JpeglsContext *c = (JpeglsContext*)ctx->priv_data;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
875
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
876 c->avctx = ctx;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
877 ctx->coded_frame = &c->picture;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
878
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
879 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
880 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
881 return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
882 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
883 return 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
884 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
885
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
886 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
887 "jpegls",
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
888 CODEC_TYPE_VIDEO,
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
889 CODEC_ID_JPEGLS,
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
890 sizeof(JpeglsContext),
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
891 encode_init_ls,
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
892 encode_picture_ls,
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3063
diff changeset
893 NULL,
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 4001
diff changeset
894 .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
895 };
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
diff changeset
896 #endif