Mercurial > mplayer.hg
comparison libswscale/utils.c @ 30910:dd0c440f3205
Do not compile AltiVec code when AltiVec is not available; not even in
runtime cpudetection mode.
Fixes compilation with '--enable-runtime-cpudetect --disable-altivec'.
| author | diego |
|---|---|
| date | Tue, 23 Mar 2010 20:12:52 +0000 |
| parents | e052716dcb5b |
| children | f91ad62a2281 |
comparison
equal
deleted
inserted
replaced
| 30909:0d0f53c47bd8 | 30910:dd0c440f3205 |
|---|---|
| 737 c->yuv2rgb_u2b_coeff= (int16_t)roundToInt16(cbu<<13); | 737 c->yuv2rgb_u2b_coeff= (int16_t)roundToInt16(cbu<<13); |
| 738 | 738 |
| 739 ff_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation); | 739 ff_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation); |
| 740 //FIXME factorize | 740 //FIXME factorize |
| 741 | 741 |
| 742 #if ARCH_PPC && (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) | 742 #if ARCH_PPC && HAVE_ALTIVEC |
| 743 if (c->flags & SWS_CPU_CAPS_ALTIVEC) | 743 if (c->flags & SWS_CPU_CAPS_ALTIVEC) |
| 744 ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness, contrast, saturation); | 744 ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness, contrast, saturation); |
| 745 #endif | 745 #endif |
| 746 return 0; | 746 return 0; |
| 747 } | 747 } |
| 1019 c->chrSrcH, c->chrDstH, filterAlign, (1<<12), | 1019 c->chrSrcH, c->chrDstH, filterAlign, (1<<12), |
| 1020 (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags, | 1020 (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags, |
| 1021 srcFilter->chrV, dstFilter->chrV, c->param) < 0) | 1021 srcFilter->chrV, dstFilter->chrV, c->param) < 0) |
| 1022 goto fail; | 1022 goto fail; |
| 1023 | 1023 |
| 1024 #if ARCH_PPC && (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) | 1024 #if ARCH_PPC && HAVE_ALTIVEC |
| 1025 FF_ALLOC_OR_GOTO(c, c->vYCoeffsBank, sizeof (vector signed short)*c->vLumFilterSize*c->dstH, fail); | 1025 FF_ALLOC_OR_GOTO(c, c->vYCoeffsBank, sizeof (vector signed short)*c->vLumFilterSize*c->dstH, fail); |
| 1026 FF_ALLOC_OR_GOTO(c, c->vCCoeffsBank, sizeof (vector signed short)*c->vChrFilterSize*c->chrDstH, fail); | 1026 FF_ALLOC_OR_GOTO(c, c->vCCoeffsBank, sizeof (vector signed short)*c->vChrFilterSize*c->chrDstH, fail); |
| 1027 | 1027 |
| 1028 for (i=0;i<c->vLumFilterSize*c->dstH;i++) { | 1028 for (i=0;i<c->vLumFilterSize*c->dstH;i++) { |
| 1029 int j; | 1029 int j; |
| 1528 | 1528 |
| 1529 av_freep(&c->vLumFilter); | 1529 av_freep(&c->vLumFilter); |
| 1530 av_freep(&c->vChrFilter); | 1530 av_freep(&c->vChrFilter); |
| 1531 av_freep(&c->hLumFilter); | 1531 av_freep(&c->hLumFilter); |
| 1532 av_freep(&c->hChrFilter); | 1532 av_freep(&c->hChrFilter); |
| 1533 #if ARCH_PPC && (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) | 1533 #if ARCH_PPC && HAVE_ALTIVEC |
| 1534 av_freep(&c->vYCoeffsBank); | 1534 av_freep(&c->vYCoeffsBank); |
| 1535 av_freep(&c->vCCoeffsBank); | 1535 av_freep(&c->vCCoeffsBank); |
| 1536 #endif | 1536 #endif |
| 1537 | 1537 |
| 1538 av_freep(&c->vLumFilterPos); | 1538 av_freep(&c->vLumFilterPos); |