annotate dv.c @ 3076:50d80b04f150 libavcodec

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