annotate rangecoder.c @ 4396:8e78248586b0 libavcodec

set last_picture for h.264 too, this significantly improves error concealment quality, i hope it doesnt break anything as last_picture_ptr was always NULL for h.264
author michael
date Wed, 24 Jan 2007 14:20:00 +0000
parents c8c591fe26f8
children b1314834b3a7
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 *
25448d0bc924 range coder
michael
parents:
diff changeset
21 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
22
2334
25448d0bc924 range coder
michael
parents:
diff changeset
23 /**
25448d0bc924 range coder
michael
parents:
diff changeset
24 * @file rangecoder.c
25448d0bc924 range coder
michael
parents:
diff changeset
25 * Range coder.
25448d0bc924 range coder
michael
parents:
diff changeset
26 * based upon
25448d0bc924 range coder
michael
parents:
diff changeset
27 * "Range encoding: an algorithm for removing redundancy from a digitised
25448d0bc924 range coder
michael
parents:
diff changeset
28 * message.
25448d0bc924 range coder
michael
parents:
diff changeset
29 * G. N. N. Martin Presented in March 1979 to the Video &
25448d0bc924 range coder
michael
parents:
diff changeset
30 * Data Recording Conference,
25448d0bc924 range coder
michael
parents:
diff changeset
31 * IBM UK Scientific Center held in Southampton July 24-27 1979."
25448d0bc924 range coder
michael
parents:
diff changeset
32 *
25448d0bc924 range coder
michael
parents:
diff changeset
33 */
25448d0bc924 range coder
michael
parents:
diff changeset
34
25448d0bc924 range coder
michael
parents:
diff changeset
35 #include <string.h>
25448d0bc924 range coder
michael
parents:
diff changeset
36
25448d0bc924 range coder
michael
parents:
diff changeset
37 #include "avcodec.h"
25448d0bc924 range coder
michael
parents:
diff changeset
38 #include "common.h"
25448d0bc924 range coder
michael
parents:
diff changeset
39 #include "rangecoder.h"
25448d0bc924 range coder
michael
parents:
diff changeset
40
25448d0bc924 range coder
michael
parents:
diff changeset
41
25448d0bc924 range coder
michael
parents:
diff changeset
42 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
43 c->bytestream_start=
2334
25448d0bc924 range coder
michael
parents:
diff changeset
44 c->bytestream= buf;
25448d0bc924 range coder
michael
parents:
diff changeset
45 c->bytestream_end= buf + buf_size;
25448d0bc924 range coder
michael
parents:
diff changeset
46
25448d0bc924 range coder
michael
parents:
diff changeset
47 c->low= 0;
25448d0bc924 range coder
michael
parents:
diff changeset
48 c->range= 0xFF00;
25448d0bc924 range coder
michael
parents:
diff changeset
49 c->outstanding_count= 0;
25448d0bc924 range coder
michael
parents:
diff changeset
50 c->outstanding_byte= -1;
25448d0bc924 range coder
michael
parents:
diff changeset
51 }
25448d0bc924 range coder
michael
parents:
diff changeset
52
25448d0bc924 range coder
michael
parents:
diff changeset
53 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
54 /* cast to avoid compiler warning */
95bac7109ff0 Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 2522
diff changeset
55 ff_init_range_encoder(c, (uint8_t *) buf, buf_size);
2334
25448d0bc924 range coder
michael
parents:
diff changeset
56
25448d0bc924 range coder
michael
parents:
diff changeset
57 c->low =(*c->bytestream++)<<8;
25448d0bc924 range coder
michael
parents:
diff changeset
58 c->low+= *c->bytestream++;
25448d0bc924 range coder
michael
parents:
diff changeset
59 }
25448d0bc924 range coder
michael
parents:
diff changeset
60
25448d0bc924 range coder
michael
parents:
diff changeset
61 void ff_build_rac_states(RangeCoder *c, int factor, int max_p){
25448d0bc924 range coder
michael
parents:
diff changeset
62 const int64_t one= 1LL<<32;
25448d0bc924 range coder
michael
parents:
diff changeset
63 int64_t p;
2522
e25782262d7d kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2334
diff changeset
64 int last_p8, p8, i;
2334
25448d0bc924 range coder
michael
parents:
diff changeset
65
25448d0bc924 range coder
michael
parents:
diff changeset
66 memset(c->zero_state, 0, sizeof(c->zero_state));
25448d0bc924 range coder
michael
parents:
diff changeset
67 memset(c-> one_state, 0, sizeof(c-> one_state));
25448d0bc924 range coder
michael
parents:
diff changeset
68
25448d0bc924 range coder
michael
parents:
diff changeset
69 #if 0
25448d0bc924 range coder
michael
parents:
diff changeset
70 for(i=1; i<256; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
71 if(c->one_state[i])
2334
25448d0bc924 range coder
michael
parents:
diff changeset
72 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
73
2334
25448d0bc924 range coder
michael
parents:
diff changeset
74 p= (i*one + 128) >> 8;
25448d0bc924 range coder
michael
parents:
diff changeset
75 last_p8= i;
25448d0bc924 range coder
michael
parents:
diff changeset
76 for(;;){
25448d0bc924 range coder
michael
parents:
diff changeset
77 p+= ((one-p)*factor + one/2) >> 32;
25448d0bc924 range coder
michael
parents:
diff changeset
78 p8= (256*p + one/2) >> 32; //FIXME try without the one
25448d0bc924 range coder
michael
parents:
diff changeset
79 if(p8 <= last_p8) p8= last_p8+1;
25448d0bc924 range coder
michael
parents:
diff changeset
80 if(p8 > max_p) p8= max_p;
25448d0bc924 range coder
michael
parents:
diff changeset
81 if(p8 < last_p8)
25448d0bc924 range coder
michael
parents:
diff changeset
82 break;
25448d0bc924 range coder
michael
parents:
diff changeset
83 c->one_state[last_p8]= p8;
25448d0bc924 range coder
michael
parents:
diff changeset
84 if(p8 == last_p8)
25448d0bc924 range coder
michael
parents:
diff changeset
85 break;
25448d0bc924 range coder
michael
parents:
diff changeset
86 last_p8= p8;
25448d0bc924 range coder
michael
parents:
diff changeset
87 }
25448d0bc924 range coder
michael
parents:
diff changeset
88 }
25448d0bc924 range coder
michael
parents:
diff changeset
89 #endif
25448d0bc924 range coder
michael
parents:
diff changeset
90 #if 1
25448d0bc924 range coder
michael
parents:
diff changeset
91 last_p8= 0;
25448d0bc924 range coder
michael
parents:
diff changeset
92 p= one/2;
25448d0bc924 range coder
michael
parents:
diff changeset
93 for(i=0; i<128; i++){
25448d0bc924 range coder
michael
parents:
diff changeset
94 p8= (256*p + one/2) >> 32; //FIXME try without the one
25448d0bc924 range coder
michael
parents:
diff changeset
95 if(p8 <= last_p8) p8= last_p8+1;
25448d0bc924 range coder
michael
parents:
diff changeset
96 if(last_p8 && last_p8<256 && p8<=max_p)
25448d0bc924 range coder
michael
parents:
diff changeset
97 c->one_state[last_p8]= p8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
98
2334
25448d0bc924 range coder
michael
parents:
diff changeset
99 p+= ((one-p)*factor + one/2) >> 32;
25448d0bc924 range coder
michael
parents:
diff changeset
100 last_p8= p8;
25448d0bc924 range coder
michael
parents:
diff changeset
101 }
25448d0bc924 range coder
michael
parents:
diff changeset
102 #endif
25448d0bc924 range coder
michael
parents:
diff changeset
103 for(i=256-max_p; i<=max_p; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
104 if(c->one_state[i])
2334
25448d0bc924 range coder
michael
parents:
diff changeset
105 continue;
25448d0bc924 range coder
michael
parents:
diff changeset
106
25448d0bc924 range coder
michael
parents:
diff changeset
107 p= (i*one + 128) >> 8;
25448d0bc924 range coder
michael
parents:
diff changeset
108 p+= ((one-p)*factor + one/2) >> 32;
25448d0bc924 range coder
michael
parents:
diff changeset
109 p8= (256*p + one/2) >> 32; //FIXME try without the one
25448d0bc924 range coder
michael
parents:
diff changeset
110 if(p8 <= i) p8= i+1;
25448d0bc924 range coder
michael
parents:
diff changeset
111 if(p8 > max_p) p8= max_p;
25448d0bc924 range coder
michael
parents:
diff changeset
112 c->one_state[ i]= p8;
25448d0bc924 range coder
michael
parents:
diff changeset
113 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
114
3184
68d7896a08e4 fixing out of array access (only cosmetic, this should never have had a end user vissible effect)
michael
parents: 3036
diff changeset
115 for(i=1; i<255; i++)
2334
25448d0bc924 range coder
michael
parents:
diff changeset
116 c->zero_state[i]= 256-c->one_state[256-i];
25448d0bc924 range coder
michael
parents:
diff changeset
117 #if 0
25448d0bc924 range coder
michael
parents:
diff changeset
118 for(i=0; i<256; i++)
25448d0bc924 range coder
michael
parents:
diff changeset
119 av_log(NULL, AV_LOG_DEBUG, "%3d %3d\n", i, c->one_state[i]);
25448d0bc924 range coder
michael
parents:
diff changeset
120 #endif
25448d0bc924 range coder
michael
parents:
diff changeset
121 }
25448d0bc924 range coder
michael
parents:
diff changeset
122
25448d0bc924 range coder
michael
parents:
diff changeset
123 /**
25448d0bc924 range coder
michael
parents:
diff changeset
124 *
25448d0bc924 range coder
michael
parents:
diff changeset
125 * @return the number of bytes written
25448d0bc924 range coder
michael
parents:
diff changeset
126 */
25448d0bc924 range coder
michael
parents:
diff changeset
127 int ff_rac_terminate(RangeCoder *c){
25448d0bc924 range coder
michael
parents:
diff changeset
128 c->range=0xFF;
25448d0bc924 range coder
michael
parents:
diff changeset
129 c->low +=0xFF;
25448d0bc924 range coder
michael
parents:
diff changeset
130 renorm_encoder(c);
25448d0bc924 range coder
michael
parents:
diff changeset
131 c->range=0xFF;
25448d0bc924 range coder
michael
parents:
diff changeset
132 renorm_encoder(c);
25448d0bc924 range coder
michael
parents:
diff changeset
133
25448d0bc924 range coder
michael
parents:
diff changeset
134 assert(c->low == 0);
25448d0bc924 range coder
michael
parents:
diff changeset
135 assert(c->range >= 0x100);
25448d0bc924 range coder
michael
parents:
diff changeset
136
25448d0bc924 range coder
michael
parents:
diff changeset
137 return c->bytestream - c->bytestream_start;
25448d0bc924 range coder
michael
parents:
diff changeset
138 }
25448d0bc924 range coder
michael
parents:
diff changeset
139
25448d0bc924 range coder
michael
parents:
diff changeset
140 #if 0 //selftest
25448d0bc924 range coder
michael
parents:
diff changeset
141 #define SIZE 10240
25448d0bc924 range coder
michael
parents:
diff changeset
142 int main(){
25448d0bc924 range coder
michael
parents:
diff changeset
143 RangeCoder c;
25448d0bc924 range coder
michael
parents:
diff changeset
144 uint8_t b[9*SIZE];
25448d0bc924 range coder
michael
parents:
diff changeset
145 uint8_t r[9*SIZE];
25448d0bc924 range coder
michael
parents:
diff changeset
146 int i;
25448d0bc924 range coder
michael
parents:
diff changeset
147 uint8_t state[10]= {0};
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
148
2334
25448d0bc924 range coder
michael
parents:
diff changeset
149 ff_init_range_encoder(&c, b, SIZE);
25448d0bc924 range coder
michael
parents:
diff changeset
150 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
151
2334
25448d0bc924 range coder
michael
parents:
diff changeset
152 memset(state, 128, sizeof(state));
25448d0bc924 range coder
michael
parents:
diff changeset
153
25448d0bc924 range coder
michael
parents:
diff changeset
154 for(i=0; i<SIZE; i++){
25448d0bc924 range coder
michael
parents:
diff changeset
155 r[i]= random()%7;
25448d0bc924 range coder
michael
parents:
diff changeset
156 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
157
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
158
2334
25448d0bc924 range coder
michael
parents:
diff changeset
159 for(i=0; i<SIZE; i++){
25448d0bc924 range coder
michael
parents:
diff changeset
160 START_TIMER
25448d0bc924 range coder
michael
parents:
diff changeset
161 put_rac(&c, state, r[i]&1);
25448d0bc924 range coder
michael
parents:
diff changeset
162 STOP_TIMER("put_rac")
25448d0bc924 range coder
michael
parents:
diff changeset
163 }
25448d0bc924 range coder
michael
parents:
diff changeset
164
25448d0bc924 range coder
michael
parents:
diff changeset
165 ff_put_rac_terminate(&c);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
166
2334
25448d0bc924 range coder
michael
parents:
diff changeset
167 ff_init_range_decoder(&c, b, SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
168
2334
25448d0bc924 range coder
michael
parents:
diff changeset
169 memset(state, 128, sizeof(state));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
170
2334
25448d0bc924 range coder
michael
parents:
diff changeset
171 for(i=0; i<SIZE; i++){
25448d0bc924 range coder
michael
parents:
diff changeset
172 START_TIMER
25448d0bc924 range coder
michael
parents:
diff changeset
173 if( (r[i]&1) != get_rac(&c, state) )
25448d0bc924 range coder
michael
parents:
diff changeset
174 av_log(NULL, AV_LOG_DEBUG, "rac failure at %d\n", i);
25448d0bc924 range coder
michael
parents:
diff changeset
175 STOP_TIMER("get_rac")
25448d0bc924 range coder
michael
parents:
diff changeset
176 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2864
diff changeset
177
2334
25448d0bc924 range coder
michael
parents:
diff changeset
178 return 0;
25448d0bc924 range coder
michael
parents:
diff changeset
179 }
25448d0bc924 range coder
michael
parents:
diff changeset
180
25448d0bc924 range coder
michael
parents:
diff changeset
181 #endif