Mercurial > libavcodec.hg
comparison svq3.c @ 8196:2717c68de07f libavcodec
cosmetics: indentation, prettyprinting
author | diego |
---|---|
date | Sat, 22 Nov 2008 16:36:50 +0000 |
parents | cfe339a90018 |
children | 65e05fda5280 |
comparison
equal
deleted
inserted
replaced
8195:cfe339a90018 | 8196:2717c68de07f |
---|---|
63 | / | |/ | | 63 | / | |/ | |
64 o o o o | 64 o o o o |
65 / | 65 / |
66 o-->o-->o-->o | 66 o-->o-->o-->o |
67 */ | 67 */ |
68 static const uint8_t svq3_scan[16]={ | 68 static const uint8_t svq3_scan[16] = { |
69 0+0*4, 1+0*4, 2+0*4, 2+1*4, | 69 0+0*4, 1+0*4, 2+0*4, 2+1*4, |
70 2+2*4, 3+0*4, 3+1*4, 3+2*4, | 70 2+2*4, 3+0*4, 3+1*4, 3+2*4, |
71 0+1*4, 0+2*4, 1+1*4, 1+2*4, | 71 0+1*4, 0+2*4, 1+1*4, 1+2*4, |
72 0+3*4, 1+3*4, 2+3*4, 3+3*4, | 72 0+3*4, 1+3*4, 2+3*4, 3+3*4, |
73 }; | 73 }; |
74 | 74 |
75 static const uint8_t svq3_pred_0[25][2] = { | 75 static const uint8_t svq3_pred_0[25][2] = { |
76 { 0, 0 }, | 76 { 0, 0 }, |
77 { 1, 0 }, { 0, 1 }, | 77 { 1, 0 }, { 0, 1 }, |
78 { 0, 2 }, { 1, 1 }, { 2, 0 }, | 78 { 0, 2 }, { 1, 1 }, { 2, 0 }, |
79 { 3, 0 }, { 2, 1 }, { 1, 2 }, { 0, 3 }, | 79 { 3, 0 }, { 2, 1 }, { 1, 2 }, { 0, 3 }, |
80 { 0, 4 }, { 1, 3 }, { 2, 2 }, { 3, 1 }, { 4, 0 }, | 80 { 0, 4 }, { 1, 3 }, { 2, 2 }, { 3, 1 }, { 4, 0 }, |
81 { 4, 1 }, { 3, 2 }, { 2, 3 }, { 1, 4 }, | 81 { 4, 1 }, { 3, 2 }, { 2, 3 }, { 1, 4 }, |
82 { 2, 4 }, { 3, 3 }, { 4, 2 }, | 82 { 2, 4 }, { 3, 3 }, { 4, 2 }, |
83 { 4, 3 }, { 3, 4 }, | 83 { 4, 3 }, { 3, 4 }, |
84 { 4, 4 } | 84 { 4, 4 } |
85 }; | 85 }; |
86 | 86 |
87 static const int8_t svq3_pred_1[6][6][5] = { | 87 static const int8_t svq3_pred_1[6][6][5] = { |
88 { { 2,-1,-1,-1,-1 }, { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, | 88 { { 2,-1,-1,-1,-1 }, { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, |
89 { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, { 1, 2,-1,-1,-1 } }, | 89 { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, { 1, 2,-1,-1,-1 } }, |
90 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 4, 3 }, { 0, 1, 2, 4, 3 }, | 90 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 4, 3 }, { 0, 1, 2, 4, 3 }, |
91 { 0, 2, 1, 4, 3 }, { 2, 0, 1, 3, 4 }, { 0, 4, 2, 1, 3 } }, | 91 { 0, 2, 1, 4, 3 }, { 2, 0, 1, 3, 4 }, { 0, 4, 2, 1, 3 } }, |
92 { { 2, 0,-1,-1,-1 }, { 2, 1, 0, 4, 3 }, { 1, 2, 4, 0, 3 }, | 92 { { 2, 0,-1,-1,-1 }, { 2, 1, 0, 4, 3 }, { 1, 2, 4, 0, 3 }, |
93 { 2, 1, 0, 4, 3 }, { 2, 1, 4, 3, 0 }, { 1, 2, 4, 0, 3 } }, | 93 { 2, 1, 0, 4, 3 }, { 2, 1, 4, 3, 0 }, { 1, 2, 4, 0, 3 } }, |
94 { { 2, 0,-1,-1,-1 }, { 2, 0, 1, 4, 3 }, { 1, 2, 0, 4, 3 }, | 94 { { 2, 0,-1,-1,-1 }, { 2, 0, 1, 4, 3 }, { 1, 2, 0, 4, 3 }, |
95 { 2, 1, 0, 4, 3 }, { 2, 1, 3, 4, 0 }, { 2, 4, 1, 0, 3 } }, | 95 { 2, 1, 0, 4, 3 }, { 2, 1, 3, 4, 0 }, { 2, 4, 1, 0, 3 } }, |
96 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 3, 4 }, { 1, 2, 3, 0, 4 }, | 96 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 3, 4 }, { 1, 2, 3, 0, 4 }, |
97 { 2, 0, 1, 3, 4 }, { 2, 1, 3, 0, 4 }, { 2, 0, 4, 3, 1 } }, | 97 { 2, 0, 1, 3, 4 }, { 2, 1, 3, 0, 4 }, { 2, 0, 4, 3, 1 } }, |
98 { { 0, 2,-1,-1,-1 }, { 0, 2, 4, 1, 3 }, { 1, 4, 2, 0, 3 }, | 98 { { 0, 2,-1,-1,-1 }, { 0, 2, 4, 1, 3 }, { 1, 4, 2, 0, 3 }, |
99 { 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } }, | 99 { 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } }, |
100 }; | 100 }; |
101 | 101 |
102 static const struct { uint8_t run; uint8_t level; } svq3_dct_tables[2][16] = { | 102 static const struct { uint8_t run; uint8_t level; } svq3_dct_tables[2][16] = { |
103 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 }, | 103 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 }, |
104 { 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } }, | 104 { 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } }, |
105 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 }, | 105 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 }, |
106 { 3, 1 }, { 4, 1 }, { 1, 2 }, { 1, 3 }, { 0, 6 }, { 0, 7 }, { 0, 8 }, { 0, 9 } } | 106 { 3, 1 }, { 4, 1 }, { 1, 2 }, { 1, 3 }, { 0, 6 }, { 0, 7 }, { 0, 8 }, { 0, 9 } } |
107 }; | 107 }; |
108 | 108 |
109 static const uint32_t svq3_dequant_coeff[32] = { | 109 static const uint32_t svq3_dequant_coeff[32] = { |
110 3881, 4351, 4890, 5481, 6154, 6914, 7761, 8718, | 110 3881, 4351, 4890, 5481, 6154, 6914, 7761, 8718, |
111 9781, 10987, 12339, 13828, 15523, 17435, 19561, 21873, | 111 9781, 10987, 12339, 13828, 15523, 17435, 19561, 21873, |
112 24552, 27656, 30847, 34870, 38807, 43747, 49103, 54683, | 112 24552, 27656, 30847, 34870, 38807, 43747, 49103, 54683, |
113 61694, 68745, 77615, 89113,100253,109366,126635,141533 | 113 61694, 68745, 77615, 89113,100253,109366,126635,141533 |
114 }; | 114 }; |
115 | 115 |
116 | 116 |
117 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) | 117 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) |
118 { | 118 { |
119 const int qmul= svq3_dequant_coeff[qp]; | 119 const int qmul = svq3_dequant_coeff[qp]; |
120 #define stride 16 | 120 #define stride 16 |
121 int i; | 121 int i; |
122 int temp[16]; | 122 int temp[16]; |
123 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | 123 static const int x_offset[4] = {0, 1*stride, 4* stride, 5*stride}; |
124 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | 124 static const int y_offset[4] = {0, 2*stride, 8* stride, 10*stride}; |
125 | 125 |
126 for(i=0; i<4; i++){ | 126 for (i = 0; i < 4; i++){ |
127 const int offset= y_offset[i]; | 127 const int offset = y_offset[i]; |
128 const int z0= 13*(block[offset+stride*0] + block[offset+stride*4]); | 128 const int z0 = 13*(block[offset+stride*0] + block[offset+stride*4]); |
129 const int z1= 13*(block[offset+stride*0] - block[offset+stride*4]); | 129 const int z1 = 13*(block[offset+stride*0] - block[offset+stride*4]); |
130 const int z2= 7* block[offset+stride*1] - 17*block[offset+stride*5]; | 130 const int z2 = 7* block[offset+stride*1] - 17*block[offset+stride*5]; |
131 const int z3= 17* block[offset+stride*1] + 7*block[offset+stride*5]; | 131 const int z3 = 17* block[offset+stride*1] + 7*block[offset+stride*5]; |
132 | 132 |
133 temp[4*i+0]= z0+z3; | 133 temp[4*i+0] = z0+z3; |
134 temp[4*i+1]= z1+z2; | 134 temp[4*i+1] = z1+z2; |
135 temp[4*i+2]= z1-z2; | 135 temp[4*i+2] = z1-z2; |
136 temp[4*i+3]= z0-z3; | 136 temp[4*i+3] = z0-z3; |
137 } | 137 } |
138 | 138 |
139 for(i=0; i<4; i++){ | 139 for (i = 0; i < 4; i++){ |
140 const int offset= x_offset[i]; | 140 const int offset = x_offset[i]; |
141 const int z0= 13*(temp[4*0+i] + temp[4*2+i]); | 141 const int z0 = 13*(temp[4*0+i] + temp[4*2+i]); |
142 const int z1= 13*(temp[4*0+i] - temp[4*2+i]); | 142 const int z1 = 13*(temp[4*0+i] - temp[4*2+i]); |
143 const int z2= 7* temp[4*1+i] - 17*temp[4*3+i]; | 143 const int z2 = 7* temp[4*1+i] - 17*temp[4*3+i]; |
144 const int z3= 17* temp[4*1+i] + 7*temp[4*3+i]; | 144 const int z3 = 17* temp[4*1+i] + 7*temp[4*3+i]; |
145 | 145 |
146 block[stride*0 +offset]= ((z0 + z3)*qmul + 0x80000)>>20; | 146 block[stride*0 +offset] = ((z0 + z3)*qmul + 0x80000) >> 20; |
147 block[stride*2 +offset]= ((z1 + z2)*qmul + 0x80000)>>20; | 147 block[stride*2 +offset] = ((z1 + z2)*qmul + 0x80000) >> 20; |
148 block[stride*8 +offset]= ((z1 - z2)*qmul + 0x80000)>>20; | 148 block[stride*8 +offset] = ((z1 - z2)*qmul + 0x80000) >> 20; |
149 block[stride*10+offset]= ((z0 - z3)*qmul + 0x80000)>>20; | 149 block[stride*10+offset] = ((z0 - z3)*qmul + 0x80000) >> 20; |
150 } | 150 } |
151 } | 151 } |
152 #undef stride | 152 #undef stride |
153 | 153 |
154 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc) | 154 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, |
155 int dc) | |
155 { | 156 { |
156 const int qmul= svq3_dequant_coeff[qp]; | 157 const int qmul = svq3_dequant_coeff[qp]; |
157 int i; | 158 int i; |
158 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; | 159 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; |
159 | 160 |
160 if (dc) { | 161 if (dc) { |
161 dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2)); | 162 dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2)); |
162 block[0] = 0; | 163 block[0] = 0; |
163 } | 164 } |
164 | 165 |
165 for (i=0; i < 4; i++) { | 166 for (i = 0; i < 4; i++) { |
166 const int z0= 13*(block[0 + 4*i] + block[2 + 4*i]); | 167 const int z0 = 13*(block[0 + 4*i] + block[2 + 4*i]); |
167 const int z1= 13*(block[0 + 4*i] - block[2 + 4*i]); | 168 const int z1 = 13*(block[0 + 4*i] - block[2 + 4*i]); |
168 const int z2= 7* block[1 + 4*i] - 17*block[3 + 4*i]; | 169 const int z2 = 7* block[1 + 4*i] - 17*block[3 + 4*i]; |
169 const int z3= 17* block[1 + 4*i] + 7*block[3 + 4*i]; | 170 const int z3 = 17* block[1 + 4*i] + 7*block[3 + 4*i]; |
170 | 171 |
171 block[0 + 4*i]= z0 + z3; | 172 block[0 + 4*i] = z0 + z3; |
172 block[1 + 4*i]= z1 + z2; | 173 block[1 + 4*i] = z1 + z2; |
173 block[2 + 4*i]= z1 - z2; | 174 block[2 + 4*i] = z1 - z2; |
174 block[3 + 4*i]= z0 - z3; | 175 block[3 + 4*i] = z0 - z3; |
175 } | 176 } |
176 | 177 |
177 for (i=0; i < 4; i++) { | 178 for (i = 0; i < 4; i++) { |
178 const int z0= 13*(block[i + 4*0] + block[i + 4*2]); | 179 const int z0 = 13*(block[i + 4*0] + block[i + 4*2]); |
179 const int z1= 13*(block[i + 4*0] - block[i + 4*2]); | 180 const int z1 = 13*(block[i + 4*0] - block[i + 4*2]); |
180 const int z2= 7* block[i + 4*1] - 17*block[i + 4*3]; | 181 const int z2 = 7* block[i + 4*1] - 17*block[i + 4*3]; |
181 const int z3= 17* block[i + 4*1] + 7*block[i + 4*3]; | 182 const int z3 = 17* block[i + 4*1] + 7*block[i + 4*3]; |
182 const int rr= (dc + 0x80000); | 183 const int rr = (dc + 0x80000); |
183 | 184 |
184 dst[i + stride*0]= cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ]; | 185 dst[i + stride*0] = cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ]; |
185 dst[i + stride*1]= cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ]; | 186 dst[i + stride*1] = cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ]; |
186 dst[i + stride*2]= cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ]; | 187 dst[i + stride*2] = cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ]; |
187 dst[i + stride*3]= cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ]; | 188 dst[i + stride*3] = cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ]; |
188 } | 189 } |
189 } | 190 } |
190 | 191 |
191 static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block, | 192 static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block, |
192 int index, const int type) | 193 int index, const int type) |
193 { | 194 { |
194 static const uint8_t *const scan_patterns[4] = | 195 static const uint8_t *const scan_patterns[4] = |
195 { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan }; | 196 { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan }; |
196 | 197 |
197 int run, level, sign, vlc, limit; | 198 int run, level, sign, vlc, limit; |
198 const int intra = (3 * type) >> 2; | 199 const int intra = (3 * type) >> 2; |
199 const uint8_t *const scan = scan_patterns[type]; | 200 const uint8_t *const scan = scan_patterns[type]; |
200 | 201 |
201 for (limit=(16 >> intra); index < 16; index=limit, limit+=8) { | 202 for (limit = (16 >> intra); index < 16; index = limit, limit += 8) { |
202 for (; (vlc = svq3_get_ue_golomb (gb)) != 0; index++) { | 203 for (; (vlc = svq3_get_ue_golomb(gb)) != 0; index++) { |
203 | 204 |
204 if (vlc == INVALID_VLC) | 205 if (vlc == INVALID_VLC) |
205 return -1; | 206 return -1; |
206 | 207 |
207 sign = (vlc & 0x1) - 1; | 208 sign = (vlc & 0x1) - 1; |
208 vlc = (vlc + 1) >> 1; | 209 vlc = (vlc + 1) >> 1; |
209 | 210 |
210 if (type == 3) { | 211 if (type == 3) { |
211 if (vlc < 3) { | 212 if (vlc < 3) { |
212 run = 0; | 213 run = 0; |
213 level = vlc; | 214 level = vlc; |
214 } else if (vlc < 4) { | 215 } else if (vlc < 4) { |
215 run = 1; | 216 run = 1; |
216 level = 1; | 217 level = 1; |
217 } else { | 218 } else { |
218 run = (vlc & 0x3); | 219 run = (vlc & 0x3); |
219 level = ((vlc + 9) >> 2) - run; | 220 level = ((vlc + 9) >> 2) - run; |
220 } | 221 } |
221 } else { | 222 } else { |
222 if (vlc < 16) { | 223 if (vlc < 16) { |
223 run = svq3_dct_tables[intra][vlc].run; | 224 run = svq3_dct_tables[intra][vlc].run; |
224 level = svq3_dct_tables[intra][vlc].level; | 225 level = svq3_dct_tables[intra][vlc].level; |
225 } else if (intra) { | 226 } else if (intra) { |
226 run = (vlc & 0x7); | 227 run = (vlc & 0x7); |
227 level = (vlc >> 3) + ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1))); | 228 level = (vlc >> 3) + ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1))); |
228 } else { | 229 } else { |
229 run = (vlc & 0xF); | 230 run = (vlc & 0xF); |
230 level = (vlc >> 4) + ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0))); | 231 level = (vlc >> 4) + ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0))); |
231 } | 232 } |
232 } | 233 } |
233 | 234 |
234 if ((index += run) >= limit) | 235 if ((index += run) >= limit) |
235 return -1; | 236 return -1; |
236 | 237 |
237 block[scan[index]] = (level ^ sign) - sign; | 238 block[scan[index]] = (level ^ sign) - sign; |
238 } | 239 } |
239 | 240 |
240 if (type != 2) { | 241 if (type != 2) { |
241 break; | 242 break; |
242 } | 243 } |
243 } | 244 } |
244 | 245 |
245 return 0; | 246 return 0; |
246 } | 247 } |
247 | 248 |
248 static inline void svq3_mc_dir_part(MpegEncContext *s, | 249 static inline void svq3_mc_dir_part(MpegEncContext *s, |
249 int x, int y, int width, int height, | 250 int x, int y, int width, int height, |
250 int mx, int my, int dxy, | 251 int mx, int my, int dxy, |
251 int thirdpel, int dir, int avg) | 252 int thirdpel, int dir, int avg) |
252 { | 253 { |
253 const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture; | 254 const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture; |
254 uint8_t *src, *dest; | 255 uint8_t *src, *dest; |
255 int i, emu = 0; | 256 int i, emu = 0; |
256 int blocksize= 2 - (width>>3); //16->0, 8->1, 4->2 | 257 int blocksize = 2 - (width>>3); //16->0, 8->1, 4->2 |
257 | 258 |
258 mx += x; | 259 mx += x; |
259 my += y; | 260 my += y; |
260 | 261 |
261 if (mx < 0 || mx >= (s->h_edge_pos - width - 1) || | 262 if (mx < 0 || mx >= (s->h_edge_pos - width - 1) || |
262 my < 0 || my >= (s->v_edge_pos - height - 1)) { | 263 my < 0 || my >= (s->v_edge_pos - height - 1)) { |
263 | 264 |
264 if ((s->flags & CODEC_FLAG_EMU_EDGE)) { | 265 if ((s->flags & CODEC_FLAG_EMU_EDGE)) { |
265 emu = 1; | 266 emu = 1; |
266 } | 267 } |
267 | 268 |
268 mx = av_clip (mx, -16, (s->h_edge_pos - width + 15)); | 269 mx = av_clip (mx, -16, (s->h_edge_pos - width + 15)); |
269 my = av_clip (my, -16, (s->v_edge_pos - height + 15)); | 270 my = av_clip (my, -16, (s->v_edge_pos - height + 15)); |
270 } | 271 } |
271 | 272 |
272 /* form component predictions */ | 273 /* form component predictions */ |
273 dest = s->current_picture.data[0] + x + y*s->linesize; | 274 dest = s->current_picture.data[0] + x + y*s->linesize; |
274 src = pic->data[0] + mx + my*s->linesize; | 275 src = pic->data[0] + mx + my*s->linesize; |
275 | 276 |
276 if (emu) { | 277 if (emu) { |
277 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1), | 278 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1), |
278 mx, my, s->h_edge_pos, s->v_edge_pos); | 279 mx, my, s->h_edge_pos, s->v_edge_pos); |
279 src = s->edge_emu_buffer; | |
280 } | |
281 if(thirdpel) | |
282 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height); | |
283 else | |
284 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height); | |
285 | |
286 if (!(s->flags & CODEC_FLAG_GRAY)) { | |
287 mx = (mx + (mx < (int) x)) >> 1; | |
288 my = (my + (my < (int) y)) >> 1; | |
289 width = (width >> 1); | |
290 height = (height >> 1); | |
291 blocksize++; | |
292 | |
293 for (i=1; i < 3; i++) { | |
294 dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize; | |
295 src = pic->data[i] + mx + my*s->uvlinesize; | |
296 | |
297 if (emu) { | |
298 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1), | |
299 mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1)); | |
300 src = s->edge_emu_buffer; | 280 src = s->edge_emu_buffer; |
301 } | 281 } |
302 if(thirdpel) | 282 if (thirdpel) |
303 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height); | 283 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height); |
304 else | 284 else |
305 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height); | 285 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height); |
306 } | 286 |
307 } | 287 if (!(s->flags & CODEC_FLAG_GRAY)) { |
288 mx = (mx + (mx < (int) x)) >> 1; | |
289 my = (my + (my < (int) y)) >> 1; | |
290 width = (width >> 1); | |
291 height = (height >> 1); | |
292 blocksize++; | |
293 | |
294 for (i = 1; i < 3; i++) { | |
295 dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize; | |
296 src = pic->data[i] + mx + my*s->uvlinesize; | |
297 | |
298 if (emu) { | |
299 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1), | |
300 mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1)); | |
301 src = s->edge_emu_buffer; | |
302 } | |
303 if (thirdpel) | |
304 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height); | |
305 else | |
306 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height); | |
307 } | |
308 } | |
308 } | 309 } |
309 | 310 |
310 static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir, | 311 static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir, |
311 int avg) | 312 int avg) |
312 { | 313 { |
313 int i, j, k, mx, my, dx, dy, x, y; | 314 int i, j, k, mx, my, dx, dy, x, y; |
314 MpegEncContext *const s = (MpegEncContext *) h; | 315 MpegEncContext *const s = (MpegEncContext *) h; |
315 const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1); | 316 const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1); |
316 const int part_height = 16 >> ((unsigned) (size + 1) / 3); | 317 const int part_height = 16 >> ((unsigned) (size + 1) / 3); |
317 const int extra_width = (mode == PREDICT_MODE) ? -16*6 : 0; | 318 const int extra_width = (mode == PREDICT_MODE) ? -16*6 : 0; |
318 const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width; | 319 const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width; |
319 const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width; | 320 const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width; |
320 | 321 |
321 for (i=0; i < 16; i+=part_height) { | 322 for (i = 0; i < 16; i += part_height) { |
322 for (j=0; j < 16; j+=part_width) { | 323 for (j = 0; j < 16; j += part_width) { |
323 const int b_xy = (4*s->mb_x+(j>>2)) + (4*s->mb_y+(i>>2))*h->b_stride; | 324 const int b_xy = (4*s->mb_x + (j >> 2)) + (4*s->mb_y + (i >> 2))*h->b_stride; |
324 int dxy; | 325 int dxy; |
325 x = 16*s->mb_x + j; | 326 x = 16*s->mb_x + j; |
326 y = 16*s->mb_y + i; | 327 y = 16*s->mb_y + i; |
327 k = ((j>>2)&1) + ((i>>1)&2) + ((j>>1)&4) + (i&8); | 328 k = ((j >> 2) & 1) + ((i >> 1) & 2) + ((j >> 1) & 4) + (i & 8); |
328 | 329 |
329 if (mode != PREDICT_MODE) { | 330 if (mode != PREDICT_MODE) { |
330 pred_motion (h, k, (part_width >> 2), dir, 1, &mx, &my); | 331 pred_motion(h, k, (part_width >> 2), dir, 1, &mx, &my); |
331 } else { | 332 } else { |
332 mx = s->next_picture.motion_val[0][b_xy][0]<<1; | 333 mx = s->next_picture.motion_val[0][b_xy][0]<<1; |
333 my = s->next_picture.motion_val[0][b_xy][1]<<1; | 334 my = s->next_picture.motion_val[0][b_xy][1]<<1; |
334 | 335 |
335 if (dir == 0) { | 336 if (dir == 0) { |
336 mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1; | 337 mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1) >> 1; |
337 my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1; | 338 my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1) >> 1; |
338 } else { | 339 } else { |
339 mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; | 340 mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1) >> 1; |
340 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; | 341 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1) >> 1; |
341 } | 342 } |
342 } | 343 } |
343 | 344 |
344 /* clip motion vector prediction to frame border */ | 345 /* clip motion vector prediction to frame border */ |
345 mx = av_clip (mx, extra_width - 6*x, h_edge_pos - 6*x); | 346 mx = av_clip(mx, extra_width - 6*x, h_edge_pos - 6*x); |
346 my = av_clip (my, extra_width - 6*y, v_edge_pos - 6*y); | 347 my = av_clip(my, extra_width - 6*y, v_edge_pos - 6*y); |
347 | 348 |
348 /* get (optional) motion vector differential */ | 349 /* get (optional) motion vector differential */ |
349 if (mode == PREDICT_MODE) { | 350 if (mode == PREDICT_MODE) { |
350 dx = dy = 0; | 351 dx = dy = 0; |
351 } else { | 352 } else { |
352 dy = svq3_get_se_golomb (&s->gb); | 353 dy = svq3_get_se_golomb(&s->gb); |
353 dx = svq3_get_se_golomb (&s->gb); | 354 dx = svq3_get_se_golomb(&s->gb); |
354 | 355 |
355 if (dx == INVALID_VLC || dy == INVALID_VLC) { | 356 if (dx == INVALID_VLC || dy == INVALID_VLC) { |
356 av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n"); | 357 av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n"); |
357 return -1; | 358 return -1; |
358 } | 359 } |
359 } | 360 } |
360 | 361 |
361 /* compute motion vector */ | 362 /* compute motion vector */ |
362 if (mode == THIRDPEL_MODE) { | 363 if (mode == THIRDPEL_MODE) { |
363 int fx, fy; | 364 int fx, fy; |
364 mx = ((mx + 1)>>1) + dx; | 365 mx = ((mx + 1)>>1) + dx; |
365 my = ((my + 1)>>1) + dy; | 366 my = ((my + 1)>>1) + dy; |
366 fx= ((unsigned)(mx + 0x3000))/3 - 0x1000; | 367 fx = ((unsigned)(mx + 0x3000))/3 - 0x1000; |
367 fy= ((unsigned)(my + 0x3000))/3 - 0x1000; | 368 fy = ((unsigned)(my + 0x3000))/3 - 0x1000; |
368 dxy= (mx - 3*fx) + 4*(my - 3*fy); | 369 dxy = (mx - 3*fx) + 4*(my - 3*fy); |
369 | 370 |
370 svq3_mc_dir_part (s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg); | 371 svq3_mc_dir_part(s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg); |
371 mx += mx; | 372 mx += mx; |
372 my += my; | 373 my += my; |
373 } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) { | 374 } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) { |
374 mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000; | 375 mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000; |
375 my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000; | 376 my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000; |
376 dxy= (mx&1) + 2*(my&1); | 377 dxy = (mx&1) + 2*(my&1); |
377 | 378 |
378 svq3_mc_dir_part (s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg); | 379 svq3_mc_dir_part(s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg); |
379 mx *= 3; | 380 mx *= 3; |
380 my *= 3; | 381 my *= 3; |
381 } else { | 382 } else { |
382 mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000; | 383 mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000; |
383 my = ((unsigned)(my + 3 + 0x6000))/6 + dy - 0x1000; | 384 my = ((unsigned)(my + 3 + 0x6000))/6 + dy - 0x1000; |
384 | 385 |
385 svq3_mc_dir_part (s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg); | 386 svq3_mc_dir_part(s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg); |
386 mx *= 6; | 387 mx *= 6; |
387 my *= 6; | 388 my *= 6; |
388 } | 389 } |
389 | 390 |
390 /* update mv_cache */ | 391 /* update mv_cache */ |
391 if (mode != PREDICT_MODE) { | 392 if (mode != PREDICT_MODE) { |
392 int32_t mv = pack16to32(mx,my); | 393 int32_t mv = pack16to32(mx,my); |
393 | 394 |
394 if (part_height == 8 && i < 8) { | 395 if (part_height == 8 && i < 8) { |
395 *(int32_t *) h->mv_cache[dir][scan8[k] + 1*8] = mv; | 396 *(int32_t *) h->mv_cache[dir][scan8[k] + 1*8] = mv; |
396 | 397 |
397 if (part_width == 8 && j < 8) { | 398 if (part_width == 8 && j < 8) { |
398 *(int32_t *) h->mv_cache[dir][scan8[k] + 1 + 1*8] = mv; | 399 *(int32_t *) h->mv_cache[dir][scan8[k] + 1 + 1*8] = mv; |
399 } | 400 } |
400 } | 401 } |
401 if (part_width == 8 && j < 8) { | 402 if (part_width == 8 && j < 8) { |
402 *(int32_t *) h->mv_cache[dir][scan8[k] + 1] = mv; | 403 *(int32_t *) h->mv_cache[dir][scan8[k] + 1] = mv; |
403 } | 404 } |
404 if (part_width == 4 || part_height == 4) { | 405 if (part_width == 4 || part_height == 4) { |
405 *(int32_t *) h->mv_cache[dir][scan8[k]] = mv; | 406 *(int32_t *) h->mv_cache[dir][scan8[k]] = mv; |
406 } | 407 } |
407 } | 408 } |
408 | 409 |
409 /* write back motion vectors */ | 410 /* write back motion vectors */ |
410 fill_rectangle(s->current_picture.motion_val[dir][b_xy], part_width>>2, part_height>>2, h->b_stride, pack16to32(mx,my), 4); | 411 fill_rectangle(s->current_picture.motion_val[dir][b_xy], part_width>>2, part_height>>2, h->b_stride, pack16to32(mx,my), 4); |
411 } | 412 } |
412 } | 413 } |
413 | 414 |
414 return 0; | 415 return 0; |
415 } | 416 } |
416 | 417 |
417 static int svq3_decode_mb(H264Context *h, unsigned int mb_type) | 418 static int svq3_decode_mb(H264Context *h, unsigned int mb_type) |
418 { | 419 { |
419 int i, j, k, m, dir, mode; | 420 int i, j, k, m, dir, mode; |
420 int cbp = 0; | 421 int cbp = 0; |
421 uint32_t vlc; | 422 uint32_t vlc; |
422 int8_t *top, *left; | 423 int8_t *top, *left; |
423 MpegEncContext *const s = (MpegEncContext *) h; | 424 MpegEncContext *const s = (MpegEncContext *) h; |
424 const int mb_xy = h->mb_xy; | 425 const int mb_xy = h->mb_xy; |
425 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | 426 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; |
426 | 427 |
427 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; | 428 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; |
428 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; | 429 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; |
429 h->topright_samples_available = 0xFFFF; | 430 h->topright_samples_available = 0xFFFF; |
430 | 431 |
431 if (mb_type == 0) { /* SKIP */ | 432 if (mb_type == 0) { /* SKIP */ |
432 if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) { | 433 if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) { |
433 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0); | 434 svq3_mc_dir_part(s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0); |
434 | 435 |
435 if (s->pict_type == FF_B_TYPE) { | 436 if (s->pict_type == FF_B_TYPE) { |
436 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1); | 437 svq3_mc_dir_part(s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1); |
437 } | 438 } |
438 | 439 |
439 mb_type = MB_TYPE_SKIP; | 440 mb_type = MB_TYPE_SKIP; |
440 } else { | 441 } else { |
441 mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 6); | 442 mb_type = FFMIN(s->next_picture.mb_type[mb_xy], 6); |
442 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0) < 0) | 443 if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 0, 0) < 0) |
443 return -1; | 444 return -1; |
444 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1) < 0) | 445 if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 1, 1) < 0) |
445 return -1; | 446 return -1; |
446 | 447 |
447 mb_type = MB_TYPE_16x16; | 448 mb_type = MB_TYPE_16x16; |
448 } | 449 } |
449 } else if (mb_type < 8) { /* INTER */ | 450 } else if (mb_type < 8) { /* INTER */ |
450 if (h->thirdpel_flag && h->halfpel_flag == !get_bits1 (&s->gb)) { | 451 if (h->thirdpel_flag && h->halfpel_flag == !get_bits1 (&s->gb)) { |
451 mode = THIRDPEL_MODE; | 452 mode = THIRDPEL_MODE; |
452 } else if (h->halfpel_flag && h->thirdpel_flag == !get_bits1 (&s->gb)) { | 453 } else if (h->halfpel_flag && h->thirdpel_flag == !get_bits1 (&s->gb)) { |
453 mode = HALFPEL_MODE; | 454 mode = HALFPEL_MODE; |
454 } else { | 455 } else { |
455 mode = FULLPEL_MODE; | 456 mode = FULLPEL_MODE; |
456 } | 457 } |
457 | 458 |
458 /* fill caches */ | 459 /* fill caches */ |
459 /* note ref_cache should contain here: | 460 /* note ref_cache should contain here: |
460 ???????? | 461 ???????? |
461 ???11111 | 462 ???11111 |
462 N??11111 | 463 N??11111 |
463 N??11111 | 464 N??11111 |
464 N??11111 | 465 N??11111 |
465 */ | 466 */ |
466 | 467 |
467 for (m=0; m < 2; m++) { | 468 for (m = 0; m < 2; m++) { |
468 if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) { | 469 if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) { |
469 for (i=0; i < 4; i++) { | 470 for (i = 0; i < 4; i++) { |
470 *(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]; | 471 *(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]; |
471 } | 472 } |
472 } else { | 473 } else { |
473 for (i=0; i < 4; i++) { | 474 for (i = 0; i < 4; i++) { |
474 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0; | 475 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0; |
475 } | 476 } |
476 } | 477 } |
477 if (s->mb_y > 0) { | 478 if (s->mb_y > 0) { |
478 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)); | 479 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)); |
479 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); | 480 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); |
480 | 481 |
481 if (s->mb_x < (s->mb_width - 1)) { | 482 if (s->mb_x < (s->mb_width - 1)) { |
482 *(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]; | 483 *(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]; |
483 h->ref_cache[m][scan8[0] + 4 - 1*8] = | 484 h->ref_cache[m][scan8[0] + 4 - 1*8] = |
484 (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 || | 485 (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 || |
485 h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1; | 486 h->intra4x4_pred_mode[mb_xy - s->mb_stride ][4] == -1) ? PART_NOT_AVAILABLE : 1; |
486 }else | 487 }else |
487 h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE; | 488 h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE; |
488 if (s->mb_x > 0) { | 489 if (s->mb_x > 0) { |
489 *(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]; | 490 *(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]; |
490 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; | 491 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; |
491 }else | 492 }else |
492 h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE; | 493 h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE; |
493 }else | 494 }else |
494 memset (&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8); | 495 memset(&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8); |
495 | 496 |
496 if (s->pict_type != FF_B_TYPE) | 497 if (s->pict_type != FF_B_TYPE) |
497 break; | 498 break; |
498 } | 499 } |
499 | 500 |
500 /* decode motion vector(s) and form prediction(s) */ | 501 /* decode motion vector(s) and form prediction(s) */ |
501 if (s->pict_type == FF_P_TYPE) { | 502 if (s->pict_type == FF_P_TYPE) { |
502 if(svq3_mc_dir (h, (mb_type - 1), mode, 0, 0) < 0) | 503 if (svq3_mc_dir(h, (mb_type - 1), mode, 0, 0) < 0) |
503 return -1; | 504 return -1; |
504 } else { /* FF_B_TYPE */ | 505 } else { /* FF_B_TYPE */ |
505 if (mb_type != 2) { | 506 if (mb_type != 2) { |
506 if(svq3_mc_dir (h, 0, mode, 0, 0) < 0) | 507 if (svq3_mc_dir(h, 0, mode, 0, 0) < 0) |
507 return -1; | 508 return -1; |
508 } else { | 509 } else { |
509 for (i=0; i < 4; i++) { | 510 for (i = 0; i < 4; i++) { |
510 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | 511 memset(s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); |
511 } | 512 } |
512 } | 513 } |
513 if (mb_type != 1) { | 514 if (mb_type != 1) { |
514 if(svq3_mc_dir (h, 0, mode, 1, (mb_type == 3)) < 0) | 515 if (svq3_mc_dir(h, 0, mode, 1, (mb_type == 3)) < 0) |
515 return -1; | 516 return -1; |
516 } else { | 517 } else { |
517 for (i=0; i < 4; i++) { | 518 for (i = 0; i < 4; i++) { |
518 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | 519 memset(s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); |
519 } | 520 } |
520 } | 521 } |
521 } | 522 } |
522 | 523 |
523 mb_type = MB_TYPE_16x16; | 524 mb_type = MB_TYPE_16x16; |
524 } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */ | 525 } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */ |
525 memset (h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t)); | 526 memset(h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t)); |
526 | 527 |
527 if (mb_type == 8) { | 528 if (mb_type == 8) { |
528 if (s->mb_x > 0) { | 529 if (s->mb_x > 0) { |
529 for (i=0; i < 4; i++) { | 530 for (i = 0; i < 4; i++) { |
530 h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i]; | 531 h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i]; |
531 } | 532 } |
532 if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) { | 533 if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) { |
533 h->left_samples_available = 0x5F5F; | 534 h->left_samples_available = 0x5F5F; |
534 } | 535 } |
535 } | 536 } |
536 if (s->mb_y > 0) { | 537 if (s->mb_y > 0) { |
537 h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][4]; | 538 h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][4]; |
538 h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][5]; | 539 h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][5]; |
539 h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][6]; | 540 h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][6]; |
540 h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][3]; | 541 h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][3]; |
541 | 542 |
542 if (h->intra4x4_pred_mode_cache[4+8*0] == -1) { | 543 if (h->intra4x4_pred_mode_cache[4+8*0] == -1) { |
543 h->top_samples_available = 0x33FF; | 544 h->top_samples_available = 0x33FF; |
544 } | 545 } |
545 } | 546 } |
546 | 547 |
547 /* decode prediction codes for luma blocks */ | 548 /* decode prediction codes for luma blocks */ |
548 for (i=0; i < 16; i+=2) { | 549 for (i = 0; i < 16; i+=2) { |
549 vlc = svq3_get_ue_golomb (&s->gb); | 550 vlc = svq3_get_ue_golomb(&s->gb); |
550 | 551 |
551 if (vlc >= 25){ | 552 if (vlc >= 25){ |
552 av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc); | 553 av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc); |
553 return -1; | 554 return -1; |
554 } | 555 } |
555 | 556 |
556 left = &h->intra4x4_pred_mode_cache[scan8[i] - 1]; | 557 left = &h->intra4x4_pred_mode_cache[scan8[i] - 1]; |
557 top = &h->intra4x4_pred_mode_cache[scan8[i] - 8]; | 558 top = &h->intra4x4_pred_mode_cache[scan8[i] - 8]; |
558 | 559 |
559 left[1] = svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]]; | 560 left[1] = svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]]; |
560 left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]]; | 561 left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]]; |
561 | 562 |
562 if (left[1] == -1 || left[2] == -1){ | 563 if (left[1] == -1 || left[2] == -1){ |
563 av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n"); | 564 av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n"); |
564 return -1; | 565 return -1; |
565 } | 566 } |
566 } | 567 } |
567 } else { /* mb_type == 33, DC_128_PRED block type */ | 568 } else { /* mb_type == 33, DC_128_PRED block type */ |
568 for (i=0; i < 4; i++) { | 569 for (i = 0; i < 4; i++) { |
569 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4); | 570 memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4); |
570 } | 571 } |
571 } | 572 } |
572 | 573 |
573 write_back_intra_pred_mode (h); | 574 write_back_intra_pred_mode(h); |
574 | 575 |
575 if (mb_type == 8) { | 576 if (mb_type == 8) { |
576 check_intra4x4_pred_mode (h); | 577 check_intra4x4_pred_mode(h); |
577 | 578 |
578 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; | 579 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; |
579 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; | 580 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; |
580 } else { | 581 } else { |
581 for (i=0; i < 4; i++) { | 582 for (i = 0; i < 4; i++) { |
582 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4); | 583 memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4); |
583 } | 584 } |
584 | 585 |
585 h->top_samples_available = 0x33FF; | 586 h->top_samples_available = 0x33FF; |
586 h->left_samples_available = 0x5F5F; | 587 h->left_samples_available = 0x5F5F; |
587 } | 588 } |
588 | 589 |
589 mb_type = MB_TYPE_INTRA4x4; | 590 mb_type = MB_TYPE_INTRA4x4; |
590 } else { /* INTRA16x16 */ | 591 } else { /* INTRA16x16 */ |
591 dir = i_mb_type_info[mb_type - 8].pred_mode; | 592 dir = i_mb_type_info[mb_type - 8].pred_mode; |
592 dir = (dir >> 1) ^ 3*(dir & 1) ^ 1; | 593 dir = (dir >> 1) ^ 3*(dir & 1) ^ 1; |
593 | 594 |
594 if ((h->intra16x16_pred_mode = check_intra_pred_mode (h, dir)) == -1){ | 595 if ((h->intra16x16_pred_mode = check_intra_pred_mode(h, dir)) == -1){ |
595 av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n"); | 596 av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n"); |
596 return -1; | |
597 } | |
598 | |
599 cbp = i_mb_type_info[mb_type - 8].cbp; | |
600 mb_type = MB_TYPE_INTRA16x16; | |
601 } | |
602 | |
603 if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) { | |
604 for (i=0; i < 4; i++) { | |
605 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | |
606 } | |
607 if (s->pict_type == FF_B_TYPE) { | |
608 for (i=0; i < 4; i++) { | |
609 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | |
610 } | |
611 } | |
612 } | |
613 if (!IS_INTRA4x4(mb_type)) { | |
614 memset (h->intra4x4_pred_mode[mb_xy], DC_PRED, 8); | |
615 } | |
616 if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) { | |
617 memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t)); | |
618 s->dsp.clear_blocks(h->mb); | |
619 } | |
620 | |
621 if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) { | |
622 if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48){ | |
623 av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); | |
624 return -1; | |
625 } | |
626 | |
627 cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc]; | |
628 } | |
629 if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) { | |
630 s->qscale += svq3_get_se_golomb (&s->gb); | |
631 | |
632 if (s->qscale > 31){ | |
633 av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale); | |
634 return -1; | |
635 } | |
636 } | |
637 if (IS_INTRA16x16(mb_type)) { | |
638 if (svq3_decode_block (&s->gb, h->mb, 0, 0)){ | |
639 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); | |
640 return -1; | |
641 } | |
642 } | |
643 | |
644 if (cbp) { | |
645 const int index = IS_INTRA16x16(mb_type) ? 1 : 0; | |
646 const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1); | |
647 | |
648 for (i=0; i < 4; i++) { | |
649 if ((cbp & (1 << i))) { | |
650 for (j=0; j < 4; j++) { | |
651 k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j); | |
652 h->non_zero_count_cache[ scan8[k] ] = 1; | |
653 | |
654 if (svq3_decode_block (&s->gb, &h->mb[16*k], index, type)){ | |
655 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n"); | |
656 return -1; | 597 return -1; |
657 } | 598 } |
658 } | 599 |
659 } | 600 cbp = i_mb_type_info[mb_type - 8].cbp; |
660 } | 601 mb_type = MB_TYPE_INTRA16x16; |
661 | 602 } |
662 if ((cbp & 0x30)) { | 603 |
663 for (i=0; i < 2; ++i) { | 604 if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) { |
664 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){ | 605 for (i = 0; i < 4; i++) { |
665 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); | 606 memset(s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); |
666 return -1; | 607 } |
667 } | 608 if (s->pict_type == FF_B_TYPE) { |
668 } | 609 for (i = 0; i < 4; i++) { |
669 | 610 memset(s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); |
670 if ((cbp & 0x20)) { | 611 } |
671 for (i=0; i < 8; i++) { | 612 } |
672 h->non_zero_count_cache[ scan8[16+i] ] = 1; | 613 } |
673 | 614 if (!IS_INTRA4x4(mb_type)) { |
674 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + i)], 1, 1)){ | 615 memset(h->intra4x4_pred_mode[mb_xy], DC_PRED, 8); |
675 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); | 616 } |
617 if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) { | |
618 memset(h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t)); | |
619 s->dsp.clear_blocks(h->mb); | |
620 } | |
621 | |
622 if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) { | |
623 if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48){ | |
624 av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); | |
676 return -1; | 625 return -1; |
677 } | 626 } |
678 } | 627 |
679 } | 628 cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc]; |
680 } | 629 } |
681 } | 630 if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) { |
682 | 631 s->qscale += svq3_get_se_golomb(&s->gb); |
683 s->current_picture.mb_type[mb_xy] = mb_type; | 632 |
684 | 633 if (s->qscale > 31){ |
685 if (IS_INTRA(mb_type)) { | 634 av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale); |
686 h->chroma_pred_mode = check_intra_pred_mode (h, DC_PRED8x8); | 635 return -1; |
687 } | 636 } |
688 | 637 } |
689 return 0; | 638 if (IS_INTRA16x16(mb_type)) { |
639 if (svq3_decode_block(&s->gb, h->mb, 0, 0)){ | |
640 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); | |
641 return -1; | |
642 } | |
643 } | |
644 | |
645 if (cbp) { | |
646 const int index = IS_INTRA16x16(mb_type) ? 1 : 0; | |
647 const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1); | |
648 | |
649 for (i = 0; i < 4; i++) { | |
650 if ((cbp & (1 << i))) { | |
651 for (j = 0; j < 4; j++) { | |
652 k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j); | |
653 h->non_zero_count_cache[ scan8[k] ] = 1; | |
654 | |
655 if (svq3_decode_block(&s->gb, &h->mb[16*k], index, type)){ | |
656 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n"); | |
657 return -1; | |
658 } | |
659 } | |
660 } | |
661 } | |
662 | |
663 if ((cbp & 0x30)) { | |
664 for (i = 0; i < 2; ++i) { | |
665 if (svq3_decode_block(&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){ | |
666 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); | |
667 return -1; | |
668 } | |
669 } | |
670 | |
671 if ((cbp & 0x20)) { | |
672 for (i = 0; i < 8; i++) { | |
673 h->non_zero_count_cache[ scan8[16+i] ] = 1; | |
674 | |
675 if (svq3_decode_block(&s->gb, &h->mb[16*(16 + i)], 1, 1)){ | |
676 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); | |
677 return -1; | |
678 } | |
679 } | |
680 } | |
681 } | |
682 } | |
683 | |
684 s->current_picture.mb_type[mb_xy] = mb_type; | |
685 | |
686 if (IS_INTRA(mb_type)) { | |
687 h->chroma_pred_mode = check_intra_pred_mode(h, DC_PRED8x8); | |
688 } | |
689 | |
690 return 0; | |
690 } | 691 } |
691 | 692 |
692 static int svq3_decode_slice_header(H264Context *h) | 693 static int svq3_decode_slice_header(H264Context *h) |
693 { | 694 { |
694 MpegEncContext *const s = (MpegEncContext *) h; | 695 MpegEncContext *const s = (MpegEncContext *) h; |
695 const int mb_xy = h->mb_xy; | 696 const int mb_xy = h->mb_xy; |
696 int i, header; | 697 int i, header; |
697 | 698 |
698 header = get_bits (&s->gb, 8); | 699 header = get_bits(&s->gb, 8); |
699 | 700 |
700 if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) { | 701 if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) { |
701 /* TODO: what? */ | 702 /* TODO: what? */ |
702 av_log(h->s.avctx, AV_LOG_ERROR, "unsupported slice header (%02X)\n", header); | 703 av_log(h->s.avctx, AV_LOG_ERROR, "unsupported slice header (%02X)\n", header); |
703 return -1; | 704 return -1; |
704 } else { | 705 } else { |
705 int length = (header >> 5) & 3; | 706 int length = (header >> 5) & 3; |
706 | 707 |
707 h->next_slice_index = get_bits_count(&s->gb) + 8*show_bits (&s->gb, 8*length) + 8*length; | 708 h->next_slice_index = get_bits_count(&s->gb) + 8*show_bits(&s->gb, 8*length) + 8*length; |
708 | 709 |
709 if (h->next_slice_index > s->gb.size_in_bits){ | 710 if (h->next_slice_index > s->gb.size_in_bits) { |
710 av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n"); | 711 av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n"); |
711 return -1; | 712 return -1; |
712 } | 713 } |
713 | 714 |
714 s->gb.size_in_bits = h->next_slice_index - 8*(length - 1); | 715 s->gb.size_in_bits = h->next_slice_index - 8*(length - 1); |
715 skip_bits(&s->gb, 8); | 716 skip_bits(&s->gb, 8); |
716 | 717 |
717 if (h->svq3_watermark_key) { | 718 if (h->svq3_watermark_key) { |
718 uint32_t header = AV_RL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1]); | 719 uint32_t header = AV_RL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1]); |
719 AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1], header ^ h->svq3_watermark_key); | 720 AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1], header ^ h->svq3_watermark_key); |
720 } | 721 } |
721 if (length > 0) { | 722 if (length > 0) { |
722 memcpy ((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3], | 723 memcpy((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3], |
723 &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1)); | 724 &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1)); |
724 } | 725 } |
725 } | 726 } |
726 | 727 |
727 if ((i = svq3_get_ue_golomb (&s->gb)) == INVALID_VLC || i >= 3){ | 728 if ((i = svq3_get_ue_golomb(&s->gb)) == INVALID_VLC || i >= 3){ |
728 av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i); | 729 av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i); |
729 return -1; | 730 return -1; |
730 } | 731 } |
731 | 732 |
732 h->slice_type = golomb_to_pict_type[i]; | 733 h->slice_type = golomb_to_pict_type[i]; |
733 | 734 |
734 if ((header & 0x9F) == 2) { | 735 if ((header & 0x9F) == 2) { |
735 i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1)); | 736 i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1)); |
736 s->mb_skip_run = get_bits (&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width)); | 737 s->mb_skip_run = get_bits(&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width)); |
737 } else { | 738 } else { |
738 skip_bits1 (&s->gb); | 739 skip_bits1(&s->gb); |
739 s->mb_skip_run = 0; | 740 s->mb_skip_run = 0; |
740 } | 741 } |
741 | 742 |
742 h->slice_num = get_bits (&s->gb, 8); | 743 h->slice_num = get_bits(&s->gb, 8); |
743 s->qscale = get_bits (&s->gb, 5); | 744 s->qscale = get_bits(&s->gb, 5); |
744 s->adaptive_quant = get_bits1 (&s->gb); | 745 s->adaptive_quant = get_bits1(&s->gb); |
745 | 746 |
746 /* unknown fields */ | 747 /* unknown fields */ |
747 skip_bits1 (&s->gb); | 748 skip_bits1(&s->gb); |
748 | 749 |
749 if (h->unknown_svq3_flag) { | 750 if (h->unknown_svq3_flag) { |
750 skip_bits1 (&s->gb); | 751 skip_bits1(&s->gb); |
751 } | 752 } |
752 | 753 |
753 skip_bits1 (&s->gb); | 754 skip_bits1(&s->gb); |
754 skip_bits (&s->gb, 2); | 755 skip_bits(&s->gb, 2); |
755 | 756 |
756 while (get_bits1 (&s->gb)) { | 757 while (get_bits1(&s->gb)) { |
757 skip_bits (&s->gb, 8); | 758 skip_bits(&s->gb, 8); |
758 } | 759 } |
759 | 760 |
760 /* reset intra predictors and invalidate motion vector references */ | 761 /* reset intra predictors and invalidate motion vector references */ |
761 if (s->mb_x > 0) { | |
762 memset (h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t)); | |
763 memset (h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x); | |
764 } | |
765 if (s->mb_y > 0) { | |
766 memset (h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); | |
767 | |
768 if (s->mb_x > 0) { | 762 if (s->mb_x > 0) { |
769 h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1; | 763 memset(h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t)); |
770 } | 764 memset(h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x); |
771 } | 765 } |
772 | 766 if (s->mb_y > 0) { |
773 return 0; | 767 memset(h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); |
768 | |
769 if (s->mb_x > 0) { | |
770 h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1; | |
771 } | |
772 } | |
773 | |
774 return 0; | |
774 } | 775 } |
775 | 776 |
776 static int svq3_decode_frame(AVCodecContext *avctx, | 777 static int svq3_decode_frame(AVCodecContext *avctx, |
777 void *data, int *data_size, | 778 void *data, int *data_size, |
778 const uint8_t *buf, int buf_size) | 779 const uint8_t *buf, int buf_size) |
779 { | 780 { |
780 MpegEncContext *const s = avctx->priv_data; | 781 MpegEncContext *const s = avctx->priv_data; |
781 H264Context *const h = avctx->priv_data; | 782 H264Context *const h = avctx->priv_data; |
782 int m, mb_type; | 783 int m, mb_type; |
783 unsigned char *extradata; | 784 unsigned char *extradata; |
784 unsigned int size; | 785 unsigned int size; |
785 | 786 |
786 s->flags = avctx->flags; | 787 s->flags = avctx->flags; |
787 s->flags2 = avctx->flags2; | 788 s->flags2 = avctx->flags2; |
788 s->unrestricted_mv = 1; | 789 s->unrestricted_mv = 1; |
789 | 790 |
790 if (!s->context_initialized) { | 791 if (!s->context_initialized) { |
791 s->width = avctx->width; | 792 s->width = avctx->width; |
792 s->height = avctx->height; | 793 s->height = avctx->height; |
793 h->halfpel_flag = 1; | 794 h->halfpel_flag = 1; |
794 h->thirdpel_flag = 1; | 795 h->thirdpel_flag = 1; |
795 h->unknown_svq3_flag = 0; | 796 h->unknown_svq3_flag = 0; |
796 h->chroma_qp[0] = h->chroma_qp[1] = 4; | 797 h->chroma_qp[0] = h->chroma_qp[1] = 4; |
797 | 798 |
798 if (MPV_common_init (s) < 0) | 799 if (MPV_common_init(s) < 0) |
799 return -1; | 800 return -1; |
800 | 801 |
801 h->b_stride = 4*s->mb_width; | 802 h->b_stride = 4*s->mb_width; |
802 | 803 |
803 alloc_tables (h); | 804 alloc_tables(h); |
804 | 805 |
805 /* prowl for the "SEQH" marker in the extradata */ | 806 /* prowl for the "SEQH" marker in the extradata */ |
806 extradata = (unsigned char *)avctx->extradata; | 807 extradata = (unsigned char *)avctx->extradata; |
807 for (m = 0; m < avctx->extradata_size; m++) { | 808 for (m = 0; m < avctx->extradata_size; m++) { |
808 if (!memcmp (extradata, "SEQH", 4)) | 809 if (!memcmp(extradata, "SEQH", 4)) |
809 break; | 810 break; |
810 extradata++; | 811 extradata++; |
811 } | 812 } |
812 | 813 |
813 /* if a match was found, parse the extra data */ | 814 /* if a match was found, parse the extra data */ |
814 if (extradata && !memcmp (extradata, "SEQH", 4)) { | 815 if (extradata && !memcmp(extradata, "SEQH", 4)) { |
815 | 816 |
816 GetBitContext gb; | 817 GetBitContext gb; |
817 | 818 |
818 size = AV_RB32(&extradata[4]); | 819 size = AV_RB32(&extradata[4]); |
819 init_get_bits (&gb, extradata + 8, size*8); | 820 init_get_bits(&gb, extradata + 8, size*8); |
820 | 821 |
821 /* 'frame size code' and optional 'width, height' */ | 822 /* 'frame size code' and optional 'width, height' */ |
822 if (get_bits (&gb, 3) == 7) { | 823 if (get_bits(&gb, 3) == 7) { |
823 skip_bits (&gb, 12); | 824 skip_bits(&gb, 12); |
824 skip_bits (&gb, 12); | 825 skip_bits(&gb, 12); |
825 } | 826 } |
826 | 827 |
827 h->halfpel_flag = get_bits1 (&gb); | 828 h->halfpel_flag = get_bits1(&gb); |
828 h->thirdpel_flag = get_bits1 (&gb); | 829 h->thirdpel_flag = get_bits1(&gb); |
829 | 830 |
830 /* unknown fields */ | 831 /* unknown fields */ |
831 skip_bits1 (&gb); | 832 skip_bits1(&gb); |
832 skip_bits1 (&gb); | 833 skip_bits1(&gb); |
833 skip_bits1 (&gb); | 834 skip_bits1(&gb); |
834 skip_bits1 (&gb); | 835 skip_bits1(&gb); |
835 | 836 |
836 s->low_delay = get_bits1 (&gb); | 837 s->low_delay = get_bits1(&gb); |
837 | 838 |
838 /* unknown field */ | 839 /* unknown field */ |
839 skip_bits1 (&gb); | 840 skip_bits1(&gb); |
840 | 841 |
841 while (get_bits1 (&gb)) { | 842 while (get_bits1(&gb)) { |
842 skip_bits (&gb, 8); | 843 skip_bits(&gb, 8); |
843 } | 844 } |
844 | 845 |
845 h->unknown_svq3_flag = get_bits1 (&gb); | 846 h->unknown_svq3_flag = get_bits1(&gb); |
846 avctx->has_b_frames = !s->low_delay; | 847 avctx->has_b_frames = !s->low_delay; |
847 if (h->unknown_svq3_flag) { | 848 if (h->unknown_svq3_flag) { |
848 #ifdef CONFIG_ZLIB | 849 #ifdef CONFIG_ZLIB |
849 unsigned watermark_width = svq3_get_ue_golomb(&gb); | 850 unsigned watermark_width = svq3_get_ue_golomb(&gb); |
850 unsigned watermark_height = svq3_get_ue_golomb(&gb); | 851 unsigned watermark_height = svq3_get_ue_golomb(&gb); |
851 int u1 = svq3_get_ue_golomb(&gb); | 852 int u1 = svq3_get_ue_golomb(&gb); |
852 int u2 = get_bits(&gb, 8); | 853 int u2 = get_bits(&gb, 8); |
853 int u3 = get_bits(&gb, 2); | 854 int u3 = get_bits(&gb, 2); |
854 int u4 = svq3_get_ue_golomb(&gb); | 855 int u4 = svq3_get_ue_golomb(&gb); |
855 unsigned buf_len = watermark_width*watermark_height*4; | 856 unsigned buf_len = watermark_width*watermark_height*4; |
856 int offset = (get_bits_count(&gb)+7)>>3; | 857 int offset = (get_bits_count(&gb)+7)>>3; |
857 uint8_t *buf; | 858 uint8_t *buf; |
858 | 859 |
859 if ((uint64_t)watermark_width*4 > UINT_MAX/watermark_height) | 860 if ((uint64_t)watermark_width*4 > UINT_MAX/watermark_height) |
860 return -1; | 861 return -1; |
861 | 862 |
862 buf = av_malloc(buf_len); | 863 buf = av_malloc(buf_len); |
863 av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n", watermark_width, watermark_height); | 864 av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n", watermark_width, watermark_height); |
864 av_log(avctx, AV_LOG_DEBUG, "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n", u1, u2, u3, u4, offset); | 865 av_log(avctx, AV_LOG_DEBUG, "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n", u1, u2, u3, u4, offset); |
865 if (uncompress(buf, (uLong*)&buf_len, extradata + 8 + offset, size - offset) != Z_OK) { | 866 if (uncompress(buf, (uLong*)&buf_len, extradata + 8 + offset, size - offset) != Z_OK) { |
866 av_log(avctx, AV_LOG_ERROR, "could not uncompress watermark logo\n"); | 867 av_log(avctx, AV_LOG_ERROR, "could not uncompress watermark logo\n"); |
867 av_free(buf); | 868 av_free(buf); |
868 return -1; | 869 return -1; |
869 } | 870 } |
870 h->svq3_watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0); | 871 h->svq3_watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0); |
871 h->svq3_watermark_key = h->svq3_watermark_key << 16 | h->svq3_watermark_key; | 872 h->svq3_watermark_key = h->svq3_watermark_key << 16 | h->svq3_watermark_key; |
872 av_log(avctx, AV_LOG_DEBUG, "watermark key %#x\n", h->svq3_watermark_key); | 873 av_log(avctx, AV_LOG_DEBUG, "watermark key %#x\n", h->svq3_watermark_key); |
873 av_free(buf); | 874 av_free(buf); |
874 #else | 875 #else |
875 av_log(avctx, AV_LOG_ERROR, "this svq3 file contains watermark which need zlib support compiled in\n"); | 876 av_log(avctx, AV_LOG_ERROR, "this svq3 file contains watermark which need zlib support compiled in\n"); |
876 return -1; | 877 return -1; |
877 #endif | 878 #endif |
878 } | 879 } |
879 } | 880 } |
880 } | 881 } |
881 | 882 |
882 /* special case for last picture */ | 883 /* special case for last picture */ |
883 if (buf_size == 0) { | 884 if (buf_size == 0) { |
884 if (s->next_picture_ptr && !s->low_delay) { | 885 if (s->next_picture_ptr && !s->low_delay) { |
885 *(AVFrame *) data = *(AVFrame *) &s->next_picture; | 886 *(AVFrame *) data = *(AVFrame *) &s->next_picture; |
886 s->next_picture_ptr= NULL; | 887 s->next_picture_ptr = NULL; |
887 *data_size = sizeof(AVFrame); | 888 *data_size = sizeof(AVFrame); |
888 } | 889 } |
889 return 0; | 890 return 0; |
890 } | 891 } |
891 | 892 |
892 init_get_bits (&s->gb, buf, 8*buf_size); | 893 init_get_bits (&s->gb, buf, 8*buf_size); |
893 | 894 |
894 s->mb_x = s->mb_y = h->mb_xy = 0; | 895 s->mb_x = s->mb_y = h->mb_xy = 0; |
895 | 896 |
896 if (svq3_decode_slice_header (h)) | 897 if (svq3_decode_slice_header(h)) |
897 return -1; | |
898 | |
899 s->pict_type = h->slice_type; | |
900 s->picture_number = h->slice_num; | |
901 | |
902 if(avctx->debug&FF_DEBUG_PICT_INFO){ | |
903 av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", | |
904 av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag, | |
905 s->adaptive_quant, s->qscale, h->slice_num | |
906 ); | |
907 } | |
908 | |
909 /* for hurry_up==5 */ | |
910 s->current_picture.pict_type = s->pict_type; | |
911 s->current_picture.key_frame = (s->pict_type == FF_I_TYPE); | |
912 | |
913 /* Skip B-frames if we do not have reference frames. */ | |
914 if (s->last_picture_ptr == NULL && s->pict_type == FF_B_TYPE) | |
915 return 0; | |
916 /* Skip B-frames if we are in a hurry. */ | |
917 if (avctx->hurry_up && s->pict_type == FF_B_TYPE) | |
918 return 0; | |
919 /* Skip everything if we are in a hurry >= 5. */ | |
920 if (avctx->hurry_up >= 5) | |
921 return 0; | |
922 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) | |
923 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) | |
924 || avctx->skip_frame >= AVDISCARD_ALL) | |
925 return 0; | |
926 | |
927 if (s->next_p_frame_damaged) { | |
928 if (s->pict_type == FF_B_TYPE) | |
929 return 0; | |
930 else | |
931 s->next_p_frame_damaged = 0; | |
932 } | |
933 | |
934 if (frame_start (h) < 0) | |
935 return -1; | |
936 | |
937 if (s->pict_type == FF_B_TYPE) { | |
938 h->frame_num_offset = (h->slice_num - h->prev_frame_num); | |
939 | |
940 if (h->frame_num_offset < 0) { | |
941 h->frame_num_offset += 256; | |
942 } | |
943 if (h->frame_num_offset == 0 || h->frame_num_offset >= h->prev_frame_num_offset) { | |
944 av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n"); | |
945 return -1; | |
946 } | |
947 } else { | |
948 h->prev_frame_num = h->frame_num; | |
949 h->frame_num = h->slice_num; | |
950 h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num); | |
951 | |
952 if (h->prev_frame_num_offset < 0) { | |
953 h->prev_frame_num_offset += 256; | |
954 } | |
955 } | |
956 | |
957 for(m=0; m<2; m++){ | |
958 int i; | |
959 for(i=0; i<4; i++){ | |
960 int j; | |
961 for(j=-1; j<4; j++) | |
962 h->ref_cache[m][scan8[0] + 8*i + j]= 1; | |
963 if(i<3) | |
964 h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE; | |
965 } | |
966 } | |
967 | |
968 for (s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) { | |
969 for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { | |
970 h->mb_xy = s->mb_x + s->mb_y*s->mb_stride; | |
971 | |
972 if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits && | |
973 ((get_bits_count(&s->gb) & 7) == 0 || show_bits (&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) { | |
974 | |
975 skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb)); | |
976 s->gb.size_in_bits = 8*buf_size; | |
977 | |
978 if (svq3_decode_slice_header (h)) | |
979 return -1; | |
980 | |
981 /* TODO: support s->mb_skip_run */ | |
982 } | |
983 | |
984 mb_type = svq3_get_ue_golomb (&s->gb); | |
985 | |
986 if (s->pict_type == FF_I_TYPE) { | |
987 mb_type += 8; | |
988 } else if (s->pict_type == FF_B_TYPE && mb_type >= 4) { | |
989 mb_type += 4; | |
990 } | |
991 if (mb_type > 33 || svq3_decode_mb (h, mb_type)) { | |
992 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
993 return -1; | 898 return -1; |
994 } | 899 |
995 | 900 s->pict_type = h->slice_type; |
996 if (mb_type != 0) { | 901 s->picture_number = h->slice_num; |
997 hl_decode_mb (h); | 902 |
998 } | 903 if (avctx->debug&FF_DEBUG_PICT_INFO){ |
999 | 904 av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", |
1000 if (s->pict_type != FF_B_TYPE && !s->low_delay) { | 905 av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag, |
1001 s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] = | 906 s->adaptive_quant, s->qscale, h->slice_num); |
1002 (s->pict_type == FF_P_TYPE && mb_type < 8) ? (mb_type - 1) : -1; | 907 } |
1003 } | 908 |
1004 } | 909 /* for hurry_up == 5 */ |
1005 | 910 s->current_picture.pict_type = s->pict_type; |
1006 ff_draw_horiz_band(s, 16*s->mb_y, 16); | 911 s->current_picture.key_frame = (s->pict_type == FF_I_TYPE); |
1007 } | 912 |
1008 | 913 /* Skip B-frames if we do not have reference frames. */ |
1009 MPV_frame_end(s); | 914 if (s->last_picture_ptr == NULL && s->pict_type == FF_B_TYPE) |
1010 | 915 return 0; |
1011 if (s->pict_type == FF_B_TYPE || s->low_delay) { | 916 /* Skip B-frames if we are in a hurry. */ |
1012 *(AVFrame *) data = *(AVFrame *) &s->current_picture; | 917 if (avctx->hurry_up && s->pict_type == FF_B_TYPE) |
1013 } else { | 918 return 0; |
1014 *(AVFrame *) data = *(AVFrame *) &s->last_picture; | 919 /* Skip everything if we are in a hurry >= 5. */ |
1015 } | 920 if (avctx->hurry_up >= 5) |
1016 | 921 return 0; |
1017 avctx->frame_number = s->picture_number - 1; | 922 if ( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == FF_B_TYPE) |
1018 | 923 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != FF_I_TYPE) |
1019 /* Do not output the last pic after seeking. */ | 924 || avctx->skip_frame >= AVDISCARD_ALL) |
1020 if (s->last_picture_ptr || s->low_delay) { | 925 return 0; |
1021 *data_size = sizeof(AVFrame); | 926 |
1022 } | 927 if (s->next_p_frame_damaged) { |
1023 | 928 if (s->pict_type == FF_B_TYPE) |
1024 return buf_size; | 929 return 0; |
930 else | |
931 s->next_p_frame_damaged = 0; | |
932 } | |
933 | |
934 if (frame_start(h) < 0) | |
935 return -1; | |
936 | |
937 if (s->pict_type == FF_B_TYPE) { | |
938 h->frame_num_offset = (h->slice_num - h->prev_frame_num); | |
939 | |
940 if (h->frame_num_offset < 0) { | |
941 h->frame_num_offset += 256; | |
942 } | |
943 if (h->frame_num_offset == 0 || h->frame_num_offset >= h->prev_frame_num_offset) { | |
944 av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n"); | |
945 return -1; | |
946 } | |
947 } else { | |
948 h->prev_frame_num = h->frame_num; | |
949 h->frame_num = h->slice_num; | |
950 h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num); | |
951 | |
952 if (h->prev_frame_num_offset < 0) { | |
953 h->prev_frame_num_offset += 256; | |
954 } | |
955 } | |
956 | |
957 for (m = 0; m < 2; m++){ | |
958 int i; | |
959 for (i = 0; i < 4; i++){ | |
960 int j; | |
961 for (j = -1; j < 4; j++) | |
962 h->ref_cache[m][scan8[0] + 8*i + j]= 1; | |
963 if (i < 3) | |
964 h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE; | |
965 } | |
966 } | |
967 | |
968 for (s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) { | |
969 for (s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) { | |
970 h->mb_xy = s->mb_x + s->mb_y*s->mb_stride; | |
971 | |
972 if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits && | |
973 ((get_bits_count(&s->gb) & 7) == 0 || show_bits(&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) { | |
974 | |
975 skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb)); | |
976 s->gb.size_in_bits = 8*buf_size; | |
977 | |
978 if (svq3_decode_slice_header(h)) | |
979 return -1; | |
980 | |
981 /* TODO: support s->mb_skip_run */ | |
982 } | |
983 | |
984 mb_type = svq3_get_ue_golomb(&s->gb); | |
985 | |
986 if (s->pict_type == FF_I_TYPE) { | |
987 mb_type += 8; | |
988 } else if (s->pict_type == FF_B_TYPE && mb_type >= 4) { | |
989 mb_type += 4; | |
990 } | |
991 if (mb_type > 33 || svq3_decode_mb(h, mb_type)) { | |
992 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
993 return -1; | |
994 } | |
995 | |
996 if (mb_type != 0) { | |
997 hl_decode_mb (h); | |
998 } | |
999 | |
1000 if (s->pict_type != FF_B_TYPE && !s->low_delay) { | |
1001 s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] = | |
1002 (s->pict_type == FF_P_TYPE && mb_type < 8) ? (mb_type - 1) : -1; | |
1003 } | |
1004 } | |
1005 | |
1006 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
1007 } | |
1008 | |
1009 MPV_frame_end(s); | |
1010 | |
1011 if (s->pict_type == FF_B_TYPE || s->low_delay) { | |
1012 *(AVFrame *) data = *(AVFrame *) &s->current_picture; | |
1013 } else { | |
1014 *(AVFrame *) data = *(AVFrame *) &s->last_picture; | |
1015 } | |
1016 | |
1017 avctx->frame_number = s->picture_number - 1; | |
1018 | |
1019 /* Do not output the last pic after seeking. */ | |
1020 if (s->last_picture_ptr || s->low_delay) { | |
1021 *data_size = sizeof(AVFrame); | |
1022 } | |
1023 | |
1024 return buf_size; | |
1025 } | 1025 } |
1026 | 1026 |
1027 | 1027 |
1028 AVCodec svq3_decoder = { | 1028 AVCodec svq3_decoder = { |
1029 "svq3", | 1029 "svq3", |