Mercurial > libavcodec.hg
annotate dv.c @ 3148:d4d8e5436be7 libavcodec
remove wrong assert()
author | michael |
---|---|
date | Sun, 26 Feb 2006 15:40:08 +0000 |
parents | 99263b3a00e1 |
children | 2679184e8be0 |
rev | line source |
---|---|
723 | 1 /* |
2 * DV decoder | |
3 * Copyright (c) 2002 Fabrice Bellard. | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
4 * Copyright (c) 2004 Roman Shaposhnik. |
723 | 5 * |
2967 | 6 * DV encoder |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
7 * Copyright (c) 2003 Roman Shaposhnik. |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
8 * |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
9 * Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
10 * of DV technical info. |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
11 * |
723 | 12 * This library is free software; you can redistribute it and/or |
13 * modify it under the terms of the GNU Lesser General Public | |
14 * License as published by the Free Software Foundation; either | |
15 * version 2 of the License, or (at your option) any later version. | |
16 * | |
17 * This library is distributed in the hope that it will be useful, | |
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
20 * Lesser General Public License for more details. | |
21 * | |
22 * You should have received a copy of the GNU Lesser General Public | |
23 * License along with this library; if not, write to the Free Software | |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3016
diff
changeset
|
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
723 | 25 */ |
1106 | 26 |
27 /** | |
28 * @file dv.c | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
29 * DV codec. |
1106 | 30 */ |
723 | 31 #include "avcodec.h" |
32 #include "dsputil.h" | |
33 #include "mpegvideo.h" | |
34 #include "simple_idct.h" | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
35 #include "dvdata.h" |
723 | 36 |
2847 | 37 //#undef NDEBUG |
38 //#include <assert.h> | |
39 | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
40 typedef struct DVVideoContext { |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
41 const DVprofile* sys; |
925 | 42 AVFrame picture; |
2847 | 43 AVCodecContext *avctx; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
44 uint8_t *buf; |
2967 | 45 |
1064 | 46 uint8_t dv_zigzag[2][64]; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
47 uint8_t dv_idct_shift[2][2][22][64]; |
2967 | 48 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
49 void (*get_pixels)(DCTELEM *block, const uint8_t *pixels, int line_size); |
1567 | 50 void (*fdct[2])(DCTELEM *block); |
51 void (*idct_put[2])(uint8_t *dest, int line_size, DCTELEM *block); | |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
52 } DVVideoContext; |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
53 |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
54 /* MultiThreading - applies to entire DV codec, not just the avcontext */ |
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
55 uint8_t** dv_anchor; |
723 | 56 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
57 #define TEX_VLC_BITS 9 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
58 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
59 #ifdef DV_CODEC_TINY_TARGET |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
60 #define DV_VLC_MAP_RUN_SIZE 15 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
61 #define DV_VLC_MAP_LEV_SIZE 23 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
62 #else |
2967 | 63 #define DV_VLC_MAP_RUN_SIZE 64 |
2847 | 64 #define DV_VLC_MAP_LEV_SIZE 512 //FIXME sign was removed so this should be /2 but needs check |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
65 #endif |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
66 |
723 | 67 /* XXX: also include quantization */ |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
68 static RL_VLC_ELEM *dv_rl_vlc; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
69 /* VLC encoding lookup table */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
70 static struct dv_vlc_pair { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
71 uint32_t vlc; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
72 uint8_t size; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
73 } (*dv_vlc_map)[DV_VLC_MAP_LEV_SIZE] = NULL; |
723 | 74 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
75 static void dv_build_unquantize_tables(DVVideoContext *s, uint8_t* perm) |
723 | 76 { |
725 | 77 int i, q, j; |
723 | 78 |
79 /* NOTE: max left shift is 6 */ | |
725 | 80 for(q = 0; q < 22; q++) { |
1567 | 81 /* 88DCT */ |
725 | 82 for(i = 1; i < 64; i++) { |
83 /* 88 table */ | |
1567 | 84 j = perm[i]; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
85 s->dv_idct_shift[0][0][q][j] = |
725 | 86 dv_quant_shifts[q][dv_88_areas[i]] + 1; |
2979 | 87 s->dv_idct_shift[1][0][q][j] = s->dv_idct_shift[0][0][q][j] + 1; |
725 | 88 } |
2967 | 89 |
1567 | 90 /* 248DCT */ |
725 | 91 for(i = 1; i < 64; i++) { |
92 /* 248 table */ | |
2967 | 93 s->dv_idct_shift[0][1][q][i] = |
1567 | 94 dv_quant_shifts[q][dv_248_areas[i]] + 1; |
2979 | 95 s->dv_idct_shift[1][1][q][i] = s->dv_idct_shift[0][1][q][i] + 1; |
723 | 96 } |
97 } | |
98 } | |
99 | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
100 static int dvvideo_init(AVCodecContext *avctx) |
723 | 101 { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
102 DVVideoContext *s = avctx->priv_data; |
1567 | 103 DSPContext dsp; |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
104 static int done=0; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
105 int i, j; |
723 | 106 |
107 if (!done) { | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
108 VLC dv_vlc; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
109 uint16_t new_dv_vlc_bits[NB_DV_VLC*2]; |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
110 uint8_t new_dv_vlc_len[NB_DV_VLC*2]; |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
111 uint8_t new_dv_vlc_run[NB_DV_VLC*2]; |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
112 int16_t new_dv_vlc_level[NB_DV_VLC*2]; |
723 | 113 |
114 done = 1; | |
115 | |
2845
d9f4b93e81c5
Fix for memleak in dv.c patch by (Burkhard Plaum; plaum, ipf uni-stuttgart de)
michael
parents:
2822
diff
changeset
|
116 dv_vlc_map = av_mallocz_static(DV_VLC_MAP_LEV_SIZE*DV_VLC_MAP_RUN_SIZE*sizeof(struct dv_vlc_pair)); |
2979 | 117 if (!dv_vlc_map) |
118 return -ENOMEM; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
119 |
2979 | 120 /* dv_anchor lets each thread know its Id */ |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
121 dv_anchor = av_malloc(12*27*sizeof(void*)); |
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
122 if (!dv_anchor) { |
2979 | 123 return -ENOMEM; |
124 } | |
125 for (i=0; i<12*27; i++) | |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
126 dv_anchor[i] = (void*)(size_t)i; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
127 |
2979 | 128 /* it's faster to include sign bit in a generic VLC parsing scheme */ |
129 for (i=0, j=0; i<NB_DV_VLC; i++, j++) { | |
130 new_dv_vlc_bits[j] = dv_vlc_bits[i]; | |
131 new_dv_vlc_len[j] = dv_vlc_len[i]; | |
132 new_dv_vlc_run[j] = dv_vlc_run[i]; | |
133 new_dv_vlc_level[j] = dv_vlc_level[i]; | |
2967 | 134 |
2979 | 135 if (dv_vlc_level[i]) { |
136 new_dv_vlc_bits[j] <<= 1; | |
137 new_dv_vlc_len[j]++; | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
138 |
2979 | 139 j++; |
140 new_dv_vlc_bits[j] = (dv_vlc_bits[i] << 1) | 1; | |
141 new_dv_vlc_len[j] = dv_vlc_len[i] + 1; | |
142 new_dv_vlc_run[j] = dv_vlc_run[i]; | |
143 new_dv_vlc_level[j] = -dv_vlc_level[i]; | |
144 } | |
145 } | |
2967 | 146 |
723 | 147 /* NOTE: as a trick, we use the fact the no codes are unused |
148 to accelerate the parsing of partial codes */ | |
2967 | 149 init_vlc(&dv_vlc, TEX_VLC_BITS, j, |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2247
diff
changeset
|
150 new_dv_vlc_len, 1, 1, new_dv_vlc_bits, 2, 2, 0); |
723 | 151 |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
152 dv_rl_vlc = av_mallocz_static(dv_vlc.table_size * sizeof(RL_VLC_ELEM)); |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
153 if (!dv_rl_vlc) |
2979 | 154 return -ENOMEM; |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
155 |
723 | 156 for(i = 0; i < dv_vlc.table_size; i++){ |
157 int code= dv_vlc.table[i][0]; | |
158 int len = dv_vlc.table[i][1]; | |
159 int level, run; | |
2967 | 160 |
723 | 161 if(len<0){ //more bits needed |
162 run= 0; | |
163 level= code; | |
164 } else { | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
165 run= new_dv_vlc_run[code] + 1; |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
166 level= new_dv_vlc_level[code]; |
723 | 167 } |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
168 dv_rl_vlc[i].len = len; |
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
169 dv_rl_vlc[i].level = level; |
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
170 dv_rl_vlc[i].run = run; |
723 | 171 } |
2979 | 172 free_vlc(&dv_vlc); |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
173 |
2979 | 174 for (i = 0; i < NB_DV_VLC - 1; i++) { |
2027
3a78447c3b53
oops, forgot to commit that change from the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
1994
diff
changeset
|
175 if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) |
2979 | 176 continue; |
2027
3a78447c3b53
oops, forgot to commit that change from the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
1994
diff
changeset
|
177 #ifdef DV_CODEC_TINY_TARGET |
3a78447c3b53
oops, forgot to commit that change from the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
1994
diff
changeset
|
178 if (dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) |
2979 | 179 continue; |
2027
3a78447c3b53
oops, forgot to commit that change from the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
1994
diff
changeset
|
180 #endif |
2967 | 181 |
2979 | 182 if (dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size != 0) |
183 continue; | |
2967 | 184 |
2979 | 185 dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].vlc = dv_vlc_bits[i] << |
186 (!!dv_vlc_level[i]); | |
187 dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size = dv_vlc_len[i] + | |
188 (!!dv_vlc_level[i]); | |
189 } | |
190 for (i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) { | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
191 #ifdef DV_CODEC_TINY_TARGET |
2979 | 192 for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) { |
193 if (dv_vlc_map[i][j].size == 0) { | |
194 dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | | |
195 (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size)); | |
196 dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size + | |
197 dv_vlc_map[0][j].size; | |
198 } | |
199 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
200 #else |
2979 | 201 for (j = 1; j < DV_VLC_MAP_LEV_SIZE/2; j++) { |
202 if (dv_vlc_map[i][j].size == 0) { | |
203 dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | | |
204 (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size)); | |
205 dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size + | |
206 dv_vlc_map[0][j].size; | |
207 } | |
208 dv_vlc_map[i][((uint16_t)(-j))&0x1ff].vlc = | |
209 dv_vlc_map[i][j].vlc | 1; | |
210 dv_vlc_map[i][((uint16_t)(-j))&0x1ff].size = | |
211 dv_vlc_map[i][j].size; | |
212 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
213 #endif |
2979 | 214 } |
723 | 215 } |
725 | 216 |
1567 | 217 /* Generic DSP setup */ |
218 dsputil_init(&dsp, avctx); | |
219 s->get_pixels = dsp.get_pixels; | |
725 | 220 |
1567 | 221 /* 88DCT setup */ |
222 s->fdct[0] = dsp.fdct; | |
223 s->idct_put[0] = dsp.idct_put; | |
224 for (i=0; i<64; i++) | |
225 s->dv_zigzag[0][i] = dsp.idct_permutation[ff_zigzag_direct[i]]; | |
725 | 226 |
1567 | 227 /* 248DCT setup */ |
228 s->fdct[1] = dsp.fdct248; | |
229 s->idct_put[1] = simple_idct248_put; // FIXME: need to add it to DSP | |
2849 | 230 if(avctx->lowres){ |
231 for (i=0; i<64; i++){ | |
232 int j= ff_zigzag248_direct[i]; | |
233 s->dv_zigzag[1][i] = dsp.idct_permutation[(j&7) + (j&8)*4 + (j&48)/2]; | |
234 } | |
235 }else | |
236 memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64); | |
725 | 237 |
723 | 238 /* XXX: do it only for constant case */ |
1567 | 239 dv_build_unquantize_tables(s, dsp.idct_permutation); |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
240 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
241 /* FIXME: I really don't think this should be here */ |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
242 if (dv_codec_profile(avctx)) |
2979 | 243 avctx->pix_fmt = dv_codec_profile(avctx)->pix_fmt; |
1543
7542cb99b950
* providing MPEG codecs with a generic fields in AVFrame to use.
romansh
parents:
1540
diff
changeset
|
244 avctx->coded_frame = &s->picture; |
2847 | 245 s->avctx= avctx; |
2967 | 246 |
723 | 247 return 0; |
248 } | |
249 | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
250 // #define VLC_DEBUG |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
251 // #define printf(...) av_log(NULL, AV_LOG_ERROR, __VA_ARGS__) |
723 | 252 |
725 | 253 typedef struct BlockInfo { |
1064 | 254 const uint8_t *shift_table; |
255 const uint8_t *scan_table; | |
256 uint8_t pos; /* position in block */ | |
257 uint8_t dct_mode; | |
258 uint8_t partial_bit_count; | |
259 uint16_t partial_bit_buffer; | |
725 | 260 int shift_offset; |
261 } BlockInfo; | |
723 | 262 |
263 /* block size in bits */ | |
1064 | 264 static const uint16_t block_sizes[6] = { |
723 | 265 112, 112, 112, 112, 80, 80 |
266 }; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
267 /* bit budget for AC only in 5 MBs */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
268 static const int vs_total_ac_bits = (100 * 4 + 68*2) * 5; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
269 /* see dv_88_areas and dv_248_areas for details */ |
2967 | 270 static const int mb_area_start[5] = { 1, 6, 21, 43, 64 }; |
723 | 271 |
272 #ifndef ALT_BITSTREAM_READER | |
1256
b8e1c17b8d7d
some libmpeg2 style bitstream reader fixes (no dv doesnt yet work with it)
michaelni
parents:
1228
diff
changeset
|
273 #warning only works with ALT_BITSTREAM_READER |
2614
5e24800ab329
various fixes related to the non alt_bitstream_reader
michael
parents:
2453
diff
changeset
|
274 static int re_index; //Hack to make it compile |
723 | 275 #endif |
276 | |
1895
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
277 static inline int get_bits_left(GetBitContext *s) |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
278 { |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
279 return s->size_in_bits - get_bits_count(s); |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
280 } |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
281 |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
282 static inline int get_bits_size(GetBitContext *s) |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
283 { |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
284 return s->size_in_bits; |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
285 } |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
286 |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
287 static inline int put_bits_left(PutBitContext* s) |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
288 { |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
289 return (s->buf_end - s->buf) * 8 - put_bits_count(s); |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
290 } |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
291 |
723 | 292 /* decode ac coefs */ |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
293 static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, DCTELEM *block) |
723 | 294 { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
295 int last_index = get_bits_size(gb); |
1064 | 296 const uint8_t *scan_table = mb->scan_table; |
297 const uint8_t *shift_table = mb->shift_table; | |
725 | 298 int pos = mb->pos; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
299 int partial_bit_count = mb->partial_bit_count; |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
300 int level, pos1, run, vlc_len, index; |
2967 | 301 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
302 OPEN_READER(re, gb); |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
303 UPDATE_CACHE(re, gb); |
2967 | 304 |
723 | 305 /* if we must parse a partial vlc, we do it here */ |
306 if (partial_bit_count > 0) { | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
307 re_cache = ((unsigned)re_cache >> partial_bit_count) | |
2979 | 308 (mb->partial_bit_buffer << (sizeof(re_cache)*8 - partial_bit_count)); |
309 re_index -= partial_bit_count; | |
310 mb->partial_bit_count = 0; | |
723 | 311 } |
312 | |
313 /* get the AC coefficients until last_index is reached */ | |
314 for(;;) { | |
315 #ifdef VLC_DEBUG | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
316 printf("%2d: bits=%04x index=%d\n", pos, SHOW_UBITS(re, gb, 16), re_index); |
723 | 317 #endif |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
318 /* our own optimized GET_RL_VLC */ |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
319 index = NEG_USR32(re_cache, TEX_VLC_BITS); |
2979 | 320 vlc_len = dv_rl_vlc[index].len; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
321 if (vlc_len < 0) { |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
322 index = NEG_USR32((unsigned)re_cache << TEX_VLC_BITS, -vlc_len) + dv_rl_vlc[index].level; |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
323 vlc_len = TEX_VLC_BITS - vlc_len; |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
324 } |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
325 level = dv_rl_vlc[index].level; |
2979 | 326 run = dv_rl_vlc[index].run; |
2967 | 327 |
2979 | 328 /* gotta check if we're still within gb boundaries */ |
329 if (re_index + vlc_len > last_index) { | |
330 /* should be < 16 bits otherwise a codeword could have been parsed */ | |
331 mb->partial_bit_count = last_index - re_index; | |
332 mb->partial_bit_buffer = NEG_USR32(re_cache, mb->partial_bit_count); | |
333 re_index = last_index; | |
334 break; | |
335 } | |
336 re_index += vlc_len; | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
337 |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
338 #ifdef VLC_DEBUG |
2979 | 339 printf("run=%d level=%d\n", run, level); |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
340 #endif |
2979 | 341 pos += run; |
342 if (pos >= 64) | |
343 break; | |
2967 | 344 |
2847 | 345 pos1 = scan_table[pos]; |
346 block[pos1] = level << shift_table[pos1]; | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
347 |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
348 UPDATE_CACHE(re, gb); |
723 | 349 } |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
350 CLOSE_READER(re, gb); |
725 | 351 mb->pos = pos; |
723 | 352 } |
353 | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
354 static inline void bit_copy(PutBitContext *pb, GetBitContext *gb) |
723 | 355 { |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
356 int bits_left = get_bits_left(gb); |
2847 | 357 while (bits_left >= MIN_CACHE_BITS) { |
358 put_bits(pb, MIN_CACHE_BITS, get_bits(gb, MIN_CACHE_BITS)); | |
359 bits_left -= MIN_CACHE_BITS; | |
723 | 360 } |
361 if (bits_left > 0) { | |
362 put_bits(pb, bits_left, get_bits(gb, bits_left)); | |
363 } | |
364 } | |
365 | |
366 /* mb_x and mb_y are in units of 8 pixels */ | |
2967 | 367 static inline void dv_decode_video_segment(DVVideoContext *s, |
368 uint8_t *buf_ptr1, | |
1064 | 369 const uint16_t *mb_pos_ptr) |
723 | 370 { |
371 int quant, dc, dct_mode, class1, j; | |
372 int mb_index, mb_x, mb_y, v, last_index; | |
373 DCTELEM *block, *block1; | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
374 int c_offset; |
1064 | 375 uint8_t *y_ptr; |
376 void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block); | |
377 uint8_t *buf_ptr; | |
723 | 378 PutBitContext pb, vs_pb; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
379 GetBitContext gb; |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
380 BlockInfo mb_data[5 * 6], *mb, *mb1; |
3089 | 381 DECLARE_ALIGNED_8(DCTELEM, sblock[5*6][64]); |
382 DECLARE_ALIGNED_8(uint8_t, mb_bit_buffer[80 + 4]); /* allow some slack */ | |
383 DECLARE_ALIGNED_8(uint8_t, vs_bit_buffer[5 * 80 + 4]); /* allow some slack */ | |
2849 | 384 const int log2_blocksize= 3-s->avctx->lowres; |
2967 | 385 |
2847 | 386 assert((((int)mb_bit_buffer)&7)==0); |
387 assert((((int)vs_bit_buffer)&7)==0); | |
2967 | 388 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
389 memset(sblock, 0, sizeof(sblock)); |
723 | 390 |
391 /* pass 1 : read DC and AC coefficients in blocks */ | |
392 buf_ptr = buf_ptr1; | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
393 block1 = &sblock[0][0]; |
725 | 394 mb1 = mb_data; |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1507
diff
changeset
|
395 init_put_bits(&vs_pb, vs_bit_buffer, 5 * 80); |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
396 for(mb_index = 0; mb_index < 5; mb_index++, mb1 += 6, block1 += 6 * 64) { |
723 | 397 /* skip header */ |
398 quant = buf_ptr[3] & 0x0f; | |
399 buf_ptr += 4; | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1507
diff
changeset
|
400 init_put_bits(&pb, mb_bit_buffer, 80); |
725 | 401 mb = mb1; |
723 | 402 block = block1; |
403 for(j = 0;j < 6; j++) { | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
404 last_index = block_sizes[j]; |
2979 | 405 init_get_bits(&gb, buf_ptr, last_index); |
2967 | 406 |
723 | 407 /* get the dc */ |
2247 | 408 dc = get_sbits(&gb, 9); |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
409 dct_mode = get_bits1(&gb); |
725 | 410 mb->dct_mode = dct_mode; |
411 mb->scan_table = s->dv_zigzag[dct_mode]; | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
412 class1 = get_bits(&gb, 2); |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
413 mb->shift_table = s->dv_idct_shift[class1 == 3][dct_mode] |
723 | 414 [quant + dv_quant_offset[class1]]; |
415 dc = dc << 2; | |
416 /* convert to unsigned because 128 is not added in the | |
417 standard IDCT */ | |
418 dc += 1024; | |
419 block[0] = dc; | |
420 buf_ptr += last_index >> 3; | |
725 | 421 mb->pos = 0; |
422 mb->partial_bit_count = 0; | |
723 | 423 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
424 #ifdef VLC_DEBUG |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
425 printf("MB block: %d, %d ", mb_index, j); |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
426 #endif |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
427 dv_decode_ac(&gb, mb, block); |
723 | 428 |
429 /* write the remaining bits in a new buffer only if the | |
430 block is finished */ | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
431 if (mb->pos >= 64) |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
432 bit_copy(&pb, &gb); |
2967 | 433 |
723 | 434 block += 64; |
725 | 435 mb++; |
723 | 436 } |
2967 | 437 |
723 | 438 /* pass 2 : we can do it just after */ |
439 #ifdef VLC_DEBUG | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
440 printf("***pass 2 size=%d MB#=%d\n", put_bits_count(&pb), mb_index); |
723 | 441 #endif |
442 block = block1; | |
725 | 443 mb = mb1; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
444 init_get_bits(&gb, mb_bit_buffer, put_bits_count(&pb)); |
2979 | 445 flush_put_bits(&pb); |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
446 for(j = 0;j < 6; j++, block += 64, mb++) { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
447 if (mb->pos < 64 && get_bits_left(&gb) > 0) { |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
448 dv_decode_ac(&gb, mb, block); |
723 | 449 /* if still not finished, no need to parse other blocks */ |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
450 if (mb->pos < 64) |
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
451 break; |
723 | 452 } |
453 } | |
454 /* all blocks are finished, so the extra bytes can be used at | |
455 the video segment level */ | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
456 if (j >= 6) |
2979 | 457 bit_copy(&vs_pb, &gb); |
723 | 458 } |
459 | |
460 /* we need a pass other the whole video segment */ | |
461 #ifdef VLC_DEBUG | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
462 printf("***pass 3 size=%d\n", put_bits_count(&vs_pb)); |
723 | 463 #endif |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
464 block = &sblock[0][0]; |
723 | 465 mb = mb_data; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
466 init_get_bits(&gb, vs_bit_buffer, put_bits_count(&vs_pb)); |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
467 flush_put_bits(&vs_pb); |
723 | 468 for(mb_index = 0; mb_index < 5; mb_index++) { |
469 for(j = 0;j < 6; j++) { | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
470 if (mb->pos < 64) { |
723 | 471 #ifdef VLC_DEBUG |
472 printf("start %d:%d\n", mb_index, j); | |
473 #endif | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
474 dv_decode_ac(&gb, mb, block); |
723 | 475 } |
2979 | 476 if (mb->pos >= 64 && mb->pos < 127) |
477 av_log(NULL, AV_LOG_ERROR, "AC EOB marker is absent pos=%d\n", mb->pos); | |
723 | 478 block += 64; |
725 | 479 mb++; |
723 | 480 } |
481 } | |
2967 | 482 |
723 | 483 /* compute idct and place blocks */ |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
484 block = &sblock[0][0]; |
723 | 485 mb = mb_data; |
486 for(mb_index = 0; mb_index < 5; mb_index++) { | |
487 v = *mb_pos_ptr++; | |
488 mb_x = v & 0xff; | |
489 mb_y = v >> 8; | |
2849 | 490 y_ptr = s->picture.data[0] + ((mb_y * s->picture.linesize[0] + mb_x)<<log2_blocksize); |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
491 if (s->sys->pix_fmt == PIX_FMT_YUV411P) |
2849 | 492 c_offset = ((mb_y * s->picture.linesize[1] + (mb_x >> 2))<<log2_blocksize); |
723 | 493 else |
2849 | 494 c_offset = (((mb_y >> 1) * s->picture.linesize[1] + (mb_x >> 1))<<log2_blocksize); |
723 | 495 for(j = 0;j < 6; j++) { |
2849 | 496 idct_put = s->idct_put[mb->dct_mode && log2_blocksize==3]; |
723 | 497 if (j < 4) { |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
498 if (s->sys->pix_fmt == PIX_FMT_YUV411P && mb_x < (704 / 8)) { |
737 | 499 /* NOTE: at end of line, the macroblock is handled as 420 */ |
2849 | 500 idct_put(y_ptr + (j<<log2_blocksize), s->picture.linesize[0], block); |
723 | 501 } else { |
2849 | 502 idct_put(y_ptr + (((j & 1) + (j >> 1) * s->picture.linesize[0])<<log2_blocksize), |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
503 s->picture.linesize[0], block); |
723 | 504 } |
505 } else { | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
506 if (s->sys->pix_fmt == PIX_FMT_YUV411P && mb_x >= (704 / 8)) { |
1540 | 507 uint64_t aligned_pixels[64/8]; |
1537 | 508 uint8_t *pixels= (uint8_t*)aligned_pixels; |
2979 | 509 uint8_t *c_ptr, *c_ptr1, *ptr, *ptr1; |
2849 | 510 int x, y, linesize; |
737 | 511 /* NOTE: at end of line, the macroblock is handled as 420 */ |
512 idct_put(pixels, 8, block); | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
513 linesize = s->picture.linesize[6 - j]; |
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
514 c_ptr = s->picture.data[6 - j] + c_offset; |
737 | 515 ptr = pixels; |
2849 | 516 for(y = 0;y < (1<<log2_blocksize); y++) { |
517 ptr1= ptr + (1<<(log2_blocksize-1)); | |
518 c_ptr1 = c_ptr + (linesize<<log2_blocksize); | |
519 for(x=0; x < (1<<(log2_blocksize-1)); x++){ | |
520 c_ptr[x]= ptr[x]; c_ptr1[x]= ptr1[x]; | |
521 } | |
1270
f5318caa93f4
seems i guessed correctly (last 411 chroma block isnt scaled but cut and reordered)
michaelni
parents:
1256
diff
changeset
|
522 c_ptr += linesize; |
737 | 523 ptr += 8; |
524 } | |
525 } else { | |
526 /* don't ask me why they inverted Cb and Cr ! */ | |
2967 | 527 idct_put(s->picture.data[6 - j] + c_offset, |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
528 s->picture.linesize[6 - j], block); |
737 | 529 } |
723 | 530 } |
531 block += 64; | |
725 | 532 mb++; |
723 | 533 } |
534 } | |
535 } | |
536 | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
537 #ifdef DV_CODEC_TINY_TARGET |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
538 /* Converts run and level (where level != 0) pair into vlc, returning bit size */ |
2847 | 539 static always_inline int dv_rl2vlc(int run, int level, int sign, uint32_t* vlc) |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
540 { |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
541 int size; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
542 if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
543 *vlc = dv_vlc_map[run][level].vlc | sign; |
2979 | 544 size = dv_vlc_map[run][level].size; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
545 } |
2967 | 546 else { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
547 if (level < DV_VLC_MAP_LEV_SIZE) { |
2979 | 548 *vlc = dv_vlc_map[0][level].vlc | sign; |
549 size = dv_vlc_map[0][level].size; | |
550 } else { | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
551 *vlc = 0xfe00 | (level << 1) | sign; |
2979 | 552 size = 16; |
553 } | |
554 if (run) { | |
555 *vlc |= ((run < 16) ? dv_vlc_map[run-1][0].vlc : | |
556 (0x1f80 | (run - 1))) << size; | |
557 size += (run < 16) ? dv_vlc_map[run-1][0].size : 13; | |
558 } | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
559 } |
2967 | 560 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
561 return size; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
562 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
563 |
2847 | 564 static always_inline int dv_rl2vlc_size(int run, int level) |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
565 { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
566 int size; |
2967 | 567 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
568 if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) { |
2979 | 569 size = dv_vlc_map[run][level].size; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
570 } |
2967 | 571 else { |
2979 | 572 size = (level < DV_VLC_MAP_LEV_SIZE) ? dv_vlc_map[0][level].size : 16; |
573 if (run) { | |
574 size += (run < 16) ? dv_vlc_map[run-1][0].size : 13; | |
575 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
576 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
577 return size; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
578 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
579 #else |
2847 | 580 static always_inline int dv_rl2vlc(int run, int l, int sign, uint32_t* vlc) |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
581 { |
2847 | 582 *vlc = dv_vlc_map[run][l].vlc | sign; |
583 return dv_vlc_map[run][l].size; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
584 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
585 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
586 static always_inline int dv_rl2vlc_size(int run, int l) |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
587 { |
2847 | 588 return dv_vlc_map[run][l].size; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
589 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
590 #endif |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
591 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
592 typedef struct EncBlockInfo { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
593 int area_q[4]; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
594 int bit_size[4]; |
2847 | 595 int prev[5]; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
596 int cur_ac; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
597 int cno; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
598 int dct_mode; |
2847 | 599 DCTELEM mb[64]; |
600 uint8_t next[64]; | |
601 uint8_t sign[64]; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
602 uint8_t partial_bit_count; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
603 uint32_t partial_bit_buffer; /* we can't use uint16_t here */ |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
604 } EncBlockInfo; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
605 |
2967 | 606 static always_inline PutBitContext* dv_encode_ac(EncBlockInfo* bi, PutBitContext* pb_pool, |
2847 | 607 PutBitContext* pb_end) |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
608 { |
2847 | 609 int prev; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
610 int bits_left; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
611 PutBitContext* pb = pb_pool; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
612 int size = bi->partial_bit_count; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
613 uint32_t vlc = bi->partial_bit_buffer; |
2847 | 614 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
615 bi->partial_bit_count = bi->partial_bit_buffer = 0; |
2847 | 616 for(;;){ |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
617 /* Find suitable storage space */ |
1875
45a1592dadca
* moving some of the commonly used bit reading/writing functions
romansh
parents:
1726
diff
changeset
|
618 for (; size > (bits_left = put_bits_left(pb)); pb++) { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
619 if (bits_left) { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
620 size -= bits_left; |
2979 | 621 put_bits(pb, bits_left, vlc >> size); |
622 vlc = vlc & ((1<<size)-1); | |
623 } | |
624 if (pb + 1 >= pb_end) { | |
625 bi->partial_bit_count = size; | |
626 bi->partial_bit_buffer = vlc; | |
627 return pb; | |
628 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
629 } |
2967 | 630 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
631 /* Store VLC */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
632 put_bits(pb, size, vlc); |
2967 | 633 |
2847 | 634 if(bi->cur_ac>=64) |
635 break; | |
2967 | 636 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
637 /* Construct the next VLC */ |
2847 | 638 prev= bi->cur_ac; |
639 bi->cur_ac = bi->next[prev]; | |
640 if(bi->cur_ac < 64){ | |
641 size = dv_rl2vlc(bi->cur_ac - prev - 1, bi->mb[bi->cur_ac], bi->sign[bi->cur_ac], &vlc); | |
642 } else { | |
643 size = 4; vlc = 6; /* End Of Block stamp */ | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
644 } |
2847 | 645 } |
646 return pb; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
647 } |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
648 |
2967 | 649 static always_inline void dv_set_class_number(DCTELEM* blk, EncBlockInfo* bi, |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
650 const uint8_t* zigzag_scan, int bias) |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
651 { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
652 int i, area; |
2847 | 653 static const int classes[] = {12, 24, 36, 0xffff}; |
654 int max=12; | |
655 int prev=0; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
656 |
2967 | 657 bi->mb[0] = blk[0]; |
658 | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
659 for (area = 0; area < 4; area++) { |
2847 | 660 bi->prev[area] = prev; |
661 bi->bit_size[area] = 1; // 4 areas 4 bits for EOB :) | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
662 for (i=mb_area_start[area]; i<mb_area_start[area+1]; i++) { |
2847 | 663 int level = blk[zigzag_scan[i]]; |
2967 | 664 |
2847 | 665 if (level+15 > 30U) { |
666 bi->sign[i] = (level>>31)&1; | |
667 bi->mb[i] = level= ABS(level)>>4; | |
668 if(level>max) max= level; | |
669 bi->bit_size[area] += dv_rl2vlc_size(i - prev - 1, level); | |
670 bi->next[prev]= i; | |
671 prev= i; | |
672 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
673 } |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
674 } |
2847 | 675 bi->next[prev]= i; |
676 for(bi->cno = 0; max > classes[bi->cno]; bi->cno++); | |
677 | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
678 bi->cno += bias; |
2967 | 679 |
2847 | 680 if (bi->cno >= 3) { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
681 bi->cno = 3; |
2847 | 682 prev=0; |
683 i= bi->next[prev]; | |
684 for (area = 0; area < 4; area++) { | |
685 bi->prev[area] = prev; | |
686 bi->bit_size[area] = 1; // 4 areas 4 bits for EOB :) | |
687 for (; i<mb_area_start[area+1]; i= bi->next[i]) { | |
688 bi->mb[i] >>=1; | |
2967 | 689 |
2847 | 690 if (bi->mb[i]) { |
691 bi->bit_size[area] += dv_rl2vlc_size(i - prev - 1, bi->mb[i]); | |
692 bi->next[prev]= i; | |
693 prev= i; | |
694 } | |
695 } | |
696 } | |
697 bi->next[prev]= i; | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
698 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
699 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
700 |
2847 | 701 //FIXME replace this by dsputil |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
702 #define SC(x, y) ((s[x] - s[y]) ^ ((s[x] - s[y]) >> 7)) |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
703 static always_inline int dv_guess_dct_mode(DCTELEM *blk) { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
704 DCTELEM *s; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
705 int score88 = 0; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
706 int score248 = 0; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
707 int i; |
2967 | 708 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
709 /* Compute 8-8 score (small values give a better chance for 8-8 DCT) */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
710 s = blk; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
711 for(i=0; i<7; i++) { |
2967 | 712 score88 += SC(0, 8) + SC(1, 9) + SC(2, 10) + SC(3, 11) + |
2979 | 713 SC(4, 12) + SC(5,13) + SC(6, 14) + SC(7, 15); |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
714 s += 8; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
715 } |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
716 /* Compute 2-4-8 score (small values give a better chance for 2-4-8 DCT) */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
717 s = blk; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
718 for(i=0; i<6; i++) { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
719 score248 += SC(0, 16) + SC(1,17) + SC(2, 18) + SC(3, 19) + |
2979 | 720 SC(4, 20) + SC(5,21) + SC(6, 22) + SC(7, 23); |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
721 s += 8; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
722 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
723 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
724 return (score88 - score248 > -10); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
725 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
726 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
727 static inline void dv_guess_qnos(EncBlockInfo* blks, int* qnos) |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
728 { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
729 int size[5]; |
3140 | 730 int i, j, k, a, prev, a2; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
731 EncBlockInfo* b; |
2847 | 732 |
3146
dcae1bde37ac
size[0-3] are not initialized (and can get random negative trash
michael
parents:
3143
diff
changeset
|
733 size[0] = size[1] = size[2] = size[3] = size[4] = 1<<24; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
734 do { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
735 b = blks; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
736 for (i=0; i<5; i++) { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
737 if (!qnos[i]) |
2979 | 738 continue; |
2967 | 739 |
2979 | 740 qnos[i]--; |
741 size[i] = 0; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
742 for (j=0; j<6; j++, b++) { |
2979 | 743 for (a=0; a<4; a++) { |
744 if (b->area_q[a] != dv_quant_shifts[qnos[i] + dv_quant_offset[b->cno]][a]) { | |
745 b->bit_size[a] = 1; // 4 areas 4 bits for EOB :) | |
746 b->area_q[a]++; | |
2847 | 747 prev= b->prev[a]; |
3147 | 748 assert(b->next[prev] >= mb_area_start[a+1] || b->mb[prev]); |
2847 | 749 for (k= b->next[prev] ; k<mb_area_start[a+1]; k= b->next[k]) { |
2979 | 750 b->mb[k] >>= 1; |
751 if (b->mb[k]) { | |
2847 | 752 b->bit_size[a] += dv_rl2vlc_size(k - prev - 1, b->mb[k]); |
2979 | 753 prev= k; |
2847 | 754 } else { |
3140 | 755 if(b->next[k] >= mb_area_start[a+1] && b->next[k]<64){ |
3146
dcae1bde37ac
size[0-3] are not initialized (and can get random negative trash
michael
parents:
3143
diff
changeset
|
756 for(a2=a+1; b->next[k] >= mb_area_start[a2+1]; a2++) |
dcae1bde37ac
size[0-3] are not initialized (and can get random negative trash
michael
parents:
3143
diff
changeset
|
757 b->prev[a2] = prev; |
3140 | 758 assert(a2<4); |
759 assert(b->mb[b->next[k]]); | |
760 b->bit_size[a2] += dv_rl2vlc_size(b->next[k] - prev - 1, b->mb[b->next[k]]) | |
761 -dv_rl2vlc_size(b->next[k] - k - 1, b->mb[b->next[k]]); | |
3147 | 762 assert(b->prev[a2]==k && (a2+1 >= 4 || b->prev[a2+1]!=k)); |
763 b->prev[a2] = prev; | |
3140 | 764 } |
2847 | 765 b->next[prev] = b->next[k]; |
766 } | |
2979 | 767 } |
2847 | 768 b->prev[a+1]= prev; |
2979 | 769 } |
770 size[i] += b->bit_size[a]; | |
771 } | |
772 } | |
3142 | 773 if(vs_total_ac_bits >= size[0] + size[1] + size[2] + size[3] + size[4]) |
774 return; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
775 } |
3140 | 776 } while (qnos[0]|qnos[1]|qnos[2]|qnos[3]|qnos[4]); |
777 | |
778 | |
779 for(a=2; a==2 || vs_total_ac_bits < size[0]; a+=a){ | |
780 b = blks; | |
3143 | 781 size[0] = 5*6*4; //EOB |
3140 | 782 for (j=0; j<6*5; j++, b++) { |
783 prev= b->prev[0]; | |
784 for (k= b->next[prev]; k<64; k= b->next[k]) { | |
785 if(b->mb[k] < a && b->mb[k] > -a){ | |
786 b->next[prev] = b->next[k]; | |
787 }else{ | |
788 size[0] += dv_rl2vlc_size(k - prev - 1, b->mb[k]); | |
789 prev= k; | |
790 } | |
791 } | |
792 } | |
793 } | |
1567 | 794 } |
795 | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
796 /* |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
797 * This is a very rough initial implementaion. The performance is |
2967 | 798 * horrible and the weighting is missing. But it's missing from the |
1567 | 799 * decoding step also -- so at least we're on the same page with decoder ;-) |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
800 */ |
2967 | 801 static inline void dv_encode_video_segment(DVVideoContext *s, |
802 uint8_t *dif, | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
803 const uint16_t *mb_pos_ptr) |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
804 { |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
805 int mb_index, i, j, v; |
2967 | 806 int mb_x, mb_y, c_offset, linesize; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
807 uint8_t* y_ptr; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
808 uint8_t* data; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
809 uint8_t* ptr; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
810 int do_edge_wrap; |
3089 | 811 DECLARE_ALIGNED_8(DCTELEM, block[64]); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
812 EncBlockInfo enc_blks[5*6]; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
813 PutBitContext pbs[5*6]; |
2967 | 814 PutBitContext* pb; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
815 EncBlockInfo* enc_blk; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
816 int vs_bit_size = 0; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
817 int qnos[5]; |
2967 | 818 |
2847 | 819 assert((((int)block) & 7) == 0); |
2967 | 820 |
1567 | 821 enc_blk = &enc_blks[0]; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
822 pb = &pbs[0]; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
823 for(mb_index = 0; mb_index < 5; mb_index++) { |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
824 v = *mb_pos_ptr++; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
825 mb_x = v & 0xff; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
826 mb_y = v >> 8; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
827 y_ptr = s->picture.data[0] + (mb_y * s->picture.linesize[0] * 8) + (mb_x * 8); |
2979 | 828 c_offset = (s->sys->pix_fmt == PIX_FMT_YUV411P) ? |
829 ((mb_y * s->picture.linesize[1] * 8) + ((mb_x >> 2) * 8)) : | |
830 (((mb_y >> 1) * s->picture.linesize[1] * 8) + ((mb_x >> 1) * 8)); | |
831 do_edge_wrap = 0; | |
832 qnos[mb_index] = 15; /* No quantization */ | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
833 ptr = dif + mb_index*80 + 4; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
834 for(j = 0;j < 6; j++) { |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
835 if (j < 4) { /* Four Y blocks */ |
2979 | 836 /* NOTE: at end of line, the macroblock is handled as 420 */ |
837 if (s->sys->pix_fmt == PIX_FMT_YUV411P && mb_x < (704 / 8)) { | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
838 data = y_ptr + (j * 8); |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
839 } else { |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
840 data = y_ptr + ((j & 1) * 8) + ((j >> 1) * 8 * s->picture.linesize[0]); |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
841 } |
2979 | 842 linesize = s->picture.linesize[0]; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
843 } else { /* Cr and Cb blocks */ |
2979 | 844 /* don't ask Fabrice why they inverted Cb and Cr ! */ |
845 data = s->picture.data[6 - j] + c_offset; | |
846 linesize = s->picture.linesize[6 - j]; | |
847 if (s->sys->pix_fmt == PIX_FMT_YUV411P && mb_x >= (704 / 8)) | |
848 do_edge_wrap = 1; | |
849 } | |
2967 | 850 |
2979 | 851 /* Everything is set up -- now just copy data -> DCT block */ |
852 if (do_edge_wrap) { /* Edge wrap copy: 4x16 -> 8x8 */ | |
853 uint8_t* d; | |
854 DCTELEM *b = block; | |
855 for (i=0;i<8;i++) { | |
856 d = data + 8 * linesize; | |
857 b[0] = data[0]; b[1] = data[1]; b[2] = data[2]; b[3] = data[3]; | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
858 b[4] = d[0]; b[5] = d[1]; b[6] = d[2]; b[7] = d[3]; |
2979 | 859 data += linesize; |
860 b += 8; | |
861 } | |
862 } else { /* Simple copy: 8x8 -> 8x8 */ | |
863 s->get_pixels(block, data, linesize); | |
864 } | |
2967 | 865 |
2847 | 866 if(s->avctx->flags & CODEC_FLAG_INTERLACED_DCT) |
867 enc_blk->dct_mode = dv_guess_dct_mode(block); | |
868 else | |
869 enc_blk->dct_mode = 0; | |
2979 | 870 enc_blk->area_q[0] = enc_blk->area_q[1] = enc_blk->area_q[2] = enc_blk->area_q[3] = 0; |
871 enc_blk->partial_bit_count = 0; | |
872 enc_blk->partial_bit_buffer = 0; | |
873 enc_blk->cur_ac = 0; | |
2967 | 874 |
2979 | 875 s->fdct[enc_blk->dct_mode](block); |
2967 | 876 |
2979 | 877 dv_set_class_number(block, enc_blk, |
878 enc_blk->dct_mode ? ff_zigzag248_direct : ff_zigzag_direct, j/4); | |
2967 | 879 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
880 init_put_bits(pb, ptr, block_sizes[j]/8); |
2979 | 881 put_bits(pb, 9, (uint16_t)(((enc_blk->mb[0] >> 3) - 1024 + 2) >> 2)); |
882 put_bits(pb, 1, enc_blk->dct_mode); | |
883 put_bits(pb, 2, enc_blk->cno); | |
2967 | 884 |
2979 | 885 vs_bit_size += enc_blk->bit_size[0] + enc_blk->bit_size[1] + |
886 enc_blk->bit_size[2] + enc_blk->bit_size[3]; | |
887 ++enc_blk; | |
888 ++pb; | |
889 ptr += block_sizes[j]/8; | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
890 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
891 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
892 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
893 if (vs_total_ac_bits < vs_bit_size) |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
894 dv_guess_qnos(&enc_blks[0], &qnos[0]); |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
895 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
896 for (i=0; i<5; i++) { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
897 dif[i*80 + 3] = qnos[i]; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
898 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
899 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
900 /* First pass over individual cells only */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
901 for (j=0; j<5*6; j++) |
2847 | 902 dv_encode_ac(&enc_blks[j], &pbs[j], &pbs[j+1]); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
903 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
904 /* Second pass over each MB space */ |
2847 | 905 for (j=0; j<5*6; j+=6) { |
906 pb= &pbs[j]; | |
907 for (i=0; i<6; i++) { | |
908 if (enc_blks[i+j].partial_bit_count) | |
909 pb=dv_encode_ac(&enc_blks[i+j], pb, &pbs[j+6]); | |
910 } | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
911 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
912 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
913 /* Third and final pass over the whole vides segment space */ |
2847 | 914 pb= &pbs[0]; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
915 for (j=0; j<5*6; j++) { |
2847 | 916 if (enc_blks[j].partial_bit_count) |
917 pb=dv_encode_ac(&enc_blks[j], pb, &pbs[6*5]); | |
3139
e58fb7ffbb4f
print a big warning if we mess up and run out of space ...
michael
parents:
3089
diff
changeset
|
918 if (enc_blks[j].partial_bit_count) |
e58fb7ffbb4f
print a big warning if we mess up and run out of space ...
michael
parents:
3089
diff
changeset
|
919 av_log(NULL, AV_LOG_ERROR, "ac bitstream overflow\n"); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
920 } |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
921 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
922 for (j=0; j<5*6; j++) |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
923 flush_put_bits(&pbs[j]); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
924 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
925 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
926 static int dv_decode_mt(AVCodecContext *avctx, void* sl) |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
927 { |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
928 DVVideoContext *s = avctx->priv_data; |
1904 | 929 int slice = (size_t)sl; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
930 dv_decode_video_segment(s, &s->buf[((slice/27)*6+(slice/3)+slice*5+7)*80], |
2979 | 931 &s->sys->video_place[slice*5]); |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
932 return 0; |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
933 } |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
934 |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
935 static int dv_encode_mt(AVCodecContext *avctx, void* sl) |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
936 { |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
937 DVVideoContext *s = avctx->priv_data; |
1904 | 938 int slice = (size_t)sl; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
939 dv_encode_video_segment(s, &s->buf[((slice/27)*6+(slice/3)+slice*5+7)*80], |
2979 | 940 &s->sys->video_place[slice*5]); |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
941 return 0; |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
942 } |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
943 |
723 | 944 /* NOTE: exactly one frame must be given (120000 bytes for NTSC, |
945 144000 bytes for PAL) */ | |
2967 | 946 static int dvvideo_decode_frame(AVCodecContext *avctx, |
723 | 947 void *data, int *data_size, |
1064 | 948 uint8_t *buf, int buf_size) |
723 | 949 { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
950 DVVideoContext *s = avctx->priv_data; |
2967 | 951 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
952 s->sys = dv_frame_profile(buf); |
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
953 if (!s->sys || buf_size < s->sys->frame_size) |
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
954 return -1; /* NOTE: we only accept several full frames */ |
723 | 955 |
1228 | 956 if(s->picture.data[0]) |
957 avctx->release_buffer(avctx, &s->picture); | |
2967 | 958 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
959 s->picture.reference = 0; |
2822
fdedaa2e6da4
DV video encoder/decoder doesn't set keyframe and picture type properties patch by (Edward Hervey:bilboed,gmail com)
michael
parents:
2661
diff
changeset
|
960 s->picture.key_frame = 1; |
fdedaa2e6da4
DV video encoder/decoder doesn't set keyframe and picture type properties patch by (Edward Hervey:bilboed,gmail com)
michael
parents:
2661
diff
changeset
|
961 s->picture.pict_type = FF_I_TYPE; |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
962 avctx->pix_fmt = s->sys->pix_fmt; |
2849 | 963 avcodec_set_dimensions(avctx, s->sys->width, s->sys->height); |
903 | 964 if(avctx->get_buffer(avctx, &s->picture) < 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1567
diff
changeset
|
965 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
903 | 966 return -1; |
835 | 967 } |
1543
7542cb99b950
* providing MPEG codecs with a generic fields in AVFrame to use.
romansh
parents:
1540
diff
changeset
|
968 s->picture.interlaced_frame = 1; |
1547 | 969 s->picture.top_field_first = 0; |
835 | 970 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
971 s->buf = buf; |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
972 avctx->execute(avctx, dv_decode_mt, (void**)&dv_anchor[0], NULL, |
2979 | 973 s->sys->difseg_size * 27); |
2967 | 974 |
734
2d6b3e3d6c6f
10l - MMX/FPU state was not restored, causing nonsense fpu behaviour in caller (mplayer)
arpi_esp
parents:
733
diff
changeset
|
975 emms_c(); |
2d6b3e3d6c6f
10l - MMX/FPU state was not restored, causing nonsense fpu behaviour in caller (mplayer)
arpi_esp
parents:
733
diff
changeset
|
976 |
723 | 977 /* return image */ |
925 | 978 *data_size = sizeof(AVFrame); |
979 *(AVFrame*)data= s->picture; | |
2967 | 980 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
981 return s->sys->frame_size; |
723 | 982 } |
983 | |
2967 | 984 static int dvvideo_encode_frame(AVCodecContext *c, uint8_t *buf, int buf_size, |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
985 void *data) |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
986 { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
987 DVVideoContext *s = c->priv_data; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
988 |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
989 s->sys = dv_codec_profile(c); |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
990 if (!s->sys) |
2979 | 991 return -1; |
2422 | 992 if(buf_size < s->sys->frame_size) |
993 return -1; | |
994 | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
995 c->pix_fmt = s->sys->pix_fmt; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
996 s->picture = *((AVFrame *)data); |
2822
fdedaa2e6da4
DV video encoder/decoder doesn't set keyframe and picture type properties patch by (Edward Hervey:bilboed,gmail com)
michael
parents:
2661
diff
changeset
|
997 s->picture.key_frame = 1; |
fdedaa2e6da4
DV video encoder/decoder doesn't set keyframe and picture type properties patch by (Edward Hervey:bilboed,gmail com)
michael
parents:
2661
diff
changeset
|
998 s->picture.pict_type = FF_I_TYPE; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
999 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1000 s->buf = buf; |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
1001 c->execute(c, dv_encode_mt, (void**)&dv_anchor[0], NULL, |
2979 | 1002 s->sys->difseg_size * 27); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1003 |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1004 emms_c(); |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1005 return s->sys->frame_size; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1006 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1007 |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1008 static int dvvideo_close(AVCodecContext *c) |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1009 { |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1010 |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1011 return 0; |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1012 } |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1013 |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1014 |
2661
b2846918585c
a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net]
michael
parents:
2614
diff
changeset
|
1015 #ifdef CONFIG_DVVIDEO_ENCODER |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1016 AVCodec dvvideo_encoder = { |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1017 "dvvideo", |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1018 CODEC_TYPE_VIDEO, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1019 CODEC_ID_DVVIDEO, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1020 sizeof(DVVideoContext), |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1021 dvvideo_init, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1022 dvvideo_encode_frame, |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1023 dvvideo_close, |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1024 NULL, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1025 CODEC_CAP_DR1, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1026 NULL |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1027 }; |
2661
b2846918585c
a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net]
michael
parents:
2614
diff
changeset
|
1028 #endif // CONFIG_DVVIDEO_ENCODER |
723 | 1029 |
1030 AVCodec dvvideo_decoder = { | |
1031 "dvvideo", | |
1032 CODEC_TYPE_VIDEO, | |
1033 CODEC_ID_DVVIDEO, | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1034 sizeof(DVVideoContext), |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1035 dvvideo_init, |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1036 NULL, |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1037 dvvideo_close, |
723 | 1038 dvvideo_decode_frame, |
835 | 1039 CODEC_CAP_DR1, |
723 | 1040 NULL |
1041 }; |