Mercurial > libavcodec.hg
comparison vp6.c @ 4922:58f751086434 libavcodec
simplify
| author | lorenm |
|---|---|
| date | Sun, 06 May 2007 06:46:20 +0000 |
| parents | 9a2c08b939ee |
| children | ff4cd98bc90c |
comparison
equal
deleted
inserted
replaced
| 4921:9a2c08b939ee | 4922:58f751086434 |
|---|---|
| 472 vp6_filter_hv4(dst, src+offset1, stride, 1, | 472 vp6_filter_hv4(dst, src+offset1, stride, 1, |
| 473 vp6_block_copy_filter[select][x8]); | 473 vp6_block_copy_filter[select][x8]); |
| 474 } else if (!x8) { /* above or below combine */ | 474 } else if (!x8) { /* above or below combine */ |
| 475 vp6_filter_hv4(dst, src+offset1, stride, stride, | 475 vp6_filter_hv4(dst, src+offset1, stride, stride, |
| 476 vp6_block_copy_filter[select][y8]); | 476 vp6_block_copy_filter[select][y8]); |
| 477 } else if ((mv.x^mv.y) >> 31) { /* lower-left or upper-right combine */ | 477 } else { |
| 478 vp6_filter_diag4(dst, src+offset1-1, stride, | 478 vp6_filter_diag4(dst, src+offset1 + ((mv.x^mv.y)>>31), stride, |
| 479 vp6_block_copy_filter[select][x8], | |
| 480 vp6_block_copy_filter[select][y8]); | |
| 481 } else { /* lower-right or upper-left combine */ | |
| 482 vp6_filter_diag4(dst, src+offset1, stride, | |
| 483 vp6_block_copy_filter[select][x8], | 479 vp6_block_copy_filter[select][x8], |
| 484 vp6_block_copy_filter[select][y8]); | 480 vp6_block_copy_filter[select][y8]); |
| 485 } | 481 } |
| 486 } else { | 482 } else { |
| 487 if (!x8 || !y8) { | 483 if (!x8 || !y8) { |
| 488 s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8, y8); | 484 s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8, y8); |
| 489 } else if ((mv.x^mv.y) >> 31) { /* lower-left or upper-right combine */ | 485 } else { |
| 490 vp6_filter_diag2(s, dst, src+offset1-1, stride, x8, y8); | 486 vp6_filter_diag2(s, dst, src+offset1 + ((mv.x^mv.y)>>31), stride, x8, y8); |
| 491 } else { /* lower-right or upper-left combine */ | |
| 492 vp6_filter_diag2(s, dst, src+offset1, stride, x8, y8); | |
| 493 } | 487 } |
| 494 } | 488 } |
| 495 } | 489 } |
| 496 | 490 |
| 497 static int vp6_decode_init(AVCodecContext *avctx) | 491 static int vp6_decode_init(AVCodecContext *avctx) |