comparison roqvideo.c @ 1495:07029b2cd44f libavcodec

experimental half-pel motion compensation for C planes, courtesy of Dr. Tim
author tmmm
date Thu, 02 Oct 2003 04:19:56 +0000
parents a4d00b1f0271
children 932d306bf1dc
comparison
equal deleted inserted replaced
1494:3ee63c12ea30 1495:07029b2cd44f
39 39
40 typedef struct { 40 typedef struct {
41 int idx[4]; 41 int idx[4];
42 } roq_qcell; 42 } roq_qcell;
43 43
44 static int uiclip[1024], *uiclp; /* clipping table */
45 #define avg2(a,b) uiclp[(((int)(a)+(int)(b)+1)>>1)]
46 #define avg4(a,b,c,d) uiclp[(((int)(a)+(int)(b)+(int)(c)+(int)(d)+2)>>2)]
44 47
45 typedef struct RoqContext { 48 typedef struct RoqContext {
46 49
47 AVCodecContext *avctx; 50 AVCodecContext *avctx;
48 DSPContext dsp; 51 DSPContext dsp;
130 *yptr++ = y1; 133 *yptr++ = y1;
131 *yptr++ = y1; 134 *yptr++ = y1;
132 } 135 }
133 136
134 static void apply_motion_4x4(RoqContext *ri, int x, int y, unsigned char mv, 137 static void apply_motion_4x4(RoqContext *ri, int x, int y, unsigned char mv,
135 char mean_x, char mean_y) 138 signed char mean_x, signed char mean_y)
136 { 139 {
137 int i, mx, my; 140 int i, hw, mx, my;
138 unsigned char *pa, *pb; 141 unsigned char *pa, *pb;
139 142
140 mx = x + 8 - (mv >> 4) - mean_x; 143 mx = x + 8 - (mv >> 4) - mean_x;
141 my = y + 8 - (mv & 0xf) - mean_y; 144 my = y + 8 - (mv & 0xf) - mean_y;
142 145
149 pa[3] = pb[3]; 152 pa[3] = pb[3];
150 pa += ri->y_stride; 153 pa += ri->y_stride;
151 pb += ri->y_stride; 154 pb += ri->y_stride;
152 } 155 }
153 156
157 #if 0
154 pa = ri->current_frame.data[1] + (y/2) * (ri->c_stride) + x/2; 158 pa = ri->current_frame.data[1] + (y/2) * (ri->c_stride) + x/2;
155 pb = ri->last_frame.data[1] + (my/2) * (ri->c_stride) + (mx + 1)/2; 159 pb = ri->last_frame.data[1] + (my/2) * (ri->c_stride) + (mx + 1)/2;
156 for(i = 0; i < 2; i++) { 160 for(i = 0; i < 2; i++) {
157 pa[0] = pb[0]; 161 pa[0] = pb[0];
158 pa[1] = pb[1]; 162 pa[1] = pb[1];
166 pa[0] = pb[0]; 170 pa[0] = pb[0];
167 pa[1] = pb[1]; 171 pa[1] = pb[1];
168 pa += ri->c_stride; 172 pa += ri->c_stride;
169 pb += ri->c_stride; 173 pb += ri->c_stride;
170 } 174 }
175 #else
176 hw = ri->y_stride/2;
177 pa = ri->current_frame.data[1] + (y * ri->y_stride)/4 + x/2;
178 pb = ri->last_frame.data[1] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
179
180 for(i = 0; i < 2; i++) {
181 switch(((my & 0x01) << 1) | (mx & 0x01)) {
182
183 case 0:
184 pa[0] = pb[0];
185 pa[1] = pb[1];
186 pa[hw] = pb[hw];
187 pa[hw+1] = pb[hw+1];
188 break;
189
190 case 1:
191 pa[0] = avg2(pb[0], pb[1]);
192 pa[1] = avg2(pb[1], pb[2]);
193 pa[hw] = avg2(pb[hw], pb[hw+1]);
194 pa[hw+1] = avg2(pb[hw+1], pb[hw+2]);
195 break;
196
197 case 2:
198 pa[0] = avg2(pb[0], pb[hw]);
199 pa[1] = avg2(pb[1], pb[hw+1]);
200 pa[hw] = avg2(pb[hw], pb[hw*2]);
201 pa[hw+1] = avg2(pb[hw+1], pb[(hw*2)+1]);
202 break;
203
204 case 3:
205 pa[0] = avg4(pb[0], pb[1], pb[hw], pb[hw+1]);
206 pa[1] = avg4(pb[1], pb[2], pb[hw+1], pb[hw+2]);
207 pa[hw] = avg4(pb[hw], pb[hw+1], pb[hw*2], pb[(hw*2)+1]);
208 pa[hw+1] = avg4(pb[hw+1], pb[hw+2], pb[(hw*2)+1], pb[(hw*2)+1]);
209 break;
210 }
211
212 pa = ri->current_frame.data[2] + (y * ri->y_stride)/4 + x/2;
213 pb = ri->last_frame.data[2] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
214 }
215 #endif
171 } 216 }
172 217
173 static void apply_motion_8x8(RoqContext *ri, int x, int y, 218 static void apply_motion_8x8(RoqContext *ri, int x, int y,
174 unsigned char mv, char mean_x, char mean_y) 219 unsigned char mv, signed char mean_x, signed char mean_y)
175 { 220 {
176 int mx, my, i; 221 int mx, my, i, j, hw;
177 unsigned char *pa, *pb; 222 unsigned char *pa, *pb;
178 223
179 mx = x + 8 - (mv >> 4) - mean_x; 224 mx = x + 8 - (mv >> 4) - mean_x;
180 my = y + 8 - (mv & 0xf) - mean_y; 225 my = y + 8 - (mv & 0xf) - mean_y;
181 226
192 pa[7] = pb[7]; 237 pa[7] = pb[7];
193 pa += ri->y_stride; 238 pa += ri->y_stride;
194 pb += ri->y_stride; 239 pb += ri->y_stride;
195 } 240 }
196 241
242 #if 0
197 pa = ri->current_frame.data[1] + (y/2) * (ri->c_stride) + x/2; 243 pa = ri->current_frame.data[1] + (y/2) * (ri->c_stride) + x/2;
198 pb = ri->last_frame.data[1] + (my/2) * (ri->c_stride) + (mx + 1)/2; 244 pb = ri->last_frame.data[1] + (my/2) * (ri->c_stride) + (mx + 1)/2;
199 for(i = 0; i < 4; i++) { 245 for(i = 0; i < 4; i++) {
200 pa[0] = pb[0]; 246 pa[0] = pb[0];
201 pa[1] = pb[1]; 247 pa[1] = pb[1];
213 pa[2] = pb[2]; 259 pa[2] = pb[2];
214 pa[3] = pb[3]; 260 pa[3] = pb[3];
215 pa += ri->c_stride; 261 pa += ri->c_stride;
216 pb += ri->c_stride; 262 pb += ri->c_stride;
217 } 263 }
264 #else
265 hw = ri->c_stride;
266 pa = ri->current_frame.data[1] + (y * ri->y_stride)/4 + x/2;
267 pb = ri->last_frame.data[1] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
268 for(j = 0; j < 2; j++) {
269 for(i = 0; i < 4; i++) {
270 switch(((my & 0x01) << 1) | (mx & 0x01)) {
271
272 case 0:
273 pa[0] = pb[0];
274 pa[1] = pb[1];
275 pa[2] = pb[2];
276 pa[3] = pb[3];
277 break;
278
279 case 1:
280 pa[0] = avg2(pb[0], pb[1]);
281 pa[1] = avg2(pb[1], pb[2]);
282 pa[2] = avg2(pb[2], pb[3]);
283 pa[3] = avg2(pb[3], pb[4]);
284 break;
285
286 case 2:
287 pa[0] = avg2(pb[0], pb[hw]);
288 pa[1] = avg2(pb[1], pb[hw+1]);
289 pa[2] = avg2(pb[2], pb[hw+2]);
290 pa[3] = avg2(pb[3], pb[hw+3]);
291 break;
292
293 case 3:
294 pa[0] = avg4(pb[0], pb[1], pb[hw], pb[hw+1]);
295 pa[1] = avg4(pb[1], pb[2], pb[hw+1], pb[hw+2]);
296 pa[2] = avg4(pb[2], pb[3], pb[hw+2], pb[hw+3]);
297 pa[3] = avg4(pb[3], pb[4], pb[hw+3], pb[hw+4]);
298 break;
299 }
300 pa += ri->c_stride;
301 pb += ri->c_stride;
302 }
303
304 pa = ri->current_frame.data[2] + (y * ri->y_stride)/4 + x/2;
305 pb = ri->last_frame.data[2] + (my/2) * (ri->y_stride/2) + (mx + 1)/2;
306 }
307 #endif
218 } 308 }
219 309
220 static void roqvideo_decode_frame(RoqContext *ri) 310 static void roqvideo_decode_frame(RoqContext *ri)
221 { 311 {
222 unsigned int chunk_id = 0, chunk_arg = 0; 312 unsigned int chunk_id = 0, chunk_arg = 0;
337 427
338 428
339 static int roq_decode_init(AVCodecContext *avctx) 429 static int roq_decode_init(AVCodecContext *avctx)
340 { 430 {
341 RoqContext *s = avctx->priv_data; 431 RoqContext *s = avctx->priv_data;
432 int i;
342 433
343 s->avctx = avctx; 434 s->avctx = avctx;
344 s->first_frame = 1; 435 s->first_frame = 1;
345 avctx->pix_fmt = PIX_FMT_YUV420P; 436 avctx->pix_fmt = PIX_FMT_YUV420P;
346 avctx->has_b_frames = 0; 437 avctx->has_b_frames = 0;
347 dsputil_init(&s->dsp, avctx); 438 dsputil_init(&s->dsp, avctx);
439
440 uiclp = uiclip+512;
441 for(i = -512; i < 512; i++)
442 uiclp[i] = (i < 0 ? 0 : (i > 255 ? 255 : i));
348 443
349 return 0; 444 return 0;
350 } 445 }
351 446
352 static int roq_decode_frame(AVCodecContext *avctx, 447 static int roq_decode_frame(AVCodecContext *avctx,