annotate dv.c @ 2809:75400dfbe117 libavcodec

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