annotate common.c @ 1096:5e6e505d8997 libavcodec

field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
author michaelni
date Wed, 05 Mar 2003 17:48:19 +0000
parents b923be2fc4b5
children 1e39f273ecd6
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 */
524
3e579fbef701 * declare av_free
kabi
parents: 520
diff changeset
21 #include "avcodec.h"
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
22
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
23 const uint8_t ff_sqrt_tab[128]={
609
153a7ffd289b faster ff_sqrt()
michaelni
parents: 535
diff changeset
24 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
25 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
26 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
27 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
28 };
153a7ffd289b faster ff_sqrt()
michaelni
parents: 535
diff changeset
29
1037
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
30 const uint8_t ff_log2_tab[256]={
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
31 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
32 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
33 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
34 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
35 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
36 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
37 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
38 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
39 };
44a230c11d83 optimizing av_log2
michaelni
parents: 1031
diff changeset
40
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 void init_put_bits(PutBitContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
42 uint8_t *buffer, int buffer_size,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
43 void *opaque,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
44 void (*write_data)(void *, uint8_t *, int))
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
46 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
47 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
48 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
49 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
50 {
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
51 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
52 }
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
53 #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
54 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
55 ((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
56 // 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
57 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
58 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
59 s->bit_left=32;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
60 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
61 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
62 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
63
986e461dc072 Initial revision
glantau
parents:
diff changeset
64 /* return the number of bits output */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
65 int64_t get_bit_count(PutBitContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 {
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 #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
68 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
69 #else
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
70 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
71 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
73
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 void align_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 {
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
76 #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
77 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
78 #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
79 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
80 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
82
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 /* pad the end of the output stream with zeros */
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 void flush_put_bits(PutBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 {
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
86 #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
87 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
88 #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
89 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
90 while (s->bit_left < 32) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
91 /* XXX: should test end of buffer */
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 *s->buf_ptr++=s->bit_buf >> 24;
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 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
94 s->bit_left+=8;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 }
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
96 s->bit_left=32;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 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
98 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
100
358
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
101 void put_string(PutBitContext * pbc, char *s)
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
102 {
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
103 while(*s){
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
104 put_bits(pbc, 8, *s);
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
105 s++;
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
106 }
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
107 put_bits(pbc, 8, 0);
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
108 }
2066dc543be4 move put_string() to common.{c,h}
michaelni
parents: 324
diff changeset
109
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 /* bit input functions */
986e461dc072 Initial revision
glantau
parents:
diff changeset
111
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
112 void init_get_bits(GetBitContext *s,
1083
b923be2fc4b5 * using const buffers for reading
kabi
parents: 1064
diff changeset
113 const uint8_t *buffer, int bit_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
114 {
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
115 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
116
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
117 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
118 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
119 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
120 #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
121 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
122 #elif defined LIBMPEG2_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
123 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
124 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
125 s->cache = 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
126 #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
127 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
128 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
129 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
130 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
131 #endif
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 8
diff changeset
132 {
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
133 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
134 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
135 // 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
136 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
137 }
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
138 #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
139 s->cache1 = 0;
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 0
diff changeset
140 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
141 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
142
986e461dc072 Initial revision
glantau
parents:
diff changeset
143 void align_get_bits(GetBitContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 {
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
145 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
146 if(n) skip_bits(s, n);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
147 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 144
diff changeset
148
862
058194d7ade6 * fixing some minor const warnings
kabi
parents: 840
diff changeset
149 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
150 {
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
151 int bit= get_bits1(s);
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
152 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
153
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
154 return bit;
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
155 }
28c5c62b1c4c support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents: 238
diff changeset
156
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 /* VLC decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
158
986e461dc072 Initial revision
glantau
parents:
diff changeset
159 //#define DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
160
986e461dc072 Initial revision
glantau
parents:
diff changeset
161 #define GET_DATA(v, table, i, wrap, size) \
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
163 const uint8_t *ptr = (const uint8_t *)table + i * wrap;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 switch(size) {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 case 1:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
166 v = *(const uint8_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
167 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
168 case 2:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
169 v = *(const uint16_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
170 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 default:\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
172 v = *(const uint32_t *)ptr;\
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 break;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 }\
986e461dc072 Initial revision
glantau
parents:
diff changeset
175 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
176
986e461dc072 Initial revision
glantau
parents:
diff changeset
177
986e461dc072 Initial revision
glantau
parents:
diff changeset
178 static int alloc_table(VLC *vlc, int size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
180 int index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 index = vlc->table_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 vlc->table_size += size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
183 if (vlc->table_size > vlc->table_allocated) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
184 vlc->table_allocated += (1 << vlc->bits);
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 1025
diff changeset
185 vlc->table = av_realloc(vlc->table,
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 1025
diff changeset
186 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
187 if (!vlc->table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
188 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
189 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
190 return index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
192
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
193 static int build_table(VLC *vlc, int table_nb_bits,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 const void *codes, int codes_wrap, int codes_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
197 uint32_t code_prefix, int n_prefix)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
199 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
200 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
201 VLC_TYPE (*table)[2];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
202
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 table_size = 1 << table_nb_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 table_index = alloc_table(vlc, table_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 #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
206 printf("new table index=%d size=%d code_prefix=%x n=%d\n",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 table_index, table_size, code_prefix, n_prefix);
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 if (table_index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 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
211 table = &vlc->table[table_index];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
212
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 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
214 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
215 table[i][0] = -1; //codes
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
216 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
217
986e461dc072 Initial revision
glantau
parents:
diff changeset
218 /* first pass: map codes and compute auxillary table sizes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 for(i=0;i<nb_codes;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
220 GET_DATA(n, bits, i, bits_wrap, bits_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 GET_DATA(code, codes, i, codes_wrap, codes_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 /* we accept tables with holes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 if (n <= 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
224 continue;
986e461dc072 Initial revision
glantau
parents:
diff changeset
225 #if defined(DEBUG_VLC) && 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
226 printf("i=%d n=%d code=0x%x\n", i, n, code);
986e461dc072 Initial revision
glantau
parents:
diff changeset
227 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
228 /* if code matches the prefix, it is in the table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 n -= n_prefix;
986e461dc072 Initial revision
glantau
parents:
diff changeset
230 if (n > 0 && (code >> n) == code_prefix) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
231 if (n <= table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
232 /* no need to add another table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 j = (code << (table_nb_bits - n)) & (table_size - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 nb = 1 << (table_nb_bits - n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 for(k=0;k<nb;k++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
236 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
237 printf("%4x: code=%d n=%d\n",
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 j, i, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 #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
240 if (table[j][1] /*bits*/ != 0) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
241 fprintf(stderr, "incorrect codes\n");
986e461dc072 Initial revision
glantau
parents:
diff changeset
242 exit(1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 }
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[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
245 table[j][0] = i; //code
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 j++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
247 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
249 n -= table_nb_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
250 j = (code >> n) & ((1 << table_nb_bits) - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
251 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 printf("%4x: n=%d (subtable)\n",
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 j, n);
986e461dc072 Initial revision
glantau
parents:
diff changeset
254 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
255 /* 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
256 n1 = -table[j][1]; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 if (n > n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 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
259 table[j][1] = -n1; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
263
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 /* second pass : fill auxillary tables recursively */
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 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
266 n = table[i][1]; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
267 if (n < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 n = -n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
269 if (n > table_nb_bits) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
270 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
271 table[i][1] = -n; //bits
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 index = build_table(vlc, n, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
274 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
275 codes, codes_wrap, codes_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
276 (code_prefix << table_nb_bits) | i,
986e461dc072 Initial revision
glantau
parents:
diff changeset
277 n_prefix + table_nb_bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
278 if (index < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
280 /* 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
281 table = &vlc->table[table_index];
535
7f1b09bb34c6 dont trash table in GET_VLC
michaelni
parents: 529
diff changeset
282 table[i][0] = index; //code
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
283 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
284 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
285 return table_index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
286 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
287
986e461dc072 Initial revision
glantau
parents:
diff changeset
288
24
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
289 /* Build VLC decoding tables suitable for use with get_vlc().
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
290
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
291 'nb_bits' set thee decoding table size (2^nb_bits) entries. The
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
292 bigger it is, the faster is the decoding. But it should not be too
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
293 big to save memory and L1 cache. '9' is a good compromise.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
294
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
295 'nb_codes' : number of vlcs codes
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
296
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
297 'bits' : table which gives the size (in bits) of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
298
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
299 'codes' : table which gives the bit pattern of of each vlc code.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
300
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
301 'xxx_wrap' : give the number of bytes between each entry of the
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
302 'bits' or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
303
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
304 'xxx_size' : gives the number of bytes of each entry of the 'bits'
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
305 or 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
306
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
307 'wrap' and 'size' allows to use any memory configuration and types
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
308 (byte/word/long) to store the 'bits' and 'codes' tables.
08265a63313e added MJPEG decoder + comments
glantau
parents: 20
diff changeset
309 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
310 int init_vlc(VLC *vlc, int nb_bits, int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
311 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
312 const void *codes, int codes_wrap, int codes_size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
313 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
314 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
315 vlc->table = NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
316 vlc->table_allocated = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
317 vlc->table_size = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
318 #ifdef DEBUG_VLC
986e461dc072 Initial revision
glantau
parents:
diff changeset
319 printf("build table nb_codes=%d\n", nb_codes);
986e461dc072 Initial revision
glantau
parents:
diff changeset
320 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
321
986e461dc072 Initial revision
glantau
parents:
diff changeset
322 if (build_table(vlc, nb_bits, nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
323 bits, bits_wrap, bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
324 codes, codes_wrap, codes_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
325 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
326 av_free(vlc->table);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
327 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
328 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
329 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
330 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
331
986e461dc072 Initial revision
glantau
parents:
diff changeset
332
986e461dc072 Initial revision
glantau
parents:
diff changeset
333 void free_vlc(VLC *vlc)
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 {
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
335 av_free(vlc->table);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
336 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
337
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 277
diff changeset
338 int ff_gcd(int a, int b){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 277
diff changeset
339 if(b) return ff_gcd(b, a%b);
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 277
diff changeset
340 else return a;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 277
diff changeset
341 }
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
342
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
343 void ff_float2fraction(int *nom_arg, int *denom_arg, double f, int max){
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
344 double best_diff=1E10, diff;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
345 int best_denom=1, best_nom=1;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
346 int nom, denom, gcd;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
347
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
348 //brute force here, perhaps we should try continued fractions if we need large max ...
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
349 for(denom=1; denom<=max; denom++){
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
350 nom= (int)(f*denom + 0.5);
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
351 if(nom<=0 || nom>max) continue;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
352
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
353 diff= ABS( f - (double)nom / (double)denom );
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
354 if(diff < best_diff){
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
355 best_diff= diff;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
356 best_nom= nom;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
357 best_denom= denom;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
358 }
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
359 }
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
360
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
361 gcd= ff_gcd(best_nom, best_denom);
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
362 best_nom /= gcd;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
363 best_denom /= gcd;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
364
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
365 *nom_arg= best_nom;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
366 *denom_arg= best_denom;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 862
diff changeset
367 }