annotate rangecoder.c @ 10311:943b63f364ca libavcodec

Make sure all the bits are written to output in fax data decoder. This fixes decoding TIFF images with fax compression and width being not multiple of eight (and issue 1429).
author kostya
date Tue, 29 Sep 2009 05:55:14 +0000
parents 2313bf51945b
children 7dd2a45249a9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2334
25448d0bc924 range coder
michael
parents:
diff changeset
1 /*
25448d0bc924 range coder
michael
parents:
diff changeset
2 * Range coder
25448d0bc924 range coder
michael
parents:
diff changeset
3 * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
25448d0bc924 range coder
michael
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3184
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3184
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3184
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
2334
25448d0bc924 range coder
michael
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
25448d0bc924 range coder
michael
parents:
diff changeset
9 * 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: 3184
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
2334
25448d0bc924 range coder
michael
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3184
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
2334
25448d0bc924 range coder
michael
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25448d0bc924 range coder
michael
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25448d0bc924 range coder
michael
parents:
diff changeset
15 * Lesser General Public License for more details.
25448d0bc924 range coder
michael
parents:
diff changeset
16 *
25448d0bc924 range coder
michael
parents:
diff changeset
17 * 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: 3184
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2967
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2334
25448d0bc924 range coder
michael
parents:
diff changeset
20 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
21
2334
25448d0bc924 range coder
michael
parents:
diff changeset
22 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 6169
diff changeset
23 * @file libavcodec/rangecoder.c
2334
25448d0bc924 range coder
michael
parents:
diff changeset
24 * Range coder.
25448d0bc924 range coder
michael
parents:
diff changeset
25 * based upon
25448d0bc924 range coder
michael
parents:
diff changeset
26 * "Range encoding: an algorithm for removing redundancy from a digitised
25448d0bc924 range coder
michael
parents:
diff changeset
27 * message.
25448d0bc924 range coder
michael
parents:
diff changeset
28 * G. N. N. Martin Presented in March 1979 to the Video &
25448d0bc924 range coder
michael
parents:
diff changeset
29 * Data Recording Conference,
25448d0bc924 range coder
michael
parents:
diff changeset
30 * IBM UK Scientific Center held in Southampton July 24-27 1979."
25448d0bc924 range coder
michael
parents:
diff changeset
31 *
25448d0bc924 range coder
michael
parents:
diff changeset
32 */
25448d0bc924 range coder
michael
parents:
diff changeset
33
25448d0bc924 range coder
michael
parents:
diff changeset
34 #include <string.h>
25448d0bc924 range coder
michael
parents:
diff changeset
35
25448d0bc924 range coder
michael
parents:
diff changeset
36 #include "avcodec.h"
25448d0bc924 range coder
michael
parents:
diff changeset
37 #include "rangecoder.h"
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4962
diff changeset
38 #include "bytestream.h"
2334
25448d0bc924 range coder
michael
parents:
diff changeset
39
25448d0bc924 range coder
michael
parents:
diff changeset
40
25448d0bc924 range coder
michael
parents:
diff changeset
41 void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
42 c->bytestream_start=
2334
25448d0bc924 range coder
michael
parents:
diff changeset
43 c->bytestream= buf;
25448d0bc924 range coder
michael
parents:
diff changeset
44 c->bytestream_end= buf + buf_size;
25448d0bc924 range coder
michael
parents:
diff changeset
45
25448d0bc924 range coder
michael
parents:
diff changeset
46 c->low= 0;
25448d0bc924 range coder
michael
parents:
diff changeset
47 c->range= 0xFF00;
25448d0bc924 range coder
michael
parents:
diff changeset
48 c->outstanding_count= 0;
25448d0bc924 range coder
michael
parents:
diff changeset
49 c->outstanding_byte= -1;
25448d0bc924 range coder
michael
parents:
diff changeset
50 }
25448d0bc924 range coder
michael
parents:
diff changeset
51
25448d0bc924 range coder
michael
parents:
diff changeset
52 void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){
2864
95bac7109ff0 Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 2522
diff changeset
53 /* cast to avoid compiler warning */
95bac7109ff0 Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 2522
diff changeset
54 ff_init_range_encoder(c, (uint8_t *) buf, buf_size);
2334
25448d0bc924 range coder
michael
parents:
diff changeset
55
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 4962
diff changeset
56 c->low = bytestream_get_be16(&c->bytestream);
2334
25448d0bc924 range coder
michael
parents:
diff changeset
57 }
25448d0bc924 range coder
michael
parents:
diff changeset
58
25448d0bc924 range coder
michael
parents:
diff changeset
59 void ff_build_rac_states(RangeCoder *c, int factor, int max_p){
25448d0bc924 range coder
michael
parents:
diff changeset
60 const int64_t one= 1LL<<32;
25448d0bc924 range coder
michael
parents:
diff changeset
61 int64_t p;
2522
e25782262d7d kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2334
diff changeset
62 int last_p8, p8, i;
2334
25448d0bc924 range coder
michael
parents:
diff changeset
63
25448d0bc924 range coder
michael
parents:
diff changeset
64 memset(c->zero_state, 0, sizeof(c->zero_state));
25448d0bc924 range coder
michael
parents:
diff changeset
65 memset(c-> one_state, 0, sizeof(c-> one_state));
25448d0bc924 range coder
michael
parents:
diff changeset
66
25448d0bc924 range coder
michael
parents:
diff changeset
67 last_p8= 0;
25448d0bc924 range coder
michael
parents:
diff changeset
68 p= one/2;
25448d0bc924 range coder
michael
parents:
diff changeset
69 for(i=0; i<128; i++){
25448d0bc924 range coder
michael
parents:
diff changeset
70 p8= (256*p + one/2) >> 32; //FIXME try without the one
25448d0bc924 range coder
michael
parents:
diff changeset
71 if(p8 <= last_p8) p8= last_p8+1;
25448d0bc924 range coder
michael
parents:
diff changeset
72 if(last_p8 && last_p8<256 && p8<=max_p)
25448d0bc924 range coder
michael
parents:
diff changeset
73 c->one_state[last_p8]= p8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
74
2334
25448d0bc924 range coder
michael
parents:
diff changeset
75 p+= ((one-p)*factor + one/2) >> 32;
25448d0bc924 range coder
michael
parents:
diff changeset
76 last_p8= p8;
25448d0bc924 range coder
michael
parents:
diff changeset
77 }
4410
b1314834b3a7 cosmetics / remove #if 0 code
michael
parents: 3947
diff changeset
78
2334
25448d0bc924 range coder
michael
parents:
diff changeset
79 for(i=256-max_p; i<=max_p; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
80 if(c->one_state[i])
2334
25448d0bc924 range coder
michael
parents:
diff changeset
81 continue;
25448d0bc924 range coder
michael
parents:
diff changeset
82
25448d0bc924 range coder
michael
parents:
diff changeset
83 p= (i*one + 128) >> 8;
25448d0bc924 range coder
michael
parents:
diff changeset
84 p+= ((one-p)*factor + one/2) >> 32;
25448d0bc924 range coder
michael
parents:
diff changeset
85 p8= (256*p + one/2) >> 32; //FIXME try without the one
25448d0bc924 range coder
michael
parents:
diff changeset
86 if(p8 <= i) p8= i+1;
25448d0bc924 range coder
michael
parents:
diff changeset
87 if(p8 > max_p) p8= max_p;
25448d0bc924 range coder
michael
parents:
diff changeset
88 c->one_state[ i]= p8;
25448d0bc924 range coder
michael
parents:
diff changeset
89 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
90
3184
68d7896a08e4 fixing out of array access (only cosmetic, this should never have had a end user vissible effect)
michael
parents: 3036
diff changeset
91 for(i=1; i<255; i++)
2334
25448d0bc924 range coder
michael
parents:
diff changeset
92 c->zero_state[i]= 256-c->one_state[256-i];
25448d0bc924 range coder
michael
parents:
diff changeset
93 }
25448d0bc924 range coder
michael
parents:
diff changeset
94
25448d0bc924 range coder
michael
parents:
diff changeset
95 /**
25448d0bc924 range coder
michael
parents:
diff changeset
96 *
25448d0bc924 range coder
michael
parents:
diff changeset
97 * @return the number of bytes written
25448d0bc924 range coder
michael
parents:
diff changeset
98 */
25448d0bc924 range coder
michael
parents:
diff changeset
99 int ff_rac_terminate(RangeCoder *c){
25448d0bc924 range coder
michael
parents:
diff changeset
100 c->range=0xFF;
25448d0bc924 range coder
michael
parents:
diff changeset
101 c->low +=0xFF;
25448d0bc924 range coder
michael
parents:
diff changeset
102 renorm_encoder(c);
25448d0bc924 range coder
michael
parents:
diff changeset
103 c->range=0xFF;
25448d0bc924 range coder
michael
parents:
diff changeset
104 renorm_encoder(c);
25448d0bc924 range coder
michael
parents:
diff changeset
105
25448d0bc924 range coder
michael
parents:
diff changeset
106 assert(c->low == 0);
25448d0bc924 range coder
michael
parents:
diff changeset
107 assert(c->range >= 0x100);
25448d0bc924 range coder
michael
parents:
diff changeset
108
25448d0bc924 range coder
michael
parents:
diff changeset
109 return c->bytestream - c->bytestream_start;
25448d0bc924 range coder
michael
parents:
diff changeset
110 }
25448d0bc924 range coder
michael
parents:
diff changeset
111
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 5934
diff changeset
112 #ifdef TEST
2334
25448d0bc924 range coder
michael
parents:
diff changeset
113 #define SIZE 10240
9199
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 8718
diff changeset
114
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 8718
diff changeset
115 #include "libavutil/lfg.h"
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 8718
diff changeset
116
5934
bd5f4dc81fbe main() --> main(void)
diego
parents: 5215
diff changeset
117 int main(void){
2334
25448d0bc924 range coder
michael
parents:
diff changeset
118 RangeCoder c;
25448d0bc924 range coder
michael
parents:
diff changeset
119 uint8_t b[9*SIZE];
25448d0bc924 range coder
michael
parents:
diff changeset
120 uint8_t r[9*SIZE];
25448d0bc924 range coder
michael
parents:
diff changeset
121 int i;
25448d0bc924 range coder
michael
parents:
diff changeset
122 uint8_t state[10]= {0};
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9199
diff changeset
123 AVLFG prng;
9199
ea0e5e9a520f Replace random() usage in test programs by av_lfg_*().
diego
parents: 8718
diff changeset
124
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9199
diff changeset
125 av_lfg_init(&prng, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
126
2334
25448d0bc924 range coder
michael
parents:
diff changeset
127 ff_init_range_encoder(&c, b, SIZE);
25448d0bc924 range coder
michael
parents:
diff changeset
128 ff_build_rac_states(&c, 0.05*(1LL<<32), 128+64+32+16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
129
2334
25448d0bc924 range coder
michael
parents:
diff changeset
130 memset(state, 128, sizeof(state));
25448d0bc924 range coder
michael
parents:
diff changeset
131
25448d0bc924 range coder
michael
parents:
diff changeset
132 for(i=0; i<SIZE; i++){
9388
2313bf51945b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
diego
parents: 9199
diff changeset
133 r[i] = av_lfg_get(&prng) % 7;
2334
25448d0bc924 range coder
michael
parents:
diff changeset
134 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
135
2334
25448d0bc924 range coder
michael
parents:
diff changeset
136 for(i=0; i<SIZE; i++){
25448d0bc924 range coder
michael
parents:
diff changeset
137 START_TIMER
25448d0bc924 range coder
michael
parents:
diff changeset
138 put_rac(&c, state, r[i]&1);
25448d0bc924 range coder
michael
parents:
diff changeset
139 STOP_TIMER("put_rac")
25448d0bc924 range coder
michael
parents:
diff changeset
140 }
25448d0bc924 range coder
michael
parents:
diff changeset
141
6169
43dd78019c14 Add #undef random and call the right function to fix test program compilation.
diego
parents: 6164
diff changeset
142 ff_rac_terminate(&c);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
143
2334
25448d0bc924 range coder
michael
parents:
diff changeset
144 ff_init_range_decoder(&c, b, SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
145
2334
25448d0bc924 range coder
michael
parents:
diff changeset
146 memset(state, 128, sizeof(state));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
147
2334
25448d0bc924 range coder
michael
parents:
diff changeset
148 for(i=0; i<SIZE; i++){
25448d0bc924 range coder
michael
parents:
diff changeset
149 START_TIMER
25448d0bc924 range coder
michael
parents:
diff changeset
150 if( (r[i]&1) != get_rac(&c, state) )
25448d0bc924 range coder
michael
parents:
diff changeset
151 av_log(NULL, AV_LOG_DEBUG, "rac failure at %d\n", i);
25448d0bc924 range coder
michael
parents:
diff changeset
152 STOP_TIMER("get_rac")
25448d0bc924 range coder
michael
parents:
diff changeset
153 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
154
2334
25448d0bc924 range coder
michael
parents:
diff changeset
155 return 0;
25448d0bc924 range coder
michael
parents:
diff changeset
156 }
6164
ecaf5226e9b0 Consistently use TEST as the preprocessor condition to enable test code.
diego
parents: 5934
diff changeset
157 #endif /* TEST */