annotate svq3.c @ 2226:4306aa6f8f16 libavcodec

pre_cmp fix
author michael
date Mon, 13 Sep 2004 12:37:39 +0000
parents 19d4d5c6a8f4
children 73a66a4a6ab4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
1 /*
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
2 * Copyright (c) 2003 The FFmpeg Project.
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
3 *
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
4 * This library is free software; you can redistribute it and/or
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
5 * modify it under the terms of the GNU Lesser General Public
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
6 * License as published by the Free Software Foundation; either
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
7 * version 2 of the License, or (at your option) any later version.
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
8 *
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
9 * This library is distributed in the hope that it will be useful,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
12 * Lesser General Public License for more details.
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
13 *
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
14 * You should have received a copy of the GNU Lesser General Public
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
15 * License along with this library; if not, write to the Free Software
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
17 *
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
18 *
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
19 * How to use this decoder:
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
20 * SVQ3 data is transported within Apple Quicktime files. Quicktime files
1235
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
21 * have stsd atoms to describe media trak properties. A stsd atom for a
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
22 * video trak contains 1 or more ImageDescription atoms. These atoms begin
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
23 * with the 4-byte length of the atom followed by the codec fourcc. Some
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
24 * decoders need information in this atom to operate correctly. Such
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
25 * is the case with SVQ3. In order to get the best use out of this decoder,
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
26 * the calling app must make the SVQ3 ImageDescription atom available
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
27 * via the AVCodecContext's extradata[_size] field:
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
28 *
1235
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
29 * AVCodecContext.extradata = pointer to ImageDescription, first characters
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
30 * are expected to be 'S', 'V', 'Q', and '3', NOT the 4-byte atom length
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
31 * AVCodecContext.extradata_size = size of ImageDescription atom memory
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
32 * buffer (which will be the same as the ImageDescription atom size field
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
33 * from the QT file, minus 4 bytes since the length is missing)
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
34 *
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
35 * You will know you have these parameters passed correctly when the decoder
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
36 * correctly decodes this file:
8bb75c3c2f21 change the way the ImageDescription is passed to the decoder
tmmm
parents: 1234
diff changeset
37 * ftp://ftp.mplayerhq.hu/MPlayer/samples/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
38 *
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
39 */
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
40
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
41 /**
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
42 * @file svq3.c
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
43 * svq3 decoder.
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
44 */
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
45
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
46 #define FULLPEL_MODE 1
09165461996f optimize
michaelni
parents: 1264
diff changeset
47 #define HALFPEL_MODE 2
09165461996f optimize
michaelni
parents: 1264
diff changeset
48 #define THIRDPEL_MODE 3
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
49 #define PREDICT_MODE 4
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
50
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
51 /* dual scan (from some older h264 draft)
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
52 o-->o-->o o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
53 | /|
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
54 o o o / o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
55 | / | |/ |
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
56 o o o o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
57 /
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
58 o-->o-->o-->o
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
59 */
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
60 static const uint8_t svq3_scan[16]={
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
61 0+0*4, 1+0*4, 2+0*4, 2+1*4,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
62 2+2*4, 3+0*4, 3+1*4, 3+2*4,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
63 0+1*4, 0+2*4, 1+1*4, 1+2*4,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
64 0+3*4, 1+3*4, 2+3*4, 3+3*4,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
65 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
66
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
67 static const uint8_t svq3_pred_0[25][2] = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
68 { 0, 0 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
69 { 1, 0 }, { 0, 1 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
70 { 0, 2 }, { 1, 1 }, { 2, 0 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
71 { 3, 0 }, { 2, 1 }, { 1, 2 }, { 0, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
72 { 0, 4 }, { 1, 3 }, { 2, 2 }, { 3, 1 }, { 4, 0 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
73 { 4, 1 }, { 3, 2 }, { 2, 3 }, { 1, 4 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
74 { 2, 4 }, { 3, 3 }, { 4, 2 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
75 { 4, 3 }, { 3, 4 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
76 { 4, 4 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
77 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
78
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
79 static const int8_t svq3_pred_1[6][6][5] = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
80 { { 2,-1,-1,-1,-1 }, { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
81 { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, { 1, 2,-1,-1,-1 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
82 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 4, 3 }, { 0, 1, 2, 4, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
83 { 0, 2, 1, 4, 3 }, { 2, 0, 1, 3, 4 }, { 0, 4, 2, 1, 3 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
84 { { 2, 0,-1,-1,-1 }, { 2, 1, 0, 4, 3 }, { 1, 2, 4, 0, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
85 { 2, 1, 0, 4, 3 }, { 2, 1, 4, 3, 0 }, { 1, 2, 4, 0, 3 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
86 { { 2, 0,-1,-1,-1 }, { 2, 0, 1, 4, 3 }, { 1, 2, 0, 4, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
87 { 2, 1, 0, 4, 3 }, { 2, 1, 3, 4, 0 }, { 2, 4, 1, 0, 3 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
88 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 3, 4 }, { 1, 2, 3, 0, 4 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
89 { 2, 0, 1, 3, 4 }, { 2, 1, 3, 0, 4 }, { 2, 0, 4, 3, 1 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
90 { { 0, 2,-1,-1,-1 }, { 0, 2, 4, 1, 3 }, { 1, 4, 2, 0, 3 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
91 { 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
92 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
93
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
94 static const struct { uint8_t run; uint8_t level; } svq3_dct_tables[2][16] = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
95 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
96 { 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
97 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 },
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
98 { 3, 1 }, { 4, 1 }, { 1, 2 }, { 1, 3 }, { 0, 6 }, { 0, 7 }, { 0, 8 }, { 0, 9 } }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
99 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
100
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
101 static const uint32_t svq3_dequant_coeff[32] = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
102 3881, 4351, 4890, 5481, 6154, 6914, 7761, 8718,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
103 9781, 10987, 12339, 13828, 15523, 17435, 19561, 21873,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
104 24552, 27656, 30847, 34870, 38807, 43747, 49103, 54683,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
105 61694, 68745, 77615, 89113,100253,109366,126635,141533
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
106 };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
107
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
108
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
109 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
110 const int qmul= svq3_dequant_coeff[qp];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
111 #define stride 16
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
112 int i;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
113 int temp[16];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
114 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
115 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
116
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
117 for(i=0; i<4; i++){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
118 const int offset= y_offset[i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
119 const int z0= 13*(block[offset+stride*0] + block[offset+stride*4]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
120 const int z1= 13*(block[offset+stride*0] - block[offset+stride*4]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
121 const int z2= 7* block[offset+stride*1] - 17*block[offset+stride*5];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
122 const int z3= 17* block[offset+stride*1] + 7*block[offset+stride*5];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
123
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
124 temp[4*i+0]= z0+z3;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
125 temp[4*i+1]= z1+z2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
126 temp[4*i+2]= z1-z2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
127 temp[4*i+3]= z0-z3;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
128 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
129
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
130 for(i=0; i<4; i++){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
131 const int offset= x_offset[i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
132 const int z0= 13*(temp[4*0+i] + temp[4*2+i]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
133 const int z1= 13*(temp[4*0+i] - temp[4*2+i]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
134 const int z2= 7* temp[4*1+i] - 17*temp[4*3+i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
135 const int z3= 17* temp[4*1+i] + 7*temp[4*3+i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
136
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
137 block[stride*0 +offset]= ((z0 + z3)*qmul + 0x80000)>>20;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
138 block[stride*2 +offset]= ((z1 + z2)*qmul + 0x80000)>>20;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
139 block[stride*8 +offset]= ((z1 - z2)*qmul + 0x80000)>>20;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
140 block[stride*10+offset]= ((z0 - z3)*qmul + 0x80000)>>20;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
141 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
142 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
143 #undef stride
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
144
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
145 static void svq3_add_idct_c (uint8_t *dst, DCTELEM *block, int stride, int qp, int dc){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
146 const int qmul= svq3_dequant_coeff[qp];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
147 int i;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
148 uint8_t *cm = cropTbl + MAX_NEG_CROP;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
149
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
150 if (dc) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
151 dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
152 block[0] = 0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
153 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
154
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
155 for (i=0; i < 4; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
156 const int z0= 13*(block[0 + 4*i] + block[2 + 4*i]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
157 const int z1= 13*(block[0 + 4*i] - block[2 + 4*i]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
158 const int z2= 7* block[1 + 4*i] - 17*block[3 + 4*i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
159 const int z3= 17* block[1 + 4*i] + 7*block[3 + 4*i];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
160
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
161 block[0 + 4*i]= z0 + z3;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
162 block[1 + 4*i]= z1 + z2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
163 block[2 + 4*i]= z1 - z2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
164 block[3 + 4*i]= z0 - z3;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
165 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
166
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
167 for (i=0; i < 4; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
168 const int z0= 13*(block[i + 4*0] + block[i + 4*2]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
169 const int z1= 13*(block[i + 4*0] - block[i + 4*2]);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
170 const int z2= 7* block[i + 4*1] - 17*block[i + 4*3];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
171 const int z3= 17* block[i + 4*1] + 7*block[i + 4*3];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
172 const int rr= (dc + 0x80000);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
173
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
174 dst[i + stride*0]= cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
175 dst[i + stride*1]= cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
176 dst[i + stride*2]= cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
177 dst[i + stride*3]= cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
178 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
179 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
180
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
181 static void pred4x4_down_left_svq3_c(uint8_t *src, uint8_t *topright, int stride){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
182 LOAD_TOP_EDGE
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
183 LOAD_LEFT_EDGE
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
184 const __attribute__((unused)) int unu0= t0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
185 const __attribute__((unused)) int unu1= l0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
186
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
187 src[0+0*stride]=(l1 + t1)>>1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
188 src[1+0*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
189 src[0+1*stride]=(l2 + t2)>>1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
190 src[2+0*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
191 src[1+1*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
192 src[0+2*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
193 src[3+0*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
194 src[2+1*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
195 src[1+2*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
196 src[0+3*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
197 src[3+1*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
198 src[2+2*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
199 src[1+3*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
200 src[3+2*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
201 src[2+3*stride]=
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
202 src[3+3*stride]=(l3 + t3)>>1;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
203 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
204
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
205 static void pred16x16_plane_svq3_c(uint8_t *src, int stride){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
206 pred16x16_plane_compat_c(src, stride, 1);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
207 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
208
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
209 static inline int svq3_decode_block (GetBitContext *gb, DCTELEM *block,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
210 int index, const int type) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
211
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
212 static const uint8_t *const scan_patterns[4] =
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
213 { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan };
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
214
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
215 int run, level, sign, vlc, limit;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
216 const int intra = (3 * type) >> 2;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
217 const uint8_t *const scan = scan_patterns[type];
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
218
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
219 for (limit=(16 >> intra); index < 16; index=limit, limit+=8) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
220 for (; (vlc = svq3_get_ue_golomb (gb)) != 0; index++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
221
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
222 if (vlc == INVALID_VLC)
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
223 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
224
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
225 sign = (vlc & 0x1) - 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
226 vlc = (vlc + 1) >> 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
227
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
228 if (type == 3) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
229 if (vlc < 3) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
230 run = 0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
231 level = vlc;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
232 } else if (vlc < 4) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
233 run = 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
234 level = 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
235 } else {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
236 run = (vlc & 0x3);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
237 level = ((vlc + 9) >> 2) - run;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
238 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
239 } else {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
240 if (vlc < 16) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
241 run = svq3_dct_tables[intra][vlc].run;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
242 level = svq3_dct_tables[intra][vlc].level;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
243 } else if (intra) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
244 run = (vlc & 0x7);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
245 level = (vlc >> 3) + ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1)));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
246 } else {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
247 run = (vlc & 0xF);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
248 level = (vlc >> 4) + ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0)));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
249 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
250 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
251
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
252 if ((index += run) >= limit)
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
253 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
254
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
255 block[scan[index]] = (level ^ sign) - sign;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
256 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
257
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
258 if (type != 2) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
259 break;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
260 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
261 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
262
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
263 return 0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
264 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
265
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
266 static inline void svq3_mc_dir_part (MpegEncContext *s,
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
267 int x, int y, int width, int height,
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
268 int mx, int my, int dxy,
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
269 int thirdpel, int dir, int avg) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
270
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
271 const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
272 uint8_t *src, *dest;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
273 int i, emu = 0;
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
274 int blocksize= 2 - (width>>3); //16->0, 8->1, 4->2
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
275
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
276 mx += x;
09165461996f optimize
michaelni
parents: 1264
diff changeset
277 my += y;
09165461996f optimize
michaelni
parents: 1264
diff changeset
278
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
279 if (mx < 0 || mx >= (s->h_edge_pos - width - 1) ||
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
280 my < 0 || my >= (s->v_edge_pos - height - 1)) {
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
281
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
282 if ((s->flags & CODEC_FLAG_EMU_EDGE)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
283 emu = 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
284 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
285
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
286 mx = clip (mx, -16, (s->h_edge_pos - width + 15));
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
287 my = clip (my, -16, (s->v_edge_pos - height + 15));
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
288 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
289
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
290 /* form component predictions */
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
291 dest = s->current_picture.data[0] + x + y*s->linesize;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
292 src = pic->data[0] + mx + my*s->linesize;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
293
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
294 if (emu) {
1321
2365b4dfc450 don't step on the context
tmmm
parents: 1319
diff changeset
295 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1),
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
296 mx, my, s->h_edge_pos, s->v_edge_pos);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
297 src = s->edge_emu_buffer;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
298 }
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
299 if(thirdpel)
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
300 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height);
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
301 else
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
302 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
303
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
304 if (!(s->flags & CODEC_FLAG_GRAY)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
305 mx = (mx + (mx < (int) x)) >> 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
306 my = (my + (my < (int) y)) >> 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
307 width = (width >> 1);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
308 height = (height >> 1);
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
309 blocksize++;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
310
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
311 for (i=1; i < 3; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
312 dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
313 src = pic->data[i] + mx + my*s->uvlinesize;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
314
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
315 if (emu) {
1321
2365b4dfc450 don't step on the context
tmmm
parents: 1319
diff changeset
316 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1),
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
317 mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1));
1321
2365b4dfc450 don't step on the context
tmmm
parents: 1319
diff changeset
318 src = s->edge_emu_buffer;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
319 }
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
320 if(thirdpel)
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
321 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height);
1267
85b71f9f7450 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents: 1265
diff changeset
322 else
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
323 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
324 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
325 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
326 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
327
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
328 static inline int svq3_mc_dir (H264Context *h, int size, int mode, int dir, int avg) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
329
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
330 int i, j, k, mx, my, dx, dy, x, y;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
331 MpegEncContext *const s = (MpegEncContext *) h;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
332 const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
333 const int part_height = 16 >> ((unsigned) (size + 1) / 3);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
334 const int extra_width = (mode == PREDICT_MODE) ? -16*6 : 0;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
335 const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
336 const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
337
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
338 for (i=0; i < 16; i+=part_height) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
339 for (j=0; j < 16; j+=part_width) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
340 const int b_xy = (4*s->mb_x+(j>>2)) + (4*s->mb_y+(i>>2))*h->b_stride;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
341 int dxy;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
342 x = 16*s->mb_x + j;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
343 y = 16*s->mb_y + i;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
344 k = ((j>>2)&1) + ((i>>1)&2) + ((j>>1)&4) + (i&8);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
345
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
346 if (mode != PREDICT_MODE) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
347 pred_motion (h, k, (part_width >> 2), dir, 1, &mx, &my);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
348 } else {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
349 mx = s->next_picture.motion_val[0][b_xy][0]<<1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
350 my = s->next_picture.motion_val[0][b_xy][1]<<1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
351
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
352 if (dir == 0) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
353 mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
354 my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
355 } else {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
356 mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
357 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
358 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
359 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
360
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
361 /* clip motion vector prediction to frame border */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
362 mx = clip (mx, extra_width - 6*x, h_edge_pos - 6*x);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
363 my = clip (my, extra_width - 6*y, v_edge_pos - 6*y);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
364
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
365 /* get (optional) motion vector differential */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
366 if (mode == PREDICT_MODE) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
367 dx = dy = 0;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
368 } else {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
369 dy = svq3_get_se_golomb (&s->gb);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
370 dx = svq3_get_se_golomb (&s->gb);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
371
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
372 if (dx == INVALID_VLC || dy == INVALID_VLC) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
373 return -1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
374 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
375 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
376
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
377 /* compute motion vector */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
378 if (mode == THIRDPEL_MODE) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
379 int fx, fy;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
380 mx = ((mx + 1)>>1) + dx;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
381 my = ((my + 1)>>1) + dy;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
382 fx= ((unsigned)(mx + 0x3000))/3 - 0x1000;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
383 fy= ((unsigned)(my + 0x3000))/3 - 0x1000;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
384 dxy= (mx - 3*fx) + 4*(my - 3*fy);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
385
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
386 svq3_mc_dir_part (s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
387 mx += mx;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
388 my += my;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
389 } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
390 mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
391 my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
392 dxy= (mx&1) + 2*(my&1);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
393
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
394 svq3_mc_dir_part (s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
395 mx *= 3;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
396 my *= 3;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
397 } else {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
398 mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
399 my = ((unsigned)(my + 3 + 0x6000))/6 + dy - 0x1000;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
400
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
401 svq3_mc_dir_part (s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
402 mx *= 6;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
403 my *= 6;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
404 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
405
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
406 /* update mv_cache */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
407 if (mode != PREDICT_MODE) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
408 int32_t mv = pack16to32(mx,my);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
409
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
410 if (part_height == 8 && i < 8) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
411 *(int32_t *) h->mv_cache[dir][scan8[k] + 1*8] = mv;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
412
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
413 if (part_width == 8 && j < 8) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
414 *(int32_t *) h->mv_cache[dir][scan8[k] + 1 + 1*8] = mv;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
415 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
416 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
417 if (part_width == 8 && j < 8) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
418 *(int32_t *) h->mv_cache[dir][scan8[k] + 1] = mv;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
419 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
420 if (part_width == 4 || part_height == 4) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
421 *(int32_t *) h->mv_cache[dir][scan8[k]] = mv;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
422 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
423 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
424
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
425 /* write back motion vectors */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
426 fill_rectangle(s->current_picture.motion_val[dir][b_xy], part_width>>2, part_height>>2, h->b_stride, pack16to32(mx,my), 4);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
427 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
428 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
429
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
430 return 0;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
431 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
432
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
433 static int svq3_decode_mb (H264Context *h, unsigned int mb_type) {
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
434 int i, j, k, m, dir, mode;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
435 int cbp = 0;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
436 uint32_t vlc;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
437 int8_t *top, *left;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
438 MpegEncContext *const s = (MpegEncContext *) h;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
439 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
440 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
441
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
442 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
443 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
444 h->topright_samples_available = 0xFFFF;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
445
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
446 if (mb_type == 0) { /* SKIP */
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
447 if (s->pict_type == P_TYPE || s->next_picture.mb_type[mb_xy] == -1) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
448 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
449
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
450 if (s->pict_type == B_TYPE) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
451 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1);
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
452 }
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
453
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
454 mb_type = MB_TYPE_SKIP;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
455 } else {
2088
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
456 mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 6);
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
457 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0) < 0)
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
458 return -1;
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
459 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1) < 0)
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
460 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
461
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
462 mb_type = MB_TYPE_16x16;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
463 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
464 } else if (mb_type < 8) { /* INTER */
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
465 if (h->thirdpel_flag && h->halfpel_flag == !get_bits (&s->gb, 1)) {
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
466 mode = THIRDPEL_MODE;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
467 } else if (h->halfpel_flag && h->thirdpel_flag == !get_bits (&s->gb, 1)) {
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
468 mode = HALFPEL_MODE;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
469 } else {
1265
09165461996f optimize
michaelni
parents: 1264
diff changeset
470 mode = FULLPEL_MODE;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
471 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
472
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
473 /* fill caches */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
474 /* note ref_cache should contain here:
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
475 ????????
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
476 ???11111
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
477 N??11111
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
478 N??11111
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
479 N??11111
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
480 N
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
481 */
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
482
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
483 for (m=0; m < 2; m++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
484 if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
485 for (i=0; i < 4; i++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
486 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - 1 + i*h->b_stride];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
487 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
488 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
489 for (i=0; i < 4; i++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
490 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
491 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
492 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
493 if (s->mb_y > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
494 memcpy (h->mv_cache[m][scan8[0] - 1*8], s->current_picture.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
495 memset (&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1, 4);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
496
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
497 if (s->mb_x < (s->mb_width - 1)) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
498 *(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride + 4];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
499 h->ref_cache[m][scan8[0] + 4 - 1*8] =
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
500 (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 ||
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
501 h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
502 }else
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
503 h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
504 if (s->mb_x > 0) {
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
505 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride - 1];
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
506 h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] == -1) ? PART_NOT_AVAILABLE : 1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
507 }else
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
508 h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE;
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
509 }else
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
510 memset (&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
511
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
512 if (s->pict_type != B_TYPE)
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
513 break;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
514 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
515
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
516 /* decode motion vector(s) and form prediction(s) */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
517 if (s->pict_type == P_TYPE) {
2088
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
518 if(svq3_mc_dir (h, (mb_type - 1), mode, 0, 0) < 0)
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
519 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
520 } else { /* B_TYPE */
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
521 if (mb_type != 2) {
2088
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
522 if(svq3_mc_dir (h, 0, mode, 0, 0) < 0)
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
523 return -1;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
524 } else {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
525 for (i=0; i < 4; i++) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
526 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
527 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
528 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
529 if (mb_type != 1) {
2088
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
530 if(svq3_mc_dir (h, 0, mode, 1, (mb_type == 3)) < 0)
19d4d5c6a8f4 1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents: 2086
diff changeset
531 return -1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
532 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
533 for (i=0; i < 4; i++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
534 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
535 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
536 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
537 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
538
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
539 mb_type = MB_TYPE_16x16;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
540 } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
541 memset (h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
542
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
543 if (mb_type == 8) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
544 if (s->mb_x > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
545 for (i=0; i < 4; i++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
546 h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
547 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
548 if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
549 h->left_samples_available = 0x5F5F;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
550 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
551 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
552 if (s->mb_y > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
553 h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][4];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
554 h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][5];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
555 h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][6];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
556 h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][3];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
557
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
558 if (h->intra4x4_pred_mode_cache[4+8*0] == -1) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
559 h->top_samples_available = 0x33FF;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
560 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
561 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
562
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
563 /* decode prediction codes for luma blocks */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
564 for (i=0; i < 16; i+=2) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
565 vlc = svq3_get_ue_golomb (&s->gb);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
566
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
567 if (vlc >= 25)
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
568 return -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
569
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
570 left = &h->intra4x4_pred_mode_cache[scan8[i] - 1];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
571 top = &h->intra4x4_pred_mode_cache[scan8[i] - 8];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
572
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
573 left[1] = svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
574 left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
575
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
576 if (left[1] == -1 || left[2] == -1)
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
577 return -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
578 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
579 } else { /* mb_type == 33, DC_128_PRED block type */
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
580 for (i=0; i < 4; i++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
581 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
582 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
583 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
584
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
585 write_back_intra_pred_mode (h);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
586
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
587 if (mb_type == 8) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
588 check_intra4x4_pred_mode (h);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
589
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
590 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
591 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
592 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
593 for (i=0; i < 4; i++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
594 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
595 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
596
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
597 h->top_samples_available = 0x33FF;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
598 h->left_samples_available = 0x5F5F;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
599 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
600
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
601 mb_type = MB_TYPE_INTRA4x4;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
602 } else { /* INTRA16x16 */
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
603 dir = i_mb_type_info[mb_type - 8].pred_mode;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
604 dir = (dir >> 1) ^ 3*(dir & 1) ^ 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
605
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
606 if ((h->intra16x16_pred_mode = check_intra_pred_mode (h, dir)) == -1)
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
607 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
608
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
609 cbp = i_mb_type_info[mb_type - 8].cbp;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
610 mb_type = MB_TYPE_INTRA16x16;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
611 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
612
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
613 if (!IS_INTER(mb_type) && s->pict_type != I_TYPE) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
614 for (i=0; i < 4; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
615 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
616 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
617 if (s->pict_type == B_TYPE) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
618 for (i=0; i < 4; i++) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
619 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
620 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
621 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
622 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
623 if (!IS_INTRA4x4(mb_type)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
624 memset (h->intra4x4_pred_mode[mb_xy], DC_PRED, 8);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
625 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
626 if (!IS_SKIP(mb_type) || s->pict_type == B_TYPE) {
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
627 memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t));
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
628 s->dsp.clear_blocks(h->mb);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
629 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
630
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
631 if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == B_TYPE)) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
632 if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48)
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
633 return -1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
634
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
635 cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc];
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
636 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
637 if (IS_INTRA16x16(mb_type) || (s->pict_type != I_TYPE && s->adaptive_quant && cbp)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
638 s->qscale += svq3_get_se_golomb (&s->gb);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
639
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
640 if (s->qscale > 31)
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
641 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
642 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
643 if (IS_INTRA16x16(mb_type)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
644 if (svq3_decode_block (&s->gb, h->mb, 0, 0))
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
645 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
646 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
647
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
648 if (cbp) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
649 const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
650 const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
651
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
652 for (i=0; i < 4; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
653 if ((cbp & (1 << i))) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
654 for (j=0; j < 4; j++) {
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
655 k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
656 h->non_zero_count_cache[ scan8[k] ] = 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
657
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
658 if (svq3_decode_block (&s->gb, &h->mb[16*k], index, type))
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
659 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
660 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
661 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
662 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
663
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
664 if ((cbp & 0x30)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
665 for (i=0; i < 2; ++i) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
666 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + 4*i)], 0, 3))
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
667 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
668 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
669
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
670 if ((cbp & 0x20)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
671 for (i=0; i < 8; i++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
672 h->non_zero_count_cache[ scan8[16+i] ] = 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
673
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
674 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + i)], 1, 1))
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
675 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
676 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
677 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
678 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
679 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
680
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
681 s->current_picture.mb_type[mb_xy] = mb_type;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
682
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
683 if (IS_INTRA(mb_type)) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
684 h->chroma_pred_mode = check_intra_pred_mode (h, DC_PRED8x8);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
685 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
686
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
687 return 0;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
688 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
689
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
690 static int svq3_decode_slice_header (H264Context *h) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
691 MpegEncContext *const s = (MpegEncContext *) h;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
692 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
693 int i, header;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
694
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
695 header = get_bits (&s->gb, 8);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
696
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
697 if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
698 /* TODO: what? */
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1330
diff changeset
699 av_log(h->s.avctx, AV_LOG_ERROR, "unsupported slice header (%02X)\n", header);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
700 return -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
701 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
702 int length = (header >> 5) & 3;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
703
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
704 h->next_slice_index = s->gb.index + 8*show_bits (&s->gb, 8*length) + 8*length;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
705
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
706 if (h->next_slice_index > s->gb.size_in_bits){
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
707 av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n");
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
708 return -1;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
709 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
710
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
711 s->gb.size_in_bits = h->next_slice_index - 8*(length - 1);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
712 s->gb.index += 8;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
713
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
714 if (length > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
715 memcpy ((uint8_t *) &s->gb.buffer[s->gb.index >> 3],
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
716 &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
717 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
718 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
719
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
720 if ((i = svq3_get_ue_golomb (&s->gb)) == INVALID_VLC || i >= 3){
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
721 av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
722 return -1;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
723 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
724
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
725 h->slice_type = golomb_to_pict_type[i];
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
726
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
727 if ((header & 0x9F) == 2) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
728 i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
729 s->mb_skip_run = get_bits (&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
730 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
731 get_bits1 (&s->gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
732 s->mb_skip_run = 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
733 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
734
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
735 h->slice_num = get_bits (&s->gb, 8);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
736 s->qscale = get_bits (&s->gb, 5);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
737 s->adaptive_quant = get_bits1 (&s->gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
738
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
739 /* unknown fields */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
740 get_bits1 (&s->gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
741
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
742 if (h->unknown_svq3_flag) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
743 get_bits1 (&s->gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
744 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
745
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
746 get_bits1 (&s->gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
747 get_bits (&s->gb, 2);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
748
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
749 while (get_bits1 (&s->gb)) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
750 get_bits (&s->gb, 8);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
751 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
752
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
753 /* reset intra predictors and invalidate motion vector references */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
754 if (s->mb_x > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
755 memset (h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
756 memset (h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
757 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
758 if (s->mb_y > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
759 memset (h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x));
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
760
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
761 if (s->mb_x > 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
762 h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
763 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
764 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
765
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
766 return 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
767 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
768
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
769 static int svq3_decode_frame (AVCodecContext *avctx,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
770 void *data, int *data_size,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
771 uint8_t *buf, int buf_size) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
772 MpegEncContext *const s = avctx->priv_data;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
773 H264Context *const h = avctx->priv_data;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
774 int m, mb_type;
1877
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
775 unsigned char *extradata;
1878
838c18d1e7fc be smarter about the variable size of the extra SVQ3 data
melanson
parents: 1877
diff changeset
776 unsigned int size;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
777
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
778 s->flags = avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1699
diff changeset
779 s->flags2 = avctx->flags2;
1699
92643b9794a9 SVQ3 uses unrestricted motion vectors
melanson
parents: 1598
diff changeset
780 s->unrestricted_mv = 1;
92643b9794a9 SVQ3 uses unrestricted motion vectors
melanson
parents: 1598
diff changeset
781
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
782 if (!s->context_initialized) {
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
783 s->width = avctx->width;
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
784 s->height = avctx->height;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
785 h->pred4x4[DIAG_DOWN_LEFT_PRED] = pred4x4_down_left_svq3_c;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
786 h->pred16x16[PLANE_PRED8x8] = pred16x16_plane_svq3_c;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
787 h->halfpel_flag = 1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
788 h->thirdpel_flag = 1;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
789 h->unknown_svq3_flag = 0;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
790 h->chroma_qp = 4;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
791
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
792 if (MPV_common_init (s) < 0)
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
793 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
794
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
795 h->b_stride = 4*s->mb_width;
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
796
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
797 alloc_tables (h);
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
798
1877
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
799 /* prowl for the "SEQH" marker in the extradata */
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
800 extradata = (unsigned char *)avctx->extradata;
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
801 for (m = 0; m < avctx->extradata_size; m++) {
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
802 if (!memcmp (extradata, "SEQH", 4))
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
803 break;
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
804 extradata++;
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
805 }
1878
838c18d1e7fc be smarter about the variable size of the extra SVQ3 data
melanson
parents: 1877
diff changeset
806
1877
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
807 /* if a match was found, parse the extra data */
869256817a91 smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents: 1754
diff changeset
808 if (!memcmp (extradata, "SEQH", 4)) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
809
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
810 GetBitContext gb;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
811
1883
12f260596631 don't fetch the size of SEQH unless SEQH was found
melanson
parents: 1881
diff changeset
812 size = BE_32(&extradata[4]);
1878
838c18d1e7fc be smarter about the variable size of the extra SVQ3 data
melanson
parents: 1877
diff changeset
813 init_get_bits (&gb, extradata + 8, size);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
814
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
815 /* 'frame size code' and optional 'width, height' */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
816 if (get_bits (&gb, 3) == 7) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
817 get_bits (&gb, 12);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
818 get_bits (&gb, 12);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
819 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
820
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
821 h->halfpel_flag = get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
822 h->thirdpel_flag = get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
823
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
824 /* unknown fields */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
825 get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
826 get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
827 get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
828 get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
829
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
830 s->low_delay = get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
831
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
832 /* unknown field */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
833 get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
834
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
835 while (get_bits1 (&gb)) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
836 get_bits (&gb, 8);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
837 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
838
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
839 h->unknown_svq3_flag = get_bits1 (&gb);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
840 avctx->has_b_frames = !s->low_delay;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
841 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
842 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
843
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
844 /* special case for last picture */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
845 if (buf_size == 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
846 if (s->next_picture_ptr && !s->low_delay) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
847 *(AVFrame *) data = *(AVFrame *) &s->next_picture;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
848 *data_size = sizeof(AVFrame);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
849 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
850 return 0;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
851 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
852
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
853 init_get_bits (&s->gb, buf, 8*buf_size);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
854
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
855 s->mb_x = s->mb_y = 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
856
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
857 if (svq3_decode_slice_header (h))
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
858 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
859
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
860 s->pict_type = h->slice_type;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
861 s->picture_number = h->slice_num;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
862
1250
fa181d095027 optimizations
michaelni
parents: 1235
diff changeset
863 if(avctx->debug&FF_DEBUG_PICT_INFO){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1330
diff changeset
864 av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d\n",
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
865 av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag,
1250
fa181d095027 optimizations
michaelni
parents: 1235
diff changeset
866 s->adaptive_quant, s->qscale
fa181d095027 optimizations
michaelni
parents: 1235
diff changeset
867 );
fa181d095027 optimizations
michaelni
parents: 1235
diff changeset
868 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
869
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
870 /* for hurry_up==5 */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
871 s->current_picture.pict_type = s->pict_type;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
872 s->current_picture.key_frame = (s->pict_type == I_TYPE);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
873
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
874 /* skip b frames if we dont have reference frames */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
875 if (s->last_picture_ptr == NULL && s->pict_type == B_TYPE) return 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
876 /* skip b frames if we are in a hurry */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
877 if (avctx->hurry_up && s->pict_type == B_TYPE) return 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
878 /* skip everything if we are in a hurry >= 5 */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
879 if (avctx->hurry_up >= 5) return 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
880
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
881 if (s->next_p_frame_damaged) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
882 if (s->pict_type == B_TYPE)
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
883 return 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
884 else
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
885 s->next_p_frame_damaged = 0;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
886 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
887
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
888 frame_start (h);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
889
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
890 if (s->pict_type == B_TYPE) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
891 h->frame_num_offset = (h->slice_num - h->prev_frame_num);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
892
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
893 if (h->frame_num_offset < 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
894 h->frame_num_offset += 256;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
895 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
896 if (h->frame_num_offset == 0 || h->frame_num_offset >= h->prev_frame_num_offset) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1330
diff changeset
897 av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
898 return -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
899 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
900 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
901 h->prev_frame_num = h->frame_num;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
902 h->frame_num = h->slice_num;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
903 h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
904
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
905 if (h->prev_frame_num_offset < 0) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
906 h->prev_frame_num_offset += 256;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
907 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
908 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
909
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
910 for(m=0; m<2; m++){
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
911 int i;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
912 for(i=0; i<4; i++){
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
913 int j;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
914 for(j=-1; j<4; j++)
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
915 h->ref_cache[m][scan8[0] + 8*i + j]= 1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
916 h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
917 }
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
918 }
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
919
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
920 for (s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
921 for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) {
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
922
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
923 if ( (s->gb.index + 7) >= s->gb.size_in_bits &&
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
924 ((s->gb.index & 7) == 0 || show_bits (&s->gb, (-s->gb.index & 7)) == 0)) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
925
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
926 s->gb.index = h->next_slice_index;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
927 s->gb.size_in_bits = 8*buf_size;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
928
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
929 if (svq3_decode_slice_header (h))
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
930 return -1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
931
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
932 /* TODO: support s->mb_skip_run */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
933 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
934
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
935 mb_type = svq3_get_ue_golomb (&s->gb);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
936
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
937 if (s->pict_type == I_TYPE) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
938 mb_type += 8;
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
939 } else if (s->pict_type == B_TYPE && mb_type >= 4) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
940 mb_type += 4;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
941 }
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
942 if (mb_type > 33 || svq3_decode_mb (h, mb_type)) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1330
diff changeset
943 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
944 return -1;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
945 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
946
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
947 if (mb_type != 0) {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
948 hl_decode_mb (h);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
949 }
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
950
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
951 if (s->pict_type != B_TYPE && !s->low_delay) {
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
952 s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] =
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
953 (s->pict_type == P_TYPE && mb_type < 8) ? (mb_type - 1) : -1;
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1321
diff changeset
954 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
955 }
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
956
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
957 ff_draw_horiz_band(s, 16*s->mb_y, 16);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
958 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
959
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
960 MPV_frame_end(s);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
961
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
962 if (s->pict_type == B_TYPE || s->low_delay) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
963 *(AVFrame *) data = *(AVFrame *) &s->current_picture;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
964 } else {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
965 *(AVFrame *) data = *(AVFrame *) &s->last_picture;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
966 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
967
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
968 avctx->frame_number = s->picture_number - 1;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
969
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
970 /* dont output the last pic after seeking */
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
971 if (s->last_picture_ptr || s->low_delay) {
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
972 *data_size = sizeof(AVFrame);
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
973 }
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
974
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
975 return buf_size;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
976 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
977
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
978
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
979 AVCodec svq3_decoder = {
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
980 "svq3",
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
981 CODEC_TYPE_VIDEO,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
982 CODEC_ID_SVQ3,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
983 sizeof(H264Context),
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
984 decode_init,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
985 NULL,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
986 decode_end,
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
987 svq3_decode_frame,
1268
fb865ca0c251 CODEC_CAP_DRAW_HORIZ_BAND
michaelni
parents: 1267
diff changeset
988 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents:
diff changeset
989 };