Mercurial > libavcodec.hg
annotate bitstream.c @ 9896:bbefbca72722 libavcodec
Drop code that attempts to decode frames that are prefixed by junk.
Too often it ends up decoding random data into noise without detecting
it (for example after seeking of some MP3 data with oddly often occurring
startcode emulation).
Fixes issue1154.
| author | michael |
|---|---|
| date | Tue, 30 Jun 2009 03:57:27 +0000 |
| parents | 932543edc1d2 |
| children | f3ff182e9ecf |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * Common bit i/o utils | |
|
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8596
diff
changeset
|
3 * Copyright (c) 2000, 2001 Fabrice Bellard |
|
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1660
diff
changeset
|
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
| 0 | 5 * |
| 5214 | 6 * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at> |
| 7 * | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3648
diff
changeset
|
8 * This file is part of FFmpeg. |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3648
diff
changeset
|
9 * |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3648
diff
changeset
|
10 * FFmpeg is free software; you can redistribute it and/or |
| 429 | 11 * modify it under the terms of the GNU Lesser General Public |
| 12 * 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:
3648
diff
changeset
|
13 * version 2.1 of the License, or (at your option) any later version. |
| 0 | 14 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3648
diff
changeset
|
15 * FFmpeg is distributed in the hope that it will be useful, |
| 0 | 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 18 * Lesser General Public License for more details. | |
| 0 | 19 * |
| 429 | 20 * 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:
3648
diff
changeset
|
21 * License along with FFmpeg; if not, write to the Free Software |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 23 */ |
| 1106 | 24 |
| 25 /** | |
|
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8629
diff
changeset
|
26 * @file libavcodec/bitstream.c |
|
2398
582e635cfa08
common.c -> bitstream.c (and the single non bitstream func -> utils.c)
michael
parents:
2370
diff
changeset
|
27 * bitstream api. |
| 1106 | 28 */ |
| 2967 | 29 |
| 524 | 30 #include "avcodec.h" |
| 9428 | 31 #include "get_bits.h" |
|
9411
4cb7c65fc775
Split bitstream.h, put the bitstream writer stuff in the new file
stefano
parents:
9405
diff
changeset
|
32 #include "put_bits.h" |
| 1037 | 33 |
|
7146
d3a1ac3e227b
move ff_log2_run to bitstream.c and reuse in ffv1.c
stefang
parents:
6945
diff
changeset
|
34 const uint8_t ff_log2_run[32]={ |
|
d3a1ac3e227b
move ff_log2_run to bitstream.c and reuse in ffv1.c
stefang
parents:
6945
diff
changeset
|
35 0, 0, 0, 0, 1, 1, 1, 1, |
|
d3a1ac3e227b
move ff_log2_run to bitstream.c and reuse in ffv1.c
stefang
parents:
6945
diff
changeset
|
36 2, 2, 2, 2, 3, 3, 3, 3, |
|
d3a1ac3e227b
move ff_log2_run to bitstream.c and reuse in ffv1.c
stefang
parents:
6945
diff
changeset
|
37 4, 4, 5, 5, 6, 6, 7, 7, |
|
d3a1ac3e227b
move ff_log2_run to bitstream.c and reuse in ffv1.c
stefang
parents:
6945
diff
changeset
|
38 8, 9,10,11,12,13,14,15 |
|
d3a1ac3e227b
move ff_log2_run to bitstream.c and reuse in ffv1.c
stefang
parents:
6945
diff
changeset
|
39 }; |
|
d3a1ac3e227b
move ff_log2_run to bitstream.c and reuse in ffv1.c
stefang
parents:
6945
diff
changeset
|
40 |
|
9218
18dffa8f2382
Remove deprecated functions and structures on next version bump.
diego
parents:
9158
diff
changeset
|
41 #if LIBAVCODEC_VERSION_MAJOR < 53 |
|
4576
ad02fe65f45a
Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents:
3947
diff
changeset
|
42 /** |
|
ad02fe65f45a
Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents:
3947
diff
changeset
|
43 * Same as av_mallocz_static(), but does a realloc. |
|
ad02fe65f45a
Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents:
3947
diff
changeset
|
44 * |
|
ad02fe65f45a
Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents:
3947
diff
changeset
|
45 * @param[in] ptr The block of memory to reallocate. |
|
ad02fe65f45a
Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents:
3947
diff
changeset
|
46 * @param[in] size The requested size. |
|
ad02fe65f45a
Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents:
3947
diff
changeset
|
47 * @return Block of memory of requested size. |
| 5409 | 48 * @deprecated. Code which uses ff_realloc_static is broken/misdesigned |
|
4889
beeb03aad909
patch so that the deprecated items show up correctly
benoit
parents:
4685
diff
changeset
|
49 * and should correctly use static arrays |
|
4576
ad02fe65f45a
Move the av_realloc_static() declaration out of avcodec.h into bitstream.c.
takis
parents:
3947
diff
changeset
|
50 */ |
| 6519 | 51 attribute_deprecated av_alloc_size(2) |
|
6941
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
52 static void *ff_realloc_static(void *ptr, unsigned int size); |
|
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
53 |
|
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
54 static void *ff_realloc_static(void *ptr, unsigned int size) |
|
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
55 { |
|
6944
030cc3278868
As *_static are not deallocated anymore except on program termination
michael
parents:
6943
diff
changeset
|
56 return av_realloc(ptr, size); |
|
6941
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
57 } |
|
9218
18dffa8f2382
Remove deprecated functions and structures on next version bump.
diego
parents:
9158
diff
changeset
|
58 #endif |
|
6941
da73a98945ea
Move *_static to bitstream.c which is the only file left which needs
michael
parents:
6935
diff
changeset
|
59 |
| 0 | 60 void align_put_bits(PutBitContext *s) |
| 61 { | |
|
234
5fc0c3af3fe4
alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents:
219
diff
changeset
|
62 #ifdef ALT_BITSTREAM_WRITER |
|
5fc0c3af3fe4
alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents:
219
diff
changeset
|
63 put_bits(s,( - s->index) & 7,0); |
|
5fc0c3af3fe4
alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents:
219
diff
changeset
|
64 #else |
|
238
99a9f903f0e3
optimized the normal bitstream writer, its faster than the alternative one on p3 now ... lets hope its at least not slower on p4 & k7
michaelni
parents:
234
diff
changeset
|
65 put_bits(s,s->bit_left & 7,0); |
|
234
5fc0c3af3fe4
alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents:
219
diff
changeset
|
66 #endif |
| 0 | 67 } |
| 68 | |
|
9405
9fc81340a5a8
Rename the 'put_zero' parameter of ff_put_string() to
stefano
parents:
9218
diff
changeset
|
69 void ff_put_string(PutBitContext * pbc, const char *s, int terminate_string) |
| 358 | 70 { |
| 71 while(*s){ | |
| 72 put_bits(pbc, 8, *s); | |
| 73 s++; | |
| 74 } | |
|
9405
9fc81340a5a8
Rename the 'put_zero' parameter of ff_put_string() to
stefano
parents:
9218
diff
changeset
|
75 if(terminate_string) |
| 1795 | 76 put_bits(pbc, 8, 0); |
| 358 | 77 } |
| 78 | |
| 6325 | 79 void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) |
| 5229 | 80 { |
| 6325 | 81 const uint16_t *srcw= (const uint16_t*)src; |
| 5229 | 82 int words= length>>4; |
| 83 int bits= length&15; | |
| 84 int i; | |
| 85 | |
| 86 if(length==0) return; | |
| 87 | |
|
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
7146
diff
changeset
|
88 if(CONFIG_SMALL || words < 16 || put_bits_count(pb)&7){ |
| 9158 | 89 for(i=0; i<words; i++) put_bits(pb, 16, AV_RB16(&srcw[i])); |
| 5229 | 90 }else{ |
| 91 for(i=0; put_bits_count(pb)&31; i++) | |
| 92 put_bits(pb, 8, src[i]); | |
| 93 flush_put_bits(pb); | |
| 9431 | 94 memcpy(put_bits_ptr(pb), src+i, 2*words-i); |
| 5229 | 95 skip_put_bytes(pb, 2*words-i); |
| 96 } | |
| 97 | |
| 9158 | 98 put_bits(pb, bits, AV_RB16(&srcw[words])>>(16-bits)); |
| 5229 | 99 } |
| 100 | |
| 0 | 101 /* VLC decoding */ |
| 102 | |
| 103 //#define DEBUG_VLC | |
| 104 | |
| 105 #define GET_DATA(v, table, i, wrap, size) \ | |
| 106 {\ | |
| 1064 | 107 const uint8_t *ptr = (const uint8_t *)table + i * wrap;\ |
| 0 | 108 switch(size) {\ |
| 109 case 1:\ | |
| 1064 | 110 v = *(const uint8_t *)ptr;\ |
| 0 | 111 break;\ |
| 112 case 2:\ | |
| 1064 | 113 v = *(const uint16_t *)ptr;\ |
| 0 | 114 break;\ |
| 115 default:\ | |
| 1064 | 116 v = *(const uint32_t *)ptr;\ |
| 0 | 117 break;\ |
| 118 }\ | |
| 119 } | |
| 120 | |
| 121 | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
122 static int alloc_table(VLC *vlc, int size, int use_static) |
| 0 | 123 { |
| 124 int index; | |
| 125 index = vlc->table_size; | |
| 126 vlc->table_size += size; | |
| 127 if (vlc->table_size > vlc->table_allocated) { | |
|
6935
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
128 if(use_static>1) |
|
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
129 abort(); //cant do anything, init_vlc() is used with too little memory |
| 0 | 130 vlc->table_allocated += (1 << vlc->bits); |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
131 if(use_static) |
|
4577
88cf097ebe75
av_realloc_static() is an internal function and therefore should use the ff_ prefix instead of av_.
takis
parents:
4576
diff
changeset
|
132 vlc->table = ff_realloc_static(vlc->table, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
133 sizeof(VLC_TYPE) * 2 * vlc->table_allocated); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
134 else |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
135 vlc->table = av_realloc(vlc->table, |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
136 sizeof(VLC_TYPE) * 2 * vlc->table_allocated); |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
137 if (!vlc->table) |
| 0 | 138 return -1; |
| 139 } | |
| 140 return index; | |
| 141 } | |
| 142 | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
143 static int build_table(VLC *vlc, int table_nb_bits, |
| 0 | 144 int nb_codes, |
| 145 const void *bits, int bits_wrap, int bits_size, | |
| 146 const void *codes, int codes_wrap, int codes_size, | |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
147 const void *symbols, int symbols_wrap, int symbols_size, |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
148 uint32_t code_prefix, int n_prefix, int flags) |
| 0 | 149 { |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
150 int i, j, k, n, table_size, table_index, nb, n1, index, code_prefix2, symbol; |
| 1064 | 151 uint32_t code; |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
152 VLC_TYPE (*table)[2]; |
| 0 | 153 |
| 154 table_size = 1 << table_nb_bits; | |
|
6935
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
155 table_index = alloc_table(vlc, table_size, flags & (INIT_VLC_USE_STATIC|INIT_VLC_USE_NEW_STATIC)); |
| 0 | 156 #ifdef DEBUG_VLC |
|
5013
c7904664624c
printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents:
4889
diff
changeset
|
157 av_log(NULL,AV_LOG_DEBUG,"new table index=%d size=%d code_prefix=%x n=%d\n", |
| 0 | 158 table_index, table_size, code_prefix, n_prefix); |
| 159 #endif | |
| 160 if (table_index < 0) | |
| 161 return -1; | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
162 table = &vlc->table[table_index]; |
| 0 | 163 |
| 164 for(i=0;i<table_size;i++) { | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
165 table[i][1] = 0; //bits |
|
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
166 table[i][0] = -1; //codes |
| 0 | 167 } |
| 168 | |
| 169 /* first pass: map codes and compute auxillary table sizes */ | |
| 170 for(i=0;i<nb_codes;i++) { | |
| 171 GET_DATA(n, bits, i, bits_wrap, bits_size); | |
| 172 GET_DATA(code, codes, i, codes_wrap, codes_size); | |
| 173 /* we accept tables with holes */ | |
| 174 if (n <= 0) | |
| 175 continue; | |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
176 if (!symbols) |
|
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
177 symbol = i; |
|
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
178 else |
|
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
179 GET_DATA(symbol, symbols, i, symbols_wrap, symbols_size); |
| 0 | 180 #if defined(DEBUG_VLC) && 0 |
|
5013
c7904664624c
printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents:
4889
diff
changeset
|
181 av_log(NULL,AV_LOG_DEBUG,"i=%d n=%d code=0x%x\n", i, n, code); |
| 0 | 182 #endif |
| 183 /* if code matches the prefix, it is in the table */ | |
| 184 n -= n_prefix; | |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
185 if(flags & INIT_VLC_LE) |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
186 code_prefix2= code & (n_prefix>=32 ? 0xffffffff : (1 << n_prefix)-1); |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
187 else |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
188 code_prefix2= code >> n; |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
189 if (n > 0 && code_prefix2 == code_prefix) { |
| 0 | 190 if (n <= table_nb_bits) { |
| 191 /* no need to add another table */ | |
| 192 j = (code << (table_nb_bits - n)) & (table_size - 1); | |
| 193 nb = 1 << (table_nb_bits - n); | |
| 194 for(k=0;k<nb;k++) { | |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
195 if(flags & INIT_VLC_LE) |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
196 j = (code >> n_prefix) + (k<<n); |
| 0 | 197 #ifdef DEBUG_VLC |
|
1602
fdb8244da1e5
av_log patch(2 of ?) by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1598
diff
changeset
|
198 av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n", |
| 0 | 199 j, i, n); |
| 200 #endif | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
201 if (table[j][1] /*bits*/ != 0) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
202 av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); |
| 2281 | 203 return -1; |
| 0 | 204 } |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
205 table[j][1] = n; //bits |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
206 table[j][0] = symbol; |
| 0 | 207 j++; |
| 208 } | |
| 209 } else { | |
| 210 n -= table_nb_bits; | |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
211 j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1); |
| 0 | 212 #ifdef DEBUG_VLC |
|
5013
c7904664624c
printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents:
4889
diff
changeset
|
213 av_log(NULL,AV_LOG_DEBUG,"%4x: n=%d (subtable)\n", |
| 0 | 214 j, n); |
| 215 #endif | |
| 216 /* compute table size */ | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
217 n1 = -table[j][1]; //bits |
| 0 | 218 if (n > n1) |
| 219 n1 = n; | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
220 table[j][1] = -n1; //bits |
| 0 | 221 } |
| 222 } | |
| 223 } | |
| 224 | |
| 225 /* second pass : fill auxillary tables recursively */ | |
| 226 for(i=0;i<table_size;i++) { | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
227 n = table[i][1]; //bits |
| 0 | 228 if (n < 0) { |
| 229 n = -n; | |
| 230 if (n > table_nb_bits) { | |
| 231 n = table_nb_bits; | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
232 table[i][1] = -n; //bits |
| 0 | 233 } |
| 234 index = build_table(vlc, n, nb_codes, | |
| 235 bits, bits_wrap, bits_size, | |
| 236 codes, codes_wrap, codes_size, | |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
237 symbols, symbols_wrap, symbols_size, |
|
2663
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
238 (flags & INIT_VLC_LE) ? (code_prefix | (i << n_prefix)) : ((code_prefix << table_nb_bits) | i), |
|
b33be8b00488
LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu)
michael
parents:
2398
diff
changeset
|
239 n_prefix + table_nb_bits, flags); |
| 0 | 240 if (index < 0) |
| 241 return -1; | |
| 242 /* note: realloc has been done, so reload tables */ | |
|
520
19a5e2a81e1a
new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler)
michaelni
parents:
497
diff
changeset
|
243 table = &vlc->table[table_index]; |
| 535 | 244 table[i][0] = index; //code |
| 0 | 245 } |
| 246 } | |
| 247 return table_index; | |
| 248 } | |
| 249 | |
| 250 | |
| 24 | 251 /* Build VLC decoding tables suitable for use with get_vlc(). |
| 252 | |
| 253 'nb_bits' set thee decoding table size (2^nb_bits) entries. The | |
| 254 bigger it is, the faster is the decoding. But it should not be too | |
| 255 big to save memory and L1 cache. '9' is a good compromise. | |
| 2967 | 256 |
| 24 | 257 'nb_codes' : number of vlcs codes |
| 258 | |
| 259 'bits' : table which gives the size (in bits) of each vlc code. | |
| 260 | |
| 261 'codes' : table which gives the bit pattern of of each vlc code. | |
| 262 | |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
263 'symbols' : table which gives the values to be returned from get_vlc(). |
|
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
264 |
| 24 | 265 'xxx_wrap' : give the number of bytes between each entry of the |
| 266 'bits' or 'codes' tables. | |
| 267 | |
| 268 'xxx_size' : gives the number of bytes of each entry of the 'bits' | |
| 269 or 'codes' tables. | |
| 270 | |
| 271 'wrap' and 'size' allows to use any memory configuration and types | |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
272 (byte/word/long) to store the 'bits', 'codes', and 'symbols' tables. |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
273 |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
274 'use_static' should be set to 1 for tables, which should be freed |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
275 with av_free_static(), 0 if free_vlc() will be used. |
| 24 | 276 */ |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
277 int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, |
| 0 | 278 const void *bits, int bits_wrap, int bits_size, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
279 const void *codes, int codes_wrap, int codes_size, |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
280 const void *symbols, int symbols_wrap, int symbols_size, |
| 4685 | 281 int flags) |
| 0 | 282 { |
| 283 vlc->bits = nb_bits; | |
|
6935
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
284 if(flags & INIT_VLC_USE_NEW_STATIC){ |
|
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
285 if(vlc->table_size && vlc->table_size == vlc->table_allocated){ |
|
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
286 return 0; |
|
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
287 }else if(vlc->table_size){ |
|
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
288 abort(); // fatal error, we are called on a partially initialized table |
|
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
289 } |
|
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
290 }else if(!(flags & INIT_VLC_USE_STATIC)) { |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
291 vlc->table = NULL; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
292 vlc->table_allocated = 0; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
293 vlc->table_size = 0; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
294 } else { |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
295 /* Static tables are initially always NULL, return |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
296 if vlc->table != NULL to avoid double allocation */ |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
297 if(vlc->table) |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
298 return 0; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
299 } |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2281
diff
changeset
|
300 |
| 0 | 301 #ifdef DEBUG_VLC |
|
5013
c7904664624c
printf --> av_log, patch by Denis Fortin, fortin nerim net
diego
parents:
4889
diff
changeset
|
302 av_log(NULL,AV_LOG_DEBUG,"build table nb_codes=%d\n", nb_codes); |
| 0 | 303 #endif |
| 304 | |
| 305 if (build_table(vlc, nb_bits, nb_codes, | |
| 306 bits, bits_wrap, bits_size, | |
| 307 codes, codes_wrap, codes_size, | |
|
5071
0d503c12092b
add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables.
lorenm
parents:
5013
diff
changeset
|
308 symbols, symbols_wrap, symbols_size, |
| 4685 | 309 0, 0, flags) < 0) { |
| 5206 | 310 av_freep(&vlc->table); |
| 0 | 311 return -1; |
| 312 } | |
|
6935
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
313 if((flags & INIT_VLC_USE_NEW_STATIC) && vlc->table_size != vlc->table_allocated) |
|
24e01f7cc819
Make init_vlc* support proper static tables instead of this broken beyond
michael
parents:
6519
diff
changeset
|
314 av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); |
| 0 | 315 return 0; |
| 316 } | |
| 317 | |
| 318 | |
| 319 void free_vlc(VLC *vlc) | |
| 320 { | |
| 5206 | 321 av_freep(&vlc->table); |
| 0 | 322 } |
| 323 |
