annotate common.c @ 1254:604661d34c68 libavcodec

bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
author michaelni
date Wed, 14 May 2003 00:32:22 +0000
parents 7ac0a77e5973
children 6defe392d5d2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * Common bit i/o utils
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
5 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
7 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
16 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
18 *
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
19 * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
21
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
22 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
23 * @file common.c
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
24 * common internal api.
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
25 */
1e39f273ecd6 per file doxy
michaelni
parents: 1083
diff changeset
26
524
3e579fbef701 * declare av_free
kabi
parents: 520
diff changeset
27 #include "avcodec.h"
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
28
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
29 const uint8_t ff_sqrt_tab[128]={
609
153a7ffd289b faster ff_sqrt()
michaelni
parents: 535
diff changeset
30 0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5,
153a7ffd289b faster ff_sqrt()
michaelni
parents: 535
diff changeset
31 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
153a7ffd289b faster ff_sqrt()
michaelni
parents: 535
diff changeset
32 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
153a7ffd289b faster ff_sqrt()
michaelni
parents: 535
diff changeset
33 9, 9, 9, 9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,11
153a7ffd289b faster ff_sqrt()
michaelni
parents: 535
diff changeset
34 };
153a7ffd289b faster ff_sqrt()
michaelni
parents: 535
diff changeset
35
1037
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
36 const uint8_t ff_log2_tab[256]={
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
37 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
38 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
39 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
40 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
41 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
42 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
43 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
44 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
45 };
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
46
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
47 void init_put_bits(PutBitContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
48 uint8_t *buffer, int buffer_size,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
49 void *opaque,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
50 void (*write_data)(void *, uint8_t *, int))
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
51 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
52 s->buf = buffer;
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
53 s->buf_end = s->buf + buffer_size;
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
54 s->data_out_size = 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
55 if(write_data!=NULL)
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
56 {
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
57 fprintf(stderr, "write Data callback is not supported\n");
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
58 }
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
59 #ifdef ALT_BITSTREAM_WRITER
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
60 s->index=0;
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
61 ((uint32_t*)(s->buf))[0]=0;
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
62 // memset(buffer, 0, buffer_size);
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
63 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
64 s->buf_ptr = s->buf;
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 s->bit_left=32;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 s->bit_buf=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
67 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
68 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
69
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1126
diff changeset
70 #ifdef CONFIG_ENCODERS
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1126
diff changeset
71
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 /* return the number of bits output */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
73 int64_t get_bit_count(PutBitContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 {
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
75 #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
76 return s->data_out_size * 8 + s->index;
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
77 #else
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
78 return (s->buf_ptr - s->buf + s->data_out_size) * 8 + 32 - (int64_t)s->bit_left;
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
79 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
81
986e461dc072 Initial revision
glantau
parents:
diff changeset
82 void align_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 {
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
84 #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
85 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
86 #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
87 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
88 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
90
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1126
diff changeset
91 #endif //CONFIG_ENCODERS
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1126
diff changeset
92
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 /* pad the end of the output stream with zeros */
986e461dc072 Initial revision
glantau
parents:
diff changeset
94 void flush_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 {
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
96 #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
97 align_put_bits(s);
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
98 #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
99 s->bit_buf<<= s->bit_left;
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
100 while (s->bit_left < 32) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 /* XXX: should test end of buffer */
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 *s->buf_ptr++=s->bit_buf >> 24;
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 s->bit_buf<<=8;
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
104 s->bit_left+=8;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
105 }
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
106 s->bit_left=32;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
107 s->bit_buf=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
108 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
110
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1126
diff changeset
111 #ifdef CONFIG_ENCODERS
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1126
diff changeset
112
358
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
113 void put_string(PutBitContext * pbc, char *s)
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
114 {
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
115 while(*s){
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
116 put_bits(pbc, 8, *s);
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
117 s++;
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
118 }
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
119 put_bits(pbc, 8, 0);
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
120 }
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
121
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
122 /* bit input functions */
986e461dc072 Initial revision
glantau
parents:
diff changeset
123
1232
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1126
diff changeset
124 #endif //CONFIG_ENCODERS
e88d3b1fb2a1 more #ifdef CONFIG_ENCODERS by (Wolfgang Hesseler <qv at multimediaware dot com>)
michaelni
parents: 1126
diff changeset
125
1249
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1232
diff changeset
126 /**
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1232
diff changeset
127 * init GetBitContext.
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1232
diff changeset
128 * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger then the actual read bits
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1232
diff changeset
129 * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1232
diff changeset
130 * @param bit_size the size of the buffer in bits
7ac0a77e5973 100l (document buffer padding requirements)
michaelni
parents: 1232
diff changeset
131 */
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
132 void init_get_bits(GetBitContext *s,
1083
b923be2fc4b5 * using const buffers for reading
kabi
parents: 1064
diff changeset
133 const uint8_t *buffer, int bit_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
134 {
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 880
diff changeset
135 const int buffer_size= (bit_size+7)>>3;
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 880
diff changeset
136
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 s->buffer= buffer;
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 880
diff changeset
138 s->size_in_bits= bit_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
139 s->buffer_end= buffer + buffer_size;
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
140 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
141 s->index=0;
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
142 #elif defined LIBMPEG2_BITSTREAM_READER
1254
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
143 #ifdef LIBMPEG2_BITSTREAM_HACK
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
144 if ((int)buffer&1) {
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
145 /* word alignment */
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
146 s->cache = (*buffer++)<<24;
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
147 s->buffer_ptr = buffer;
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
148 s->bit_count = 16-8;
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
149 } else
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
150 #endif
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
151 {
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 s->buffer_ptr = buffer;
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
153 s->bit_count = 16;
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
154 s->cache = 0;
1254
604661d34c68 bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1249
diff changeset
155 }
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
156 #elif defined A32_BITSTREAM_READER
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
157 s->buffer_ptr = (uint32_t*)buffer;
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
158 s->bit_count = 32;
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
159 s->cache0 = 0;
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
160 s->cache1 = 0;
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
161 #endif
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
162 {
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
163 OPEN_READER(re, s)
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
164 UPDATE_CACHE(re, s)
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 // UPDATE_CACHE(re, s)
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 CLOSE_READER(re, s)
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
167 }
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
168 #ifdef A32_BITSTREAM_READER
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
169 s->cache1 = 0;
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
170 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
172
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 void align_get_bits(GetBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 {
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
175 int n= (-get_bits_count(s)) & 7;
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
176 if(n) skip_bits(s, n);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
177 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
178
862
058194d7ade6 * fixing some minor const warnings
kabi
parents: 840
diff changeset
179 int check_marker(GetBitContext *s, const char *msg)
264
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
180 {
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
181 int bit= get_bits1(s);
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
182 if(!bit) printf("Marker bit missing %s\n", msg);
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
183
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
184 return bit;
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
185 }
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
186
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
187 /* VLC decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
188
986e461dc072 Initial revision
glantau
parents:
diff changeset
189 //#define DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
190
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 #define GET_DATA(v, table, i, wrap, size) \
986e461dc072 Initial revision
glantau
parents:
diff changeset
192 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
193 const uint8_t *ptr = (const uint8_t *)table + i * wrap;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 switch(size) {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 case 1:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
196 v = *(const uint8_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 case 2:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
199 v = *(const uint16_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 default:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
202 v = *(const uint32_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 }\
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
206
986e461dc072 Initial revision
glantau
parents:
diff changeset
207
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 static int alloc_table(VLC *vlc, int size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 int index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
211 index = vlc->table_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
212 vlc->table_size += size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 if (vlc->table_size > vlc->table_allocated) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 vlc->table_allocated += (1 << vlc->bits);
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 1025
diff changeset
215 vlc->table = av_realloc(vlc->table,
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 1025
diff changeset
216 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
217 if (!vlc->table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
218 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
220 return index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
222
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
223 static int build_table(VLC *vlc, int table_nb_bits,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
224 int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
225 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
226 const void *codes, int codes_wrap, int codes_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
227 uint32_t code_prefix, int n_prefix)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
228 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 int i, j, k, n, table_size, table_index, nb, n1, index;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
230 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
231 VLC_TYPE (*table)[2];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
232
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 table_size = 1 << table_nb_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 table_index = alloc_table(vlc, table_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 #ifdef DEBUG_VLC
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
236 printf("new table index=%d size=%d code_prefix=%x n=%d\n",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
237 table_index, table_size, code_prefix, n_prefix);
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 if (table_index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
240 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
241 table = &vlc->table[table_index];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
242
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 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
244 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
245 table[i][0] = -1; //codes
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
247
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 /* first pass: map codes and compute auxillary table sizes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
249 for(i=0;i<nb_codes;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
250 GET_DATA(n, bits, i, bits_wrap, bits_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
251 GET_DATA(code, codes, i, codes_wrap, codes_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 /* we accept tables with holes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 if (n <= 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
254 continue;
986e461dc072 Initial revision
glantau
parents:
diff changeset
255 #if defined(DEBUG_VLC) && 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
256 printf("i=%d n=%d code=0x%x\n", i, n, code);
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 /* if code matches the prefix, it is in the table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
259 n -= n_prefix;
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 if (n > 0 && (code >> n) == code_prefix) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 if (n <= table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 /* no need to add another table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 j = (code << (table_nb_bits - n)) & (table_size - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 nb = 1 << (table_nb_bits - n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 for(k=0;k<nb;k++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
266 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
267 printf("%4x: code=%d n=%d\n",
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 j, i, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
269 #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
270 if (table[j][1] /*bits*/ != 0) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
271 fprintf(stderr, "incorrect codes\n");
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 exit(1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 }
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
274 table[j][1] = n; //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
275 table[j][0] = i; //code
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
276 j++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
277 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
278 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 n -= table_nb_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
280 j = (code >> n) & ((1 << table_nb_bits) - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
281 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
282 printf("%4x: n=%d (subtable)\n",
986e461dc072 Initial revision
glantau
parents:
diff changeset
283 j, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
284 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
285 /* 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
286 n1 = -table[j][1]; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
287 if (n > n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
288 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
289 table[j][1] = -n1; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
290 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
291 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
292 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
293
986e461dc072 Initial revision
glantau
parents:
diff changeset
294 /* second pass : fill auxillary tables recursively */
986e461dc072 Initial revision
glantau
parents:
diff changeset
295 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
296 n = table[i][1]; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
297 if (n < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
298 n = -n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
299 if (n > table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
300 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
301 table[i][1] = -n; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
302 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
303 index = build_table(vlc, n, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
304 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 codes, codes_wrap, codes_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
306 (code_prefix << table_nb_bits) | i,
986e461dc072 Initial revision
glantau
parents:
diff changeset
307 n_prefix + table_nb_bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
308 if (index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
309 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
310 /* 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
311 table = &vlc->table[table_index];
535
7f1b09bb34c6 dont trash table in GET_VLC
michaelni
parents: 529
diff changeset
312 table[i][0] = index; //code
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
313 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
314 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
315 return table_index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
316 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
317
986e461dc072 Initial revision
glantau
parents:
diff changeset
318
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
319 /* Build VLC decoding tables suitable for use with get_vlc().
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
320
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
321 'nb_bits' set thee decoding table size (2^nb_bits) entries. The
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
322 bigger it is, the faster is the decoding. But it should not be too
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
323 big to save memory and L1 cache. '9' is a good compromise.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
324
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
325 'nb_codes' : number of vlcs codes
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
326
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
327 'bits' : table which gives the size (in bits) of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
328
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
329 'codes' : table which gives the bit pattern of of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
330
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
331 'xxx_wrap' : give the number of bytes between each entry of the
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
332 'bits' or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
333
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
334 'xxx_size' : gives the number of bytes of each entry of the 'bits'
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
335 or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
336
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
337 'wrap' and 'size' allows to use any memory configuration and types
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
338 (byte/word/long) to store the 'bits' and 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
339 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
340 int init_vlc(VLC *vlc, int nb_bits, int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
341 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
342 const void *codes, int codes_wrap, int codes_size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
344 vlc->bits = 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
345 vlc->table = NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
346 vlc->table_allocated = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
347 vlc->table_size = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
348 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
349 printf("build table nb_codes=%d\n", nb_codes);
986e461dc072 Initial revision
glantau
parents:
diff changeset
350 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
351
986e461dc072 Initial revision
glantau
parents:
diff changeset
352 if (build_table(vlc, nb_bits, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
353 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
354 codes, codes_wrap, codes_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
355 0, 0) < 0) {
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
356 av_free(vlc->table);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
358 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
359 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
360 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
361
986e461dc072 Initial revision
glantau
parents:
diff changeset
362
986e461dc072 Initial revision
glantau
parents:
diff changeset
363 void free_vlc(VLC *vlc)
986e461dc072 Initial revision
glantau
parents:
diff changeset
364 {
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
365 av_free(vlc->table);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
366 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
367
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
368 int64_t ff_gcd(int64_t a, int64_t b){
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 277
diff changeset
369 if(b) return ff_gcd(b, a%b);
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 277
diff changeset
370 else return a;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 277
diff changeset
371 }
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
372
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
373 void ff_float2fraction(int *nom_arg, int *denom_arg, double f, int max){
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
374 double best_diff=1E10, diff;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
375 int best_denom=1, best_nom=1;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
376 int nom, denom, gcd;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
377
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
378 //brute force here, perhaps we should try continued fractions if we need large max ...
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
379 for(denom=1; denom<=max; denom++){
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
380 nom= (int)(f*denom + 0.5);
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
381 if(nom<=0 || nom>max) continue;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
382
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
383 diff= ABS( f - (double)nom / (double)denom );
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
384 if(diff < best_diff){
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
385 best_diff= diff;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
386 best_nom= nom;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
387 best_denom= denom;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
388 }
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
389 }
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
390
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
391 gcd= ff_gcd(best_nom, best_denom);
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
392 best_nom /= gcd;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
393 best_denom /= gcd;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
394
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
395 *nom_arg= best_nom;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
396 *denom_arg= best_denom;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
397 }