Mercurial > libavcodec.hg
annotate dv.c @ 3705:b3149af07681 libavcodec
armv5 optimizations
patch by Siarhei Siamashka siarhei.siamashka at gmail com
author | diego |
---|---|
date | Sun, 10 Sep 2006 22:29:02 +0000 |
parents | 18113845d891 |
children | 20545fbb6f7c |
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 * |
3167 | 9 * 50 Mbps (DVCPRO50) support |
10 * Copyright (c) 2006 Daniel Maas <dmaas@maasdigital.com> | |
11 * | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
12 * 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
|
13 * of DV technical info. |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
14 * |
723 | 15 * This library is free software; you can redistribute it and/or |
16 * modify it under the terms of the GNU Lesser General Public | |
17 * License as published by the Free Software Foundation; either | |
18 * version 2 of the License, or (at your option) any later version. | |
19 * | |
20 * This library is distributed in the hope that it will be useful, | |
21 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
22 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
23 * Lesser General Public License for more details. | |
24 * | |
25 * You should have received a copy of the GNU Lesser General Public | |
26 * 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
|
27 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
723 | 28 */ |
1106 | 29 |
30 /** | |
31 * @file dv.c | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
32 * DV codec. |
1106 | 33 */ |
3649 | 34 #define ALT_BITSTREAM_READER |
723 | 35 #include "avcodec.h" |
36 #include "dsputil.h" | |
37 #include "mpegvideo.h" | |
38 #include "simple_idct.h" | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
39 #include "dvdata.h" |
723 | 40 |
2847 | 41 //#undef NDEBUG |
42 //#include <assert.h> | |
43 | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
44 typedef struct DVVideoContext { |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
45 const DVprofile* sys; |
925 | 46 AVFrame picture; |
2847 | 47 AVCodecContext *avctx; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
48 uint8_t *buf; |
2967 | 49 |
1064 | 50 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
|
51 uint8_t dv_idct_shift[2][2][22][64]; |
2967 | 52 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
53 void (*get_pixels)(DCTELEM *block, const uint8_t *pixels, int line_size); |
1567 | 54 void (*fdct[2])(DCTELEM *block); |
55 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
|
56 } DVVideoContext; |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
57 |
3167 | 58 /* MultiThreading - dv_anchor applies to entire DV codec, not just the avcontext */ |
59 /* one element is needed for each video segment in a DV frame */ | |
60 /* at most there are 2 DIF channels * 12 DIF sequences * 27 video segments (PAL 50Mbps) */ | |
61 #define DV_ANCHOR_SIZE (2*12*27) | |
62 | |
63 static void* dv_anchor[DV_ANCHOR_SIZE]; | |
723 | 64 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
65 #define TEX_VLC_BITS 9 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
66 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
67 #ifdef DV_CODEC_TINY_TARGET |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
68 #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
|
69 #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
|
70 #else |
2967 | 71 #define DV_VLC_MAP_RUN_SIZE 64 |
2847 | 72 #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
|
73 #endif |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
74 |
723 | 75 /* XXX: also include quantization */ |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
76 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
|
77 /* VLC encoding lookup table */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
78 static struct dv_vlc_pair { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
79 uint32_t vlc; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
80 uint8_t size; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
81 } (*dv_vlc_map)[DV_VLC_MAP_LEV_SIZE] = NULL; |
723 | 82 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
83 static void dv_build_unquantize_tables(DVVideoContext *s, uint8_t* perm) |
723 | 84 { |
725 | 85 int i, q, j; |
723 | 86 |
87 /* NOTE: max left shift is 6 */ | |
725 | 88 for(q = 0; q < 22; q++) { |
1567 | 89 /* 88DCT */ |
725 | 90 for(i = 1; i < 64; i++) { |
91 /* 88 table */ | |
1567 | 92 j = perm[i]; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
93 s->dv_idct_shift[0][0][q][j] = |
725 | 94 dv_quant_shifts[q][dv_88_areas[i]] + 1; |
2979 | 95 s->dv_idct_shift[1][0][q][j] = s->dv_idct_shift[0][0][q][j] + 1; |
725 | 96 } |
2967 | 97 |
1567 | 98 /* 248DCT */ |
725 | 99 for(i = 1; i < 64; i++) { |
100 /* 248 table */ | |
2967 | 101 s->dv_idct_shift[0][1][q][i] = |
1567 | 102 dv_quant_shifts[q][dv_248_areas[i]] + 1; |
2979 | 103 s->dv_idct_shift[1][1][q][i] = s->dv_idct_shift[0][1][q][i] + 1; |
723 | 104 } |
105 } | |
106 } | |
107 | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
108 static int dvvideo_init(AVCodecContext *avctx) |
723 | 109 { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
110 DVVideoContext *s = avctx->priv_data; |
1567 | 111 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
|
112 static int done=0; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
113 int i, j; |
723 | 114 |
115 if (!done) { | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
116 VLC dv_vlc; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
117 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
|
118 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
|
119 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
|
120 int16_t new_dv_vlc_level[NB_DV_VLC*2]; |
723 | 121 |
122 done = 1; | |
123 | |
2845
d9f4b93e81c5
Fix for memleak in dv.c patch by (Burkhard Plaum; plaum, ipf uni-stuttgart de)
michael
parents:
2822
diff
changeset
|
124 dv_vlc_map = av_mallocz_static(DV_VLC_MAP_LEV_SIZE*DV_VLC_MAP_RUN_SIZE*sizeof(struct dv_vlc_pair)); |
2979 | 125 if (!dv_vlc_map) |
126 return -ENOMEM; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
127 |
2979 | 128 /* dv_anchor lets each thread know its Id */ |
3167 | 129 for (i=0; i<DV_ANCHOR_SIZE; i++) |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
130 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
|
131 |
2979 | 132 /* it's faster to include sign bit in a generic VLC parsing scheme */ |
133 for (i=0, j=0; i<NB_DV_VLC; i++, j++) { | |
134 new_dv_vlc_bits[j] = dv_vlc_bits[i]; | |
135 new_dv_vlc_len[j] = dv_vlc_len[i]; | |
136 new_dv_vlc_run[j] = dv_vlc_run[i]; | |
137 new_dv_vlc_level[j] = dv_vlc_level[i]; | |
2967 | 138 |
2979 | 139 if (dv_vlc_level[i]) { |
140 new_dv_vlc_bits[j] <<= 1; | |
141 new_dv_vlc_len[j]++; | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
142 |
2979 | 143 j++; |
144 new_dv_vlc_bits[j] = (dv_vlc_bits[i] << 1) | 1; | |
145 new_dv_vlc_len[j] = dv_vlc_len[i] + 1; | |
146 new_dv_vlc_run[j] = dv_vlc_run[i]; | |
147 new_dv_vlc_level[j] = -dv_vlc_level[i]; | |
148 } | |
149 } | |
2967 | 150 |
723 | 151 /* NOTE: as a trick, we use the fact the no codes are unused |
152 to accelerate the parsing of partial codes */ | |
2967 | 153 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
|
154 new_dv_vlc_len, 1, 1, new_dv_vlc_bits, 2, 2, 0); |
723 | 155 |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
156 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
|
157 if (!dv_rl_vlc) |
2979 | 158 return -ENOMEM; |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
159 |
723 | 160 for(i = 0; i < dv_vlc.table_size; i++){ |
161 int code= dv_vlc.table[i][0]; | |
162 int len = dv_vlc.table[i][1]; | |
163 int level, run; | |
2967 | 164 |
723 | 165 if(len<0){ //more bits needed |
166 run= 0; | |
167 level= code; | |
168 } else { | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
169 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
|
170 level= new_dv_vlc_level[code]; |
723 | 171 } |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
172 dv_rl_vlc[i].len = len; |
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
173 dv_rl_vlc[i].level = level; |
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
174 dv_rl_vlc[i].run = run; |
723 | 175 } |
2979 | 176 free_vlc(&dv_vlc); |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
177 |
2979 | 178 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
|
179 if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) |
2979 | 180 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
|
181 #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
|
182 if (dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) |
2979 | 183 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
|
184 #endif |
2967 | 185 |
2979 | 186 if (dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size != 0) |
187 continue; | |
2967 | 188 |
2979 | 189 dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].vlc = dv_vlc_bits[i] << |
190 (!!dv_vlc_level[i]); | |
191 dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size = dv_vlc_len[i] + | |
192 (!!dv_vlc_level[i]); | |
193 } | |
194 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
|
195 #ifdef DV_CODEC_TINY_TARGET |
2979 | 196 for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) { |
197 if (dv_vlc_map[i][j].size == 0) { | |
198 dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | | |
199 (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size)); | |
200 dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size + | |
201 dv_vlc_map[0][j].size; | |
202 } | |
203 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
204 #else |
2979 | 205 for (j = 1; j < DV_VLC_MAP_LEV_SIZE/2; j++) { |
206 if (dv_vlc_map[i][j].size == 0) { | |
207 dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc | | |
208 (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size)); | |
209 dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size + | |
210 dv_vlc_map[0][j].size; | |
211 } | |
212 dv_vlc_map[i][((uint16_t)(-j))&0x1ff].vlc = | |
213 dv_vlc_map[i][j].vlc | 1; | |
214 dv_vlc_map[i][((uint16_t)(-j))&0x1ff].size = | |
215 dv_vlc_map[i][j].size; | |
216 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
217 #endif |
2979 | 218 } |
723 | 219 } |
725 | 220 |
1567 | 221 /* Generic DSP setup */ |
222 dsputil_init(&dsp, avctx); | |
223 s->get_pixels = dsp.get_pixels; | |
725 | 224 |
1567 | 225 /* 88DCT setup */ |
226 s->fdct[0] = dsp.fdct; | |
227 s->idct_put[0] = dsp.idct_put; | |
228 for (i=0; i<64; i++) | |
229 s->dv_zigzag[0][i] = dsp.idct_permutation[ff_zigzag_direct[i]]; | |
725 | 230 |
1567 | 231 /* 248DCT setup */ |
232 s->fdct[1] = dsp.fdct248; | |
233 s->idct_put[1] = simple_idct248_put; // FIXME: need to add it to DSP | |
2849 | 234 if(avctx->lowres){ |
235 for (i=0; i<64; i++){ | |
236 int j= ff_zigzag248_direct[i]; | |
237 s->dv_zigzag[1][i] = dsp.idct_permutation[(j&7) + (j&8)*4 + (j&48)/2]; | |
238 } | |
239 }else | |
240 memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64); | |
725 | 241 |
723 | 242 /* XXX: do it only for constant case */ |
1567 | 243 dv_build_unquantize_tables(s, dsp.idct_permutation); |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
244 |
1543
7542cb99b950
* providing MPEG codecs with a generic fields in AVFrame to use.
romansh
parents:
1540
diff
changeset
|
245 avctx->coded_frame = &s->picture; |
2847 | 246 s->avctx= avctx; |
2967 | 247 |
723 | 248 return 0; |
249 } | |
250 | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
251 // #define VLC_DEBUG |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
252 // #define printf(...) av_log(NULL, AV_LOG_ERROR, __VA_ARGS__) |
723 | 253 |
725 | 254 typedef struct BlockInfo { |
1064 | 255 const uint8_t *shift_table; |
256 const uint8_t *scan_table; | |
3149
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
257 const int *iweight_table; |
1064 | 258 uint8_t pos; /* position in block */ |
259 uint8_t dct_mode; | |
260 uint8_t partial_bit_count; | |
261 uint16_t partial_bit_buffer; | |
725 | 262 int shift_offset; |
263 } BlockInfo; | |
723 | 264 |
265 /* block size in bits */ | |
1064 | 266 static const uint16_t block_sizes[6] = { |
723 | 267 112, 112, 112, 112, 80, 80 |
268 }; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
269 /* 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
|
270 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
|
271 /* see dv_88_areas and dv_248_areas for details */ |
2967 | 272 static const int mb_area_start[5] = { 1, 6, 21, 43, 64 }; |
723 | 273 |
1895
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
274 static inline int get_bits_left(GetBitContext *s) |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
275 { |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
276 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
|
277 } |
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 static inline int get_bits_size(GetBitContext *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 return s->size_in_bits; |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
282 } |
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 static inline int put_bits_left(PutBitContext* s) |
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 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
|
287 } |
e5687117cc7f
* removing casualties of battle of the wits and English language
romansh
parents:
1887
diff
changeset
|
288 |
723 | 289 /* decode ac coefs */ |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
290 static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, DCTELEM *block) |
723 | 291 { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
292 int last_index = get_bits_size(gb); |
1064 | 293 const uint8_t *scan_table = mb->scan_table; |
294 const uint8_t *shift_table = mb->shift_table; | |
3149
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
295 const int *iweight_table = mb->iweight_table; |
725 | 296 int pos = mb->pos; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
297 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
|
298 int level, pos1, run, vlc_len, index; |
2967 | 299 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
300 OPEN_READER(re, gb); |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
301 UPDATE_CACHE(re, gb); |
2967 | 302 |
723 | 303 /* if we must parse a partial vlc, we do it here */ |
304 if (partial_bit_count > 0) { | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
305 re_cache = ((unsigned)re_cache >> partial_bit_count) | |
2979 | 306 (mb->partial_bit_buffer << (sizeof(re_cache)*8 - partial_bit_count)); |
307 re_index -= partial_bit_count; | |
308 mb->partial_bit_count = 0; | |
723 | 309 } |
310 | |
311 /* get the AC coefficients until last_index is reached */ | |
312 for(;;) { | |
313 #ifdef VLC_DEBUG | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
314 printf("%2d: bits=%04x index=%d\n", pos, SHOW_UBITS(re, gb, 16), re_index); |
723 | 315 #endif |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
316 /* our own optimized GET_RL_VLC */ |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
317 index = NEG_USR32(re_cache, TEX_VLC_BITS); |
2979 | 318 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
|
319 if (vlc_len < 0) { |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
320 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
|
321 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
|
322 } |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
323 level = dv_rl_vlc[index].level; |
2979 | 324 run = dv_rl_vlc[index].run; |
2967 | 325 |
2979 | 326 /* gotta check if we're still within gb boundaries */ |
327 if (re_index + vlc_len > last_index) { | |
328 /* should be < 16 bits otherwise a codeword could have been parsed */ | |
329 mb->partial_bit_count = last_index - re_index; | |
330 mb->partial_bit_buffer = NEG_USR32(re_cache, mb->partial_bit_count); | |
331 re_index = last_index; | |
332 break; | |
333 } | |
334 re_index += vlc_len; | |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
335 |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
336 #ifdef VLC_DEBUG |
2979 | 337 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
|
338 #endif |
2979 | 339 pos += run; |
340 if (pos >= 64) | |
341 break; | |
2967 | 342 |
2847 | 343 pos1 = scan_table[pos]; |
3149
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
344 level <<= shift_table[pos1]; |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
345 |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
346 /* unweigh, round, and shift down */ |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
347 level = (level*iweight_table[pos] + (1 << (dv_iweight_bits-1))) >> dv_iweight_bits; |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
348 |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
349 block[pos1] = level; |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
350 |
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
351 UPDATE_CACHE(re, gb); |
723 | 352 } |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
353 CLOSE_READER(re, gb); |
725 | 354 mb->pos = pos; |
723 | 355 } |
356 | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
357 static inline void bit_copy(PutBitContext *pb, GetBitContext *gb) |
723 | 358 { |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
359 int bits_left = get_bits_left(gb); |
2847 | 360 while (bits_left >= MIN_CACHE_BITS) { |
361 put_bits(pb, MIN_CACHE_BITS, get_bits(gb, MIN_CACHE_BITS)); | |
362 bits_left -= MIN_CACHE_BITS; | |
723 | 363 } |
364 if (bits_left > 0) { | |
365 put_bits(pb, bits_left, get_bits(gb, bits_left)); | |
366 } | |
367 } | |
368 | |
369 /* mb_x and mb_y are in units of 8 pixels */ | |
2967 | 370 static inline void dv_decode_video_segment(DVVideoContext *s, |
371 uint8_t *buf_ptr1, | |
1064 | 372 const uint16_t *mb_pos_ptr) |
723 | 373 { |
374 int quant, dc, dct_mode, class1, j; | |
375 int mb_index, mb_x, mb_y, v, last_index; | |
376 DCTELEM *block, *block1; | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
377 int c_offset; |
1064 | 378 uint8_t *y_ptr; |
379 void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block); | |
380 uint8_t *buf_ptr; | |
723 | 381 PutBitContext pb, vs_pb; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
382 GetBitContext gb; |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
383 BlockInfo mb_data[5 * 6], *mb, *mb1; |
3089 | 384 DECLARE_ALIGNED_8(DCTELEM, sblock[5*6][64]); |
385 DECLARE_ALIGNED_8(uint8_t, mb_bit_buffer[80 + 4]); /* allow some slack */ | |
386 DECLARE_ALIGNED_8(uint8_t, vs_bit_buffer[5 * 80 + 4]); /* allow some slack */ | |
2849 | 387 const int log2_blocksize= 3-s->avctx->lowres; |
2967 | 388 |
2847 | 389 assert((((int)mb_bit_buffer)&7)==0); |
390 assert((((int)vs_bit_buffer)&7)==0); | |
2967 | 391 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
392 memset(sblock, 0, sizeof(sblock)); |
723 | 393 |
394 /* pass 1 : read DC and AC coefficients in blocks */ | |
395 buf_ptr = buf_ptr1; | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
396 block1 = &sblock[0][0]; |
725 | 397 mb1 = mb_data; |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1507
diff
changeset
|
398 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
|
399 for(mb_index = 0; mb_index < 5; mb_index++, mb1 += 6, block1 += 6 * 64) { |
723 | 400 /* skip header */ |
401 quant = buf_ptr[3] & 0x0f; | |
402 buf_ptr += 4; | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1507
diff
changeset
|
403 init_put_bits(&pb, mb_bit_buffer, 80); |
725 | 404 mb = mb1; |
723 | 405 block = block1; |
406 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
|
407 last_index = block_sizes[j]; |
2979 | 408 init_get_bits(&gb, buf_ptr, last_index); |
2967 | 409 |
723 | 410 /* get the dc */ |
2247 | 411 dc = get_sbits(&gb, 9); |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
412 dct_mode = get_bits1(&gb); |
725 | 413 mb->dct_mode = dct_mode; |
414 mb->scan_table = s->dv_zigzag[dct_mode]; | |
3149
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
415 mb->iweight_table = dct_mode ? dv_iweight_248 : dv_iweight_88; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
416 class1 = get_bits(&gb, 2); |
1905
2761950695cc
* some significant clean-up of the dv_decode_ac (it looks real
romansh
parents:
1904
diff
changeset
|
417 mb->shift_table = s->dv_idct_shift[class1 == 3][dct_mode] |
723 | 418 [quant + dv_quant_offset[class1]]; |
419 dc = dc << 2; | |
420 /* convert to unsigned because 128 is not added in the | |
421 standard IDCT */ | |
422 dc += 1024; | |
423 block[0] = dc; | |
424 buf_ptr += last_index >> 3; | |
725 | 425 mb->pos = 0; |
426 mb->partial_bit_count = 0; | |
723 | 427 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
428 #ifdef VLC_DEBUG |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
429 printf("MB block: %d, %d ", mb_index, j); |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
430 #endif |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
431 dv_decode_ac(&gb, mb, block); |
723 | 432 |
433 /* write the remaining bits in a new buffer only if the | |
434 block is finished */ | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
435 if (mb->pos >= 64) |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
436 bit_copy(&pb, &gb); |
2967 | 437 |
723 | 438 block += 64; |
725 | 439 mb++; |
723 | 440 } |
2967 | 441 |
723 | 442 /* pass 2 : we can do it just after */ |
443 #ifdef VLC_DEBUG | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
444 printf("***pass 2 size=%d MB#=%d\n", put_bits_count(&pb), mb_index); |
723 | 445 #endif |
446 block = block1; | |
725 | 447 mb = mb1; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
448 init_get_bits(&gb, mb_bit_buffer, put_bits_count(&pb)); |
2979 | 449 flush_put_bits(&pb); |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
450 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
|
451 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
|
452 dv_decode_ac(&gb, mb, block); |
723 | 453 /* 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
|
454 if (mb->pos < 64) |
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
455 break; |
723 | 456 } |
457 } | |
458 /* all blocks are finished, so the extra bytes can be used at | |
459 the video segment level */ | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
460 if (j >= 6) |
2979 | 461 bit_copy(&vs_pb, &gb); |
723 | 462 } |
463 | |
464 /* we need a pass other the whole video segment */ | |
465 #ifdef VLC_DEBUG | |
1886
fbcf02596520
* DV decoder simplifications. Now it looks to be 6% faster. At least
romansh
parents:
1875
diff
changeset
|
466 printf("***pass 3 size=%d\n", put_bits_count(&vs_pb)); |
723 | 467 #endif |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
468 block = &sblock[0][0]; |
723 | 469 mb = mb_data; |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
470 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
|
471 flush_put_bits(&vs_pb); |
723 | 472 for(mb_index = 0; mb_index < 5; mb_index++) { |
473 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
|
474 if (mb->pos < 64) { |
723 | 475 #ifdef VLC_DEBUG |
476 printf("start %d:%d\n", mb_index, j); | |
477 #endif | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
478 dv_decode_ac(&gb, mb, block); |
723 | 479 } |
2979 | 480 if (mb->pos >= 64 && mb->pos < 127) |
481 av_log(NULL, AV_LOG_ERROR, "AC EOB marker is absent pos=%d\n", mb->pos); | |
723 | 482 block += 64; |
725 | 483 mb++; |
723 | 484 } |
485 } | |
2967 | 486 |
723 | 487 /* compute idct and place blocks */ |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
488 block = &sblock[0][0]; |
723 | 489 mb = mb_data; |
490 for(mb_index = 0; mb_index < 5; mb_index++) { | |
491 v = *mb_pos_ptr++; | |
492 mb_x = v & 0xff; | |
493 mb_y = v >> 8; | |
3167 | 494 if (s->sys->pix_fmt == PIX_FMT_YUV422P) { |
495 y_ptr = s->picture.data[0] + ((mb_y * s->picture.linesize[0] + (mb_x>>1))<<log2_blocksize); | |
2849 | 496 c_offset = ((mb_y * s->picture.linesize[1] + (mb_x >> 2))<<log2_blocksize); |
3167 | 497 } else { /* 4:1:1 or 4:2:0 */ |
498 y_ptr = s->picture.data[0] + ((mb_y * s->picture.linesize[0] + mb_x)<<log2_blocksize); | |
499 if (s->sys->pix_fmt == PIX_FMT_YUV411P) | |
500 c_offset = ((mb_y * s->picture.linesize[1] + (mb_x >> 2))<<log2_blocksize); | |
501 else /* 4:2:0 */ | |
502 c_offset = (((mb_y >> 1) * s->picture.linesize[1] + (mb_x >> 1))<<log2_blocksize); | |
503 } | |
723 | 504 for(j = 0;j < 6; j++) { |
2849 | 505 idct_put = s->idct_put[mb->dct_mode && log2_blocksize==3]; |
3167 | 506 if (s->sys->pix_fmt == PIX_FMT_YUV422P) { /* 4:2:2 */ |
507 if (j == 0 || j == 2) { | |
508 /* Y0 Y1 */ | |
509 idct_put(y_ptr + ((j >> 1)<<log2_blocksize), | |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
510 s->picture.linesize[0], block); |
3167 | 511 } else if(j > 3) { |
512 /* Cr Cb */ | |
513 idct_put(s->picture.data[6 - j] + c_offset, | |
514 s->picture.linesize[6 - j], block); | |
723 | 515 } |
3167 | 516 /* note: j=1 and j=3 are "dummy" blocks in 4:2:2 */ |
517 } else { /* 4:1:1 or 4:2:0 */ | |
518 if (j < 4) { | |
519 if (s->sys->pix_fmt == PIX_FMT_YUV411P && mb_x < (704 / 8)) { | |
520 /* NOTE: at end of line, the macroblock is handled as 420 */ | |
521 idct_put(y_ptr + (j<<log2_blocksize), s->picture.linesize[0], block); | |
522 } else { | |
523 idct_put(y_ptr + (((j & 1) + (j >> 1) * s->picture.linesize[0])<<log2_blocksize), | |
524 s->picture.linesize[0], block); | |
737 | 525 } |
526 } else { | |
3167 | 527 if (s->sys->pix_fmt == PIX_FMT_YUV411P && mb_x >= (704 / 8)) { |
528 uint64_t aligned_pixels[64/8]; | |
529 uint8_t *pixels= (uint8_t*)aligned_pixels; | |
530 uint8_t *c_ptr, *c_ptr1, *ptr, *ptr1; | |
531 int x, y, linesize; | |
532 /* NOTE: at end of line, the macroblock is handled as 420 */ | |
533 idct_put(pixels, 8, block); | |
534 linesize = s->picture.linesize[6 - j]; | |
535 c_ptr = s->picture.data[6 - j] + c_offset; | |
536 ptr = pixels; | |
537 for(y = 0;y < (1<<log2_blocksize); y++) { | |
538 ptr1= ptr + (1<<(log2_blocksize-1)); | |
539 c_ptr1 = c_ptr + (linesize<<log2_blocksize); | |
540 for(x=0; x < (1<<(log2_blocksize-1)); x++){ | |
541 c_ptr[x]= ptr[x]; c_ptr1[x]= ptr1[x]; | |
542 } | |
543 c_ptr += linesize; | |
544 ptr += 8; | |
545 } | |
546 } else { | |
547 /* don't ask me why they inverted Cb and Cr ! */ | |
548 idct_put(s->picture.data[6 - j] + c_offset, | |
549 s->picture.linesize[6 - j], block); | |
550 } | |
737 | 551 } |
723 | 552 } |
553 block += 64; | |
725 | 554 mb++; |
723 | 555 } |
556 } | |
557 } | |
558 | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
559 #ifdef DV_CODEC_TINY_TARGET |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
560 /* Converts run and level (where level != 0) pair into vlc, returning bit size */ |
2847 | 561 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
|
562 { |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
563 int size; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
564 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
|
565 *vlc = dv_vlc_map[run][level].vlc | sign; |
2979 | 566 size = dv_vlc_map[run][level].size; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
567 } |
2967 | 568 else { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
569 if (level < DV_VLC_MAP_LEV_SIZE) { |
2979 | 570 *vlc = dv_vlc_map[0][level].vlc | sign; |
571 size = dv_vlc_map[0][level].size; | |
572 } else { | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
573 *vlc = 0xfe00 | (level << 1) | sign; |
2979 | 574 size = 16; |
575 } | |
576 if (run) { | |
577 *vlc |= ((run < 16) ? dv_vlc_map[run-1][0].vlc : | |
578 (0x1f80 | (run - 1))) << size; | |
579 size += (run < 16) ? dv_vlc_map[run-1][0].size : 13; | |
580 } | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
581 } |
2967 | 582 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
583 return size; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
584 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
585 |
2847 | 586 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
|
587 { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
588 int size; |
2967 | 589 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
590 if (run < DV_VLC_MAP_RUN_SIZE && level < DV_VLC_MAP_LEV_SIZE) { |
2979 | 591 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
|
592 } |
2967 | 593 else { |
2979 | 594 size = (level < DV_VLC_MAP_LEV_SIZE) ? dv_vlc_map[0][level].size : 16; |
595 if (run) { | |
596 size += (run < 16) ? dv_vlc_map[run-1][0].size : 13; | |
597 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
598 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
599 return size; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
600 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
601 #else |
2847 | 602 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
|
603 { |
2847 | 604 *vlc = dv_vlc_map[run][l].vlc | sign; |
605 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
|
606 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
607 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
608 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
|
609 { |
2847 | 610 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
|
611 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
612 #endif |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
613 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
614 typedef struct EncBlockInfo { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
615 int area_q[4]; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
616 int bit_size[4]; |
2847 | 617 int prev[5]; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
618 int cur_ac; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
619 int cno; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
620 int dct_mode; |
2847 | 621 DCTELEM mb[64]; |
622 uint8_t next[64]; | |
623 uint8_t sign[64]; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
624 uint8_t partial_bit_count; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
625 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
|
626 } EncBlockInfo; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
627 |
2967 | 628 static always_inline PutBitContext* dv_encode_ac(EncBlockInfo* bi, PutBitContext* pb_pool, |
2847 | 629 PutBitContext* pb_end) |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
630 { |
2847 | 631 int prev; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
632 int bits_left; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
633 PutBitContext* pb = pb_pool; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
634 int size = bi->partial_bit_count; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
635 uint32_t vlc = bi->partial_bit_buffer; |
2847 | 636 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
637 bi->partial_bit_count = bi->partial_bit_buffer = 0; |
2847 | 638 for(;;){ |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
639 /* Find suitable storage space */ |
1875
45a1592dadca
* moving some of the commonly used bit reading/writing functions
romansh
parents:
1726
diff
changeset
|
640 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
|
641 if (bits_left) { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
642 size -= bits_left; |
2979 | 643 put_bits(pb, bits_left, vlc >> size); |
644 vlc = vlc & ((1<<size)-1); | |
645 } | |
646 if (pb + 1 >= pb_end) { | |
647 bi->partial_bit_count = size; | |
648 bi->partial_bit_buffer = vlc; | |
649 return pb; | |
650 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
651 } |
2967 | 652 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
653 /* Store VLC */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
654 put_bits(pb, size, vlc); |
2967 | 655 |
2847 | 656 if(bi->cur_ac>=64) |
657 break; | |
2967 | 658 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
659 /* Construct the next VLC */ |
2847 | 660 prev= bi->cur_ac; |
661 bi->cur_ac = bi->next[prev]; | |
662 if(bi->cur_ac < 64){ | |
663 size = dv_rl2vlc(bi->cur_ac - prev - 1, bi->mb[bi->cur_ac], bi->sign[bi->cur_ac], &vlc); | |
664 } else { | |
665 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
|
666 } |
2847 | 667 } |
668 return pb; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
669 } |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
670 |
2967 | 671 static always_inline void dv_set_class_number(DCTELEM* blk, EncBlockInfo* bi, |
3149
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
672 const uint8_t* zigzag_scan, const int *weight, int bias) |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
673 { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
674 int i, area; |
3152
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
675 /* We offer two different methods for class number assignment: the |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
676 method suggested in SMPTE 314M Table 22, and an improved |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
677 method. The SMPTE method is very conservative; it assigns class |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
678 3 (i.e. severe quantization) to any block where the largest AC |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
679 component is greater than 36. ffmpeg's DV encoder tracks AC bit |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
680 consumption precisely, so there is no need to bias most blocks |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
681 towards strongly lossy compression. Instead, we assign class 2 |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
682 to most blocks, and use class 3 only when strictly necessary |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
683 (for blocks whose largest AC component exceeds 255). */ |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
684 |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
685 #if 0 /* SMPTE spec method */ |
2847 | 686 static const int classes[] = {12, 24, 36, 0xffff}; |
3152
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
687 #else /* improved ffmpeg method */ |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
688 static const int classes[] = {-1, -1, 255, 0xffff}; |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
689 #endif |
28a087ad41d1
Assign class 2 to most macroblocks by default, instead of a more conservative
romansh
parents:
3150
diff
changeset
|
690 int max=classes[0]; |
2847 | 691 int prev=0; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
692 |
2967 | 693 bi->mb[0] = blk[0]; |
694 | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
695 for (area = 0; area < 4; area++) { |
2847 | 696 bi->prev[area] = prev; |
697 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
|
698 for (i=mb_area_start[area]; i<mb_area_start[area+1]; i++) { |
2847 | 699 int level = blk[zigzag_scan[i]]; |
2967 | 700 |
2847 | 701 if (level+15 > 30U) { |
702 bi->sign[i] = (level>>31)&1; | |
3149
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
703 /* weigh it and and shift down into range, adding for rounding */ |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
704 /* the extra division by a factor of 2^4 reverses the 8x expansion of the DCT |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
705 AND the 2x doubling of the weights */ |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
706 level = (ABS(level) * weight[i] + (1<<(dv_weight_bits+3))) >> (dv_weight_bits+4); |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
707 bi->mb[i] = level; |
2847 | 708 if(level>max) max= level; |
709 bi->bit_size[area] += dv_rl2vlc_size(i - prev - 1, level); | |
710 bi->next[prev]= i; | |
711 prev= i; | |
712 } | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
713 } |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
714 } |
2847 | 715 bi->next[prev]= i; |
716 for(bi->cno = 0; max > classes[bi->cno]; bi->cno++); | |
717 | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
718 bi->cno += bias; |
2967 | 719 |
2847 | 720 if (bi->cno >= 3) { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
721 bi->cno = 3; |
2847 | 722 prev=0; |
723 i= bi->next[prev]; | |
724 for (area = 0; area < 4; area++) { | |
725 bi->prev[area] = prev; | |
726 bi->bit_size[area] = 1; // 4 areas 4 bits for EOB :) | |
727 for (; i<mb_area_start[area+1]; i= bi->next[i]) { | |
728 bi->mb[i] >>=1; | |
2967 | 729 |
2847 | 730 if (bi->mb[i]) { |
731 bi->bit_size[area] += dv_rl2vlc_size(i - prev - 1, bi->mb[i]); | |
732 bi->next[prev]= i; | |
733 prev= i; | |
734 } | |
735 } | |
736 } | |
737 bi->next[prev]= i; | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
738 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
739 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
740 |
2847 | 741 //FIXME replace this by dsputil |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
742 #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
|
743 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
|
744 DCTELEM *s; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
745 int score88 = 0; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
746 int score248 = 0; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
747 int i; |
2967 | 748 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
749 /* 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
|
750 s = blk; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
751 for(i=0; i<7; i++) { |
2967 | 752 score88 += SC(0, 8) + SC(1, 9) + SC(2, 10) + SC(3, 11) + |
2979 | 753 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
|
754 s += 8; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
755 } |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
756 /* 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
|
757 s = blk; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
758 for(i=0; i<6; i++) { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
759 score248 += SC(0, 16) + SC(1,17) + SC(2, 18) + SC(3, 19) + |
2979 | 760 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
|
761 s += 8; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
762 } |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
763 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
764 return (score88 - score248 > -10); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
765 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
766 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
767 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
|
768 { |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
769 int size[5]; |
3140 | 770 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
|
771 EncBlockInfo* b; |
2847 | 772 |
3146
dcae1bde37ac
size[0-3] are not initialized (and can get random negative trash
michael
parents:
3143
diff
changeset
|
773 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
|
774 do { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
775 b = blks; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
776 for (i=0; i<5; i++) { |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
777 if (!qnos[i]) |
2979 | 778 continue; |
2967 | 779 |
2979 | 780 qnos[i]--; |
781 size[i] = 0; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
782 for (j=0; j<6; j++, b++) { |
2979 | 783 for (a=0; a<4; a++) { |
784 if (b->area_q[a] != dv_quant_shifts[qnos[i] + dv_quant_offset[b->cno]][a]) { | |
785 b->bit_size[a] = 1; // 4 areas 4 bits for EOB :) | |
786 b->area_q[a]++; | |
2847 | 787 prev= b->prev[a]; |
3147 | 788 assert(b->next[prev] >= mb_area_start[a+1] || b->mb[prev]); |
2847 | 789 for (k= b->next[prev] ; k<mb_area_start[a+1]; k= b->next[k]) { |
2979 | 790 b->mb[k] >>= 1; |
791 if (b->mb[k]) { | |
2847 | 792 b->bit_size[a] += dv_rl2vlc_size(k - prev - 1, b->mb[k]); |
2979 | 793 prev= k; |
2847 | 794 } else { |
3140 | 795 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
|
796 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
|
797 b->prev[a2] = prev; |
3140 | 798 assert(a2<4); |
799 assert(b->mb[b->next[k]]); | |
800 b->bit_size[a2] += dv_rl2vlc_size(b->next[k] - prev - 1, b->mb[b->next[k]]) | |
801 -dv_rl2vlc_size(b->next[k] - k - 1, b->mb[b->next[k]]); | |
3147 | 802 assert(b->prev[a2]==k && (a2+1 >= 4 || b->prev[a2+1]!=k)); |
803 b->prev[a2] = prev; | |
3140 | 804 } |
2847 | 805 b->next[prev] = b->next[k]; |
806 } | |
2979 | 807 } |
2847 | 808 b->prev[a+1]= prev; |
2979 | 809 } |
810 size[i] += b->bit_size[a]; | |
811 } | |
812 } | |
3142 | 813 if(vs_total_ac_bits >= size[0] + size[1] + size[2] + size[3] + size[4]) |
814 return; | |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
815 } |
3140 | 816 } while (qnos[0]|qnos[1]|qnos[2]|qnos[3]|qnos[4]); |
817 | |
818 | |
819 for(a=2; a==2 || vs_total_ac_bits < size[0]; a+=a){ | |
820 b = blks; | |
3143 | 821 size[0] = 5*6*4; //EOB |
3140 | 822 for (j=0; j<6*5; j++, b++) { |
823 prev= b->prev[0]; | |
824 for (k= b->next[prev]; k<64; k= b->next[k]) { | |
825 if(b->mb[k] < a && b->mb[k] > -a){ | |
826 b->next[prev] = b->next[k]; | |
827 }else{ | |
828 size[0] += dv_rl2vlc_size(k - prev - 1, b->mb[k]); | |
829 prev= k; | |
830 } | |
831 } | |
832 } | |
833 } | |
1567 | 834 } |
835 | |
2967 | 836 static inline void dv_encode_video_segment(DVVideoContext *s, |
837 uint8_t *dif, | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
838 const uint16_t *mb_pos_ptr) |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
839 { |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
840 int mb_index, i, j, v; |
2967 | 841 int mb_x, mb_y, c_offset, linesize; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
842 uint8_t* y_ptr; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
843 uint8_t* data; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
844 uint8_t* ptr; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
845 int do_edge_wrap; |
3089 | 846 DECLARE_ALIGNED_8(DCTELEM, block[64]); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
847 EncBlockInfo enc_blks[5*6]; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
848 PutBitContext pbs[5*6]; |
2967 | 849 PutBitContext* pb; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
850 EncBlockInfo* enc_blk; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
851 int vs_bit_size = 0; |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
852 int qnos[5]; |
2967 | 853 |
2847 | 854 assert((((int)block) & 7) == 0); |
2967 | 855 |
1567 | 856 enc_blk = &enc_blks[0]; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
857 pb = &pbs[0]; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
858 for(mb_index = 0; mb_index < 5; mb_index++) { |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
859 v = *mb_pos_ptr++; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
860 mb_x = v & 0xff; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
861 mb_y = v >> 8; |
3167 | 862 if (s->sys->pix_fmt == PIX_FMT_YUV422P) { |
863 y_ptr = s->picture.data[0] + (mb_y * s->picture.linesize[0] * 8) + (mb_x * 4); | |
864 } else { /* 4:1:1 */ | |
865 y_ptr = s->picture.data[0] + (mb_y * s->picture.linesize[0] * 8) + (mb_x * 8); | |
866 } | |
867 if (s->sys->pix_fmt == PIX_FMT_YUV420P) { | |
868 c_offset = (((mb_y >> 1) * s->picture.linesize[1] * 8) + ((mb_x >> 1) * 8)); | |
869 } else { /* 4:2:2 or 4:1:1 */ | |
870 c_offset = ((mb_y * s->picture.linesize[1] * 8) + ((mb_x >> 2) * 8)); | |
871 } | |
2979 | 872 do_edge_wrap = 0; |
873 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
|
874 ptr = dif + mb_index*80 + 4; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
875 for(j = 0;j < 6; j++) { |
3167 | 876 int dummy = 0; |
877 if (s->sys->pix_fmt == PIX_FMT_YUV422P) { /* 4:2:2 */ | |
878 if (j == 0 || j == 2) { | |
879 /* Y0 Y1 */ | |
880 data = y_ptr + ((j>>1) * 8); | |
881 linesize = s->picture.linesize[0]; | |
882 } else if (j > 3) { | |
883 /* Cr Cb */ | |
884 data = s->picture.data[6 - j] + c_offset; | |
885 linesize = s->picture.linesize[6 - j]; | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
886 } else { |
3167 | 887 /* j=1 and j=3 are "dummy" blocks, used for AC data only */ |
888 data = 0; | |
889 linesize = 0; | |
890 dummy = 1; | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
891 } |
3167 | 892 } else { /* 4:1:1 or 4:2:0 */ |
893 if (j < 4) { /* Four Y blocks */ | |
894 /* NOTE: at end of line, the macroblock is handled as 420 */ | |
895 if (s->sys->pix_fmt == PIX_FMT_YUV411P && mb_x < (704 / 8)) { | |
896 data = y_ptr + (j * 8); | |
897 } else { | |
898 data = y_ptr + ((j & 1) * 8) + ((j >> 1) * 8 * s->picture.linesize[0]); | |
899 } | |
900 linesize = s->picture.linesize[0]; | |
901 } else { /* Cr and Cb blocks */ | |
902 /* don't ask Fabrice why they inverted Cb and Cr ! */ | |
903 data = s->picture.data[6 - j] + c_offset; | |
904 linesize = s->picture.linesize[6 - j]; | |
905 if (s->sys->pix_fmt == PIX_FMT_YUV411P && mb_x >= (704 / 8)) | |
906 do_edge_wrap = 1; | |
907 } | |
2979 | 908 } |
2967 | 909 |
2979 | 910 /* Everything is set up -- now just copy data -> DCT block */ |
911 if (do_edge_wrap) { /* Edge wrap copy: 4x16 -> 8x8 */ | |
912 uint8_t* d; | |
913 DCTELEM *b = block; | |
914 for (i=0;i<8;i++) { | |
915 d = data + 8 * linesize; | |
916 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
|
917 b[4] = d[0]; b[5] = d[1]; b[6] = d[2]; b[7] = d[3]; |
2979 | 918 data += linesize; |
919 b += 8; | |
920 } | |
921 } else { /* Simple copy: 8x8 -> 8x8 */ | |
3167 | 922 if (!dummy) |
923 s->get_pixels(block, data, linesize); | |
2979 | 924 } |
2967 | 925 |
2847 | 926 if(s->avctx->flags & CODEC_FLAG_INTERLACED_DCT) |
927 enc_blk->dct_mode = dv_guess_dct_mode(block); | |
928 else | |
929 enc_blk->dct_mode = 0; | |
2979 | 930 enc_blk->area_q[0] = enc_blk->area_q[1] = enc_blk->area_q[2] = enc_blk->area_q[3] = 0; |
931 enc_blk->partial_bit_count = 0; | |
932 enc_blk->partial_bit_buffer = 0; | |
933 enc_blk->cur_ac = 0; | |
2967 | 934 |
3167 | 935 if (dummy) { |
936 /* We rely on the fact that encoding all zeros leads to an immediate EOB, | |
937 which is precisely what the spec calls for in the "dummy" blocks. */ | |
938 memset(block, 0, sizeof(block)); | |
939 } else { | |
940 s->fdct[enc_blk->dct_mode](block); | |
941 } | |
2967 | 942 |
2979 | 943 dv_set_class_number(block, enc_blk, |
3149
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
944 enc_blk->dct_mode ? ff_zigzag248_direct : ff_zigzag_direct, |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
945 enc_blk->dct_mode ? dv_weight_248 : dv_weight_88, |
2679184e8be0
AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
romansh
parents:
3148
diff
changeset
|
946 j/4); |
2967 | 947 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
948 init_put_bits(pb, ptr, block_sizes[j]/8); |
2979 | 949 put_bits(pb, 9, (uint16_t)(((enc_blk->mb[0] >> 3) - 1024 + 2) >> 2)); |
950 put_bits(pb, 1, enc_blk->dct_mode); | |
951 put_bits(pb, 2, enc_blk->cno); | |
2967 | 952 |
2979 | 953 vs_bit_size += enc_blk->bit_size[0] + enc_blk->bit_size[1] + |
954 enc_blk->bit_size[2] + enc_blk->bit_size[3]; | |
955 ++enc_blk; | |
956 ++pb; | |
957 ptr += block_sizes[j]/8; | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
958 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
959 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
960 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
961 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
|
962 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
|
963 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
964 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
|
965 dif[i*80 + 3] = qnos[i]; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
966 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
967 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
968 /* First pass over individual cells only */ |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
969 for (j=0; j<5*6; j++) |
2847 | 970 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
|
971 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
972 /* Second pass over each MB space */ |
2847 | 973 for (j=0; j<5*6; j+=6) { |
974 pb= &pbs[j]; | |
975 for (i=0; i<6; i++) { | |
976 if (enc_blks[i+j].partial_bit_count) | |
977 pb=dv_encode_ac(&enc_blks[i+j], pb, &pbs[j+6]); | |
978 } | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
979 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
980 |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
981 /* Third and final pass over the whole vides segment space */ |
2847 | 982 pb= &pbs[0]; |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
983 for (j=0; j<5*6; j++) { |
2847 | 984 if (enc_blks[j].partial_bit_count) |
985 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
|
986 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
|
987 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
|
988 } |
1631
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
989 |
59f2fa833449
* 3x encoding speedup. Finally we seem to be on par with libdv
romansh
parents:
1598
diff
changeset
|
990 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
|
991 flush_put_bits(&pbs[j]); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
992 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
993 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
994 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
|
995 { |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
996 DVVideoContext *s = avctx->priv_data; |
1904 | 997 int slice = (size_t)sl; |
3167 | 998 |
999 /* which DIF channel is this? */ | |
1000 int chan = slice / (s->sys->difseg_size * 27); | |
1001 | |
1002 /* slice within the DIF channel */ | |
1003 int chan_slice = slice % (s->sys->difseg_size * 27); | |
1004 | |
1005 /* byte offset of this channel's data */ | |
1006 int chan_offset = chan * s->sys->difseg_size * 150 * 80; | |
1007 | |
1008 dv_decode_video_segment(s, &s->buf[((chan_slice/27)*6+(chan_slice/3)+chan_slice*5+7)*80 + chan_offset], | |
2979 | 1009 &s->sys->video_place[slice*5]); |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1010 return 0; |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1011 } |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1012 |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1013 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
|
1014 { |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1015 DVVideoContext *s = avctx->priv_data; |
1904 | 1016 int slice = (size_t)sl; |
3167 | 1017 |
1018 /* which DIF channel is this? */ | |
1019 int chan = slice / (s->sys->difseg_size * 27); | |
1020 | |
1021 /* slice within the DIF channel */ | |
1022 int chan_slice = slice % (s->sys->difseg_size * 27); | |
1023 | |
1024 /* byte offset of this channel's data */ | |
1025 int chan_offset = chan * s->sys->difseg_size * 150 * 80; | |
1026 | |
1027 dv_encode_video_segment(s, &s->buf[((chan_slice/27)*6+(chan_slice/3)+chan_slice*5+7)*80 + chan_offset], | |
2979 | 1028 &s->sys->video_place[slice*5]); |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1029 return 0; |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1030 } |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1031 |
723 | 1032 /* NOTE: exactly one frame must be given (120000 bytes for NTSC, |
3167 | 1033 144000 bytes for PAL - or twice those for 50Mbps) */ |
2967 | 1034 static int dvvideo_decode_frame(AVCodecContext *avctx, |
723 | 1035 void *data, int *data_size, |
1064 | 1036 uint8_t *buf, int buf_size) |
723 | 1037 { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1038 DVVideoContext *s = avctx->priv_data; |
2967 | 1039 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
1040 s->sys = dv_frame_profile(buf); |
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
1041 if (!s->sys || buf_size < s->sys->frame_size) |
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
1042 return -1; /* NOTE: we only accept several full frames */ |
723 | 1043 |
1228 | 1044 if(s->picture.data[0]) |
1045 avctx->release_buffer(avctx, &s->picture); | |
2967 | 1046 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
1047 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
|
1048 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
|
1049 s->picture.pict_type = FF_I_TYPE; |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
1050 avctx->pix_fmt = s->sys->pix_fmt; |
2849 | 1051 avcodec_set_dimensions(avctx, s->sys->width, s->sys->height); |
903 | 1052 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
|
1053 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
903 | 1054 return -1; |
835 | 1055 } |
1543
7542cb99b950
* providing MPEG codecs with a generic fields in AVFrame to use.
romansh
parents:
1540
diff
changeset
|
1056 s->picture.interlaced_frame = 1; |
1547 | 1057 s->picture.top_field_first = 0; |
835 | 1058 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1059 s->buf = buf; |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
1060 avctx->execute(avctx, dv_decode_mt, (void**)&dv_anchor[0], NULL, |
3167 | 1061 s->sys->n_difchan * s->sys->difseg_size * 27); |
2967 | 1062 |
734
2d6b3e3d6c6f
10l - MMX/FPU state was not restored, causing nonsense fpu behaviour in caller (mplayer)
arpi_esp
parents:
733
diff
changeset
|
1063 emms_c(); |
2d6b3e3d6c6f
10l - MMX/FPU state was not restored, causing nonsense fpu behaviour in caller (mplayer)
arpi_esp
parents:
733
diff
changeset
|
1064 |
723 | 1065 /* return image */ |
925 | 1066 *data_size = sizeof(AVFrame); |
1067 *(AVFrame*)data= s->picture; | |
2967 | 1068 |
1489
337d13aee605
* DV handling was streamlined for both muxing/demuxing and
romansh
parents:
1416
diff
changeset
|
1069 return s->sys->frame_size; |
723 | 1070 } |
1071 | |
3671
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1072 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1073 static inline int dv_write_pack(enum dv_pack_type pack_id, DVVideoContext *c, uint8_t* buf) |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1074 { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1075 /* |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1076 * Here's what SMPTE314M says about these two: |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1077 * (page 6) APTn, AP1n, AP2n, AP3n: These data shall be identical |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1078 * as track application IDs (APTn = 001, AP1n = |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1079 * 001, AP2n = 001, AP3n = 001), if the source signal |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1080 * comes from a digital VCR. If the signal source is |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1081 * unknown, all bits for these data shall be set to 1. |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1082 * (page 12) STYPE: STYPE defines a signal type of video signal |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1083 * 00000b = 4:1:1 compression |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1084 * 00100b = 4:2:2 compression |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1085 * XXXXXX = Reserved |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1086 * Now, I've got two problems with these statements: |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1087 * 1. it looks like APT == 111b should be a safe bet, but it isn't. |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1088 * It seems that for PAL as defined in IEC 61834 we have to set |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1089 * APT to 000 and for SMPTE314M to 001. |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1090 * 2. It is not at all clear what STYPE is used for 4:2:0 PAL |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1091 * compression scheme (if any). |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1092 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1093 int apt = (c->sys->pix_fmt == PIX_FMT_YUV420P ? 0 : 1); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1094 int stype = (c->sys->pix_fmt == PIX_FMT_YUV422P ? 4 : 0); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1095 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1096 uint8_t aspect = 0; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1097 if((int)(av_q2d(c->avctx->sample_aspect_ratio) * c->avctx->width / c->avctx->height * 10) == 17) /* 16:9 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1098 aspect = 0x02; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1099 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1100 buf[0] = (uint8_t)pack_id; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1101 switch (pack_id) { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1102 case dv_header525: /* I can't imagine why these two weren't defined as real */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1103 case dv_header625: /* packs in SMPTE314M -- they definitely look like ones */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1104 buf[1] = 0xf8 | /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1105 (apt & 0x07); /* APT: Track application ID */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1106 buf[2] = (0 << 7) | /* TF1: audio data is 0 - valid; 1 - invalid */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1107 (0x0f << 3) | /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1108 (apt & 0x07); /* AP1: Audio application ID */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1109 buf[3] = (0 << 7) | /* TF2: video data is 0 - valid; 1 - invalid */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1110 (0x0f << 3) | /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1111 (apt & 0x07); /* AP2: Video application ID */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1112 buf[4] = (0 << 7) | /* TF3: subcode(SSYB) is 0 - valid; 1 - invalid */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1113 (0x0f << 3) | /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1114 (apt & 0x07); /* AP3: Subcode application ID */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1115 break; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1116 case dv_video_source: |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1117 buf[1] = 0xff; /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1118 buf[2] = (1 << 7) | /* B/W: 0 - b/w, 1 - color */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1119 (1 << 6) | /* following CLF is valid - 0, invalid - 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1120 (3 << 4) | /* CLF: color frames id (see ITU-R BT.470-4) */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1121 0xf; /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1122 buf[3] = (3 << 6) | /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1123 (c->sys->dsf << 5) | /* system: 60fields/50fields */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1124 stype; /* signal type video compression */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1125 buf[4] = 0xff; /* VISC: 0xff -- no information */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1126 break; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1127 case dv_video_control: |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1128 buf[1] = (0 << 6) | /* Copy generation management (CGMS) 0 -- free */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1129 0x3f; /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1130 buf[2] = 0xc8 | /* reserved -- always b11001xxx */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1131 aspect; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1132 buf[3] = (1 << 7) | /* Frame/field flag 1 -- frame, 0 -- field */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1133 (1 << 6) | /* First/second field flag 0 -- field 2, 1 -- field 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1134 (1 << 5) | /* Frame change flag 0 -- same picture as before, 1 -- different */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1135 (1 << 4) | /* 1 - interlaced, 0 - noninterlaced */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1136 0xc; /* reserved -- always b1100 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1137 buf[4] = 0xff; /* reserved -- always 1 */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1138 break; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1139 default: |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1140 buf[1] = buf[2] = buf[3] = buf[4] = 0xff; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1141 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1142 return 5; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1143 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1144 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1145 static void dv_format_frame(DVVideoContext* c, uint8_t* buf) |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1146 { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1147 int chan, i, j, k; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1148 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1149 for (chan = 0; chan < c->sys->n_difchan; chan++) { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1150 for (i = 0; i < c->sys->difseg_size; i++) { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1151 memset(buf, 0xff, 80 * 6); /* First 6 DIF blocks are for control data */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1152 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1153 /* DV header: 1DIF */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1154 buf += dv_write_dif_id(dv_sect_header, chan, i, 0, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1155 buf += dv_write_pack((c->sys->dsf ? dv_header625 : dv_header525), c, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1156 buf += 72; /* unused bytes */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1157 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1158 /* DV subcode: 2DIFs */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1159 for (j = 0; j < 2; j++) { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1160 buf += dv_write_dif_id(dv_sect_subcode, chan, i, j, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1161 for (k = 0; k < 6; k++) |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1162 buf += dv_write_ssyb_id(k, (i < c->sys->difseg_size/2), buf) + 5; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1163 buf += 29; /* unused bytes */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1164 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1165 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1166 /* DV VAUX: 3DIFS */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1167 for (j = 0; j < 3; j++) { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1168 buf += dv_write_dif_id(dv_sect_vaux, chan, i, j, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1169 buf += dv_write_pack(dv_video_source, c, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1170 buf += dv_write_pack(dv_video_control, c, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1171 buf += 7*5; |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1172 buf += dv_write_pack(dv_video_source, c, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1173 buf += dv_write_pack(dv_video_control, c, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1174 buf += 4*5 + 2; /* unused bytes */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1175 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1176 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1177 /* DV Audio/Video: 135 Video DIFs + 9 Audio DIFs */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1178 for (j = 0; j < 135; j++) { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1179 if (j%15 == 0) { |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1180 memset(buf, 0xff, 80); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1181 buf += dv_write_dif_id(dv_sect_audio, chan, i, j/15, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1182 buf += 77; /* audio control & shuffled PCM audio */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1183 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1184 buf += dv_write_dif_id(dv_sect_video, chan, i, j, buf); |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1185 buf += 77; /* 1 video macro block: 1 bytes control |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1186 4 * 14 bytes Y 8x8 data |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1187 10 bytes Cr 8x8 data |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1188 10 bytes Cb 8x8 data */ |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1189 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1190 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1191 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1192 } |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1193 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1194 |
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1195 |
2967 | 1196 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
|
1197 void *data) |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1198 { |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1199 DVVideoContext *s = c->priv_data; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1200 |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1201 s->sys = dv_codec_profile(c); |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1202 if (!s->sys) |
2979 | 1203 return -1; |
2422 | 1204 if(buf_size < s->sys->frame_size) |
1205 return -1; | |
1206 | |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1207 c->pix_fmt = s->sys->pix_fmt; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1208 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
|
1209 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
|
1210 s->picture.pict_type = FF_I_TYPE; |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1211 |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1212 s->buf = buf; |
3016
97e6c0f82182
Moving dv_anchor back to the global scope. This creates a tiny memory
romansh
parents:
2991
diff
changeset
|
1213 c->execute(c, dv_encode_mt, (void**)&dv_anchor[0], NULL, |
3167 | 1214 s->sys->n_difchan * s->sys->difseg_size * 27); |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1215 |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1216 emms_c(); |
3167 | 1217 |
3671
18113845d891
* Restructuring the division of labor between DV codec and DV format
romansh
parents:
3649
diff
changeset
|
1218 dv_format_frame(s, buf); |
3167 | 1219 |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1220 return s->sys->frame_size; |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1221 } |
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1222 |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1223 static int dvvideo_close(AVCodecContext *c) |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1224 { |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1225 |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1226 return 0; |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1227 } |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1228 |
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1229 |
2661
b2846918585c
a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net]
michael
parents:
2614
diff
changeset
|
1230 #ifdef CONFIG_DVVIDEO_ENCODER |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1231 AVCodec dvvideo_encoder = { |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1232 "dvvideo", |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1233 CODEC_TYPE_VIDEO, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1234 CODEC_ID_DVVIDEO, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1235 sizeof(DVVideoContext), |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1236 dvvideo_init, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1237 dvvideo_encode_frame, |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1238 dvvideo_close, |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1239 NULL, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1240 CODEC_CAP_DR1, |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1241 NULL |
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1242 }; |
2661
b2846918585c
a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net]
michael
parents:
2614
diff
changeset
|
1243 #endif // CONFIG_DVVIDEO_ENCODER |
723 | 1244 |
1245 AVCodec dvvideo_decoder = { | |
1246 "dvvideo", | |
1247 CODEC_TYPE_VIDEO, | |
1248 CODEC_ID_DVVIDEO, | |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1249 sizeof(DVVideoContext), |
1493
ad7e62df9962
* preAlpha DV encoding support -- there's still a truckload
romansh
parents:
1489
diff
changeset
|
1250 dvvideo_init, |
1887
85fe2f4633ec
* DV decoding/encoding now supports MultiThreading for up to 324 CPUs ;-)
romansh
parents:
1886
diff
changeset
|
1251 NULL, |
2991
d377b0788381
Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)
michael
parents:
2979
diff
changeset
|
1252 dvvideo_close, |
723 | 1253 dvvideo_decode_frame, |
835 | 1254 CODEC_CAP_DR1, |
723 | 1255 NULL |
1256 }; |