| @@ -15,6 +15,7 @@ OBJS-$(HAVE_ALTIVEC) += ppc/swscale_altivec.o \ | |||||
| ppc/yuv2rgb_altivec.o \ | ppc/yuv2rgb_altivec.o \ | ||||
| ppc/yuv2yuv_altivec.o | ppc/yuv2yuv_altivec.o | ||||
| OBJS-$(HAVE_MMX) += x86/rgb2rgb.o \ | OBJS-$(HAVE_MMX) += x86/rgb2rgb.o \ | ||||
| x86/swscale_mmx.o \ | |||||
| x86/yuv2rgb_mmx.o | x86/yuv2rgb_mmx.o | ||||
| OBJS-$(HAVE_VIS) += sparc/yuv2rgb_vis.o | OBJS-$(HAVE_VIS) += sparc/yuv2rgb_vis.o | ||||
| @@ -61,16 +61,12 @@ untested special converters | |||||
| #include "swscale_internal.h" | #include "swscale_internal.h" | ||||
| #include "rgb2rgb.h" | #include "rgb2rgb.h" | ||||
| #include "libavutil/intreadwrite.h" | #include "libavutil/intreadwrite.h" | ||||
| #include "libavutil/x86_cpu.h" | |||||
| #include "libavutil/cpu.h" | #include "libavutil/cpu.h" | ||||
| #include "libavutil/avutil.h" | #include "libavutil/avutil.h" | ||||
| #include "libavutil/mathematics.h" | #include "libavutil/mathematics.h" | ||||
| #include "libavutil/bswap.h" | #include "libavutil/bswap.h" | ||||
| #include "libavutil/pixdesc.h" | #include "libavutil/pixdesc.h" | ||||
| #undef MOVNTQ | |||||
| #undef PAVGB | |||||
| #define DITHER1XBPP | #define DITHER1XBPP | ||||
| #define isPacked(x) ( \ | #define isPacked(x) ( \ | ||||
| @@ -1182,45 +1178,14 @@ static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, int width, uint | |||||
| } | } | ||||
| } | } | ||||
| //Note: we have C, MMX, MMX2, 3DNOW versions, there is no 3DNOW+MMX2 one | |||||
| //Plain C versions | |||||
| #define COMPILE_TEMPLATE_MMX2 0 | |||||
| #include "swscale_template.c" | #include "swscale_template.c" | ||||
| //MMX versions | |||||
| #if HAVE_MMX | |||||
| #undef RENAME | |||||
| #undef COMPILE_TEMPLATE_MMX2 | |||||
| #define COMPILE_TEMPLATE_MMX2 0 | |||||
| #define RENAME(a) a ## _MMX | |||||
| #include "x86/swscale_template.c" | |||||
| #endif | |||||
| //MMX2 versions | |||||
| #if HAVE_MMX2 | |||||
| #undef RENAME | |||||
| #undef COMPILE_TEMPLATE_MMX2 | |||||
| #define COMPILE_TEMPLATE_MMX2 1 | |||||
| #define RENAME(a) a ## _MMX2 | |||||
| #include "x86/swscale_template.c" | |||||
| #endif | |||||
| SwsFunc ff_getSwsFunc(SwsContext *c) | SwsFunc ff_getSwsFunc(SwsContext *c) | ||||
| { | { | ||||
| int cpu_flags = av_get_cpu_flags(); | |||||
| sws_init_swScale_c(c); | sws_init_swScale_c(c); | ||||
| #if HAVE_MMX | |||||
| if (cpu_flags & AV_CPU_FLAG_MMX) | |||||
| sws_init_swScale_MMX(c); | |||||
| #endif | |||||
| #if HAVE_MMX2 | |||||
| if (cpu_flags & AV_CPU_FLAG_MMX2) | |||||
| sws_init_swScale_MMX2(c); | |||||
| #endif | |||||
| if (HAVE_MMX) | |||||
| ff_sws_init_swScale_mmx(c); | |||||
| if (HAVE_ALTIVEC) | if (HAVE_ALTIVEC) | ||||
| ff_sws_init_swScale_altivec(c); | ff_sws_init_swScale_altivec(c); | ||||
| @@ -329,6 +329,9 @@ int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], | |||||
| void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], | void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], | ||||
| int brightness, int contrast, int saturation); | int brightness, int contrast, int saturation); | ||||
| void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex, | |||||
| int lastInLumBuf, int lastInChrBuf); | |||||
| SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c); | SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c); | ||||
| SwsFunc ff_yuv2rgb_init_vis(SwsContext *c); | SwsFunc ff_yuv2rgb_init_vis(SwsContext *c); | ||||
| SwsFunc ff_yuv2rgb_init_mlib(SwsContext *c); | SwsFunc ff_yuv2rgb_init_mlib(SwsContext *c); | ||||
| @@ -483,5 +486,6 @@ void ff_swscale_get_unscaled_altivec(SwsContext *c); | |||||
| SwsFunc ff_getSwsFunc(SwsContext *c); | SwsFunc ff_getSwsFunc(SwsContext *c); | ||||
| void ff_sws_init_swScale_altivec(SwsContext *c); | void ff_sws_init_swScale_altivec(SwsContext *c); | ||||
| void ff_sws_init_swScale_mmx(SwsContext *c); | |||||
| #endif /* SWSCALE_SWSCALE_INTERNAL_H */ | #endif /* SWSCALE_SWSCALE_INTERNAL_H */ | ||||
| @@ -467,11 +467,6 @@ inline static void hcscale_c(SwsContext *c, uint16_t *dst1, uint16_t *dst2, int | |||||
| #define DEBUG_SWSCALE_BUFFERS 0 | #define DEBUG_SWSCALE_BUFFERS 0 | ||||
| #define DEBUG_BUFFERS(...) if (DEBUG_SWSCALE_BUFFERS) av_log(c, AV_LOG_DEBUG, __VA_ARGS__) | #define DEBUG_BUFFERS(...) if (DEBUG_SWSCALE_BUFFERS) av_log(c, AV_LOG_DEBUG, __VA_ARGS__) | ||||
| #if HAVE_MMX | |||||
| static void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex, | |||||
| int lastInLumBuf, int lastInChrBuf); | |||||
| #endif | |||||
| static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[], | static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[], | ||||
| int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) | int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) | ||||
| { | { | ||||
| @@ -0,0 +1,187 @@ | |||||
| /* | |||||
| * Copyright (C) 2001-2003 Michael Niedermayer <michaelni@gmx.at> | |||||
| * | |||||
| * This file is part of Libav. | |||||
| * | |||||
| * Libav is free software; you can redistribute it and/or | |||||
| * modify it under the terms of the GNU Lesser General Public | |||||
| * License as published by the Free Software Foundation; either | |||||
| * version 2.1 of the License, or (at your option) any later version. | |||||
| * | |||||
| * Libav is distributed in the hope that it will be useful, | |||||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||||
| * Lesser General Public License for more details. | |||||
| * | |||||
| * You should have received a copy of the GNU Lesser General Public | |||||
| * License along with Libav; if not, write to the Free Software | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |||||
| */ | |||||
| #include <inttypes.h> | |||||
| #include "config.h" | |||||
| #include "libswscale/swscale.h" | |||||
| #include "libswscale/swscale_internal.h" | |||||
| #include "libavutil/intreadwrite.h" | |||||
| #include "libavutil/x86_cpu.h" | |||||
| #include "libavutil/cpu.h" | |||||
| #include "libavutil/pixdesc.h" | |||||
| DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, w10)= 0x0010001000100010LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, w02)= 0x0002000200020002LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bm00001111)=0x00000000FFFFFFFFLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bm00000111)=0x0000000000FFFFFFLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bm11111000)=0xFFFFFFFFFF000000LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bm01010101)=0x00FF00FF00FF00FFLL; | |||||
| const DECLARE_ALIGNED(8, uint64_t, ff_dither4)[2] = { | |||||
| 0x0103010301030103LL, | |||||
| 0x0200020002000200LL,}; | |||||
| const DECLARE_ALIGNED(8, uint64_t, ff_dither8)[2] = { | |||||
| 0x0602060206020602LL, | |||||
| 0x0004000400040004LL,}; | |||||
| DECLARE_ASM_CONST(8, uint64_t, b16Mask)= 0x001F001F001F001FLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, g16Mask)= 0x07E007E007E007E0LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, r16Mask)= 0xF800F800F800F800LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, b15Mask)= 0x001F001F001F001FLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, g15Mask)= 0x03E003E003E003E0LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, r15Mask)= 0x7C007C007C007C00LL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_M24A) = 0x00FF0000FF0000FFLL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_M24B) = 0xFF0000FF0000FF00LL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_M24C) = 0x0000FF0000FF0000LL; | |||||
| #ifdef FAST_BGR2YV12 | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff) = 0x000000210041000DULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff) = 0x0000FFEEFFDC0038ULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff) = 0x00000038FFD2FFF8ULL; | |||||
| #else | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff) = 0x000020E540830C8BULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff) = 0x0000ED0FDAC23831ULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff) = 0x00003831D0E6F6EAULL; | |||||
| #endif /* FAST_BGR2YV12 */ | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YOffset) = 0x1010101010101010ULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UVOffset) = 0x8080808080808080ULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toY1Coeff) = 0x0C88000040870C88ULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toY2Coeff) = 0x20DE4087000020DEULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY1Coeff) = 0x20DE0000408720DEULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY2Coeff) = 0x0C88408700000C88ULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toYOffset) = 0x0008400000084000ULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUV)[2][4] = { | |||||
| {0x38380000DAC83838ULL, 0xECFFDAC80000ECFFULL, 0xF6E40000D0E3F6E4ULL, 0x3838D0E300003838ULL}, | |||||
| {0xECFF0000DAC8ECFFULL, 0x3838DAC800003838ULL, 0x38380000D0E33838ULL, 0xF6E4D0E30000F6E4ULL}, | |||||
| }; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUVOffset)= 0x0040400000404000ULL; | |||||
| //MMX versions | |||||
| #if HAVE_MMX | |||||
| #undef RENAME | |||||
| #define COMPILE_TEMPLATE_MMX2 0 | |||||
| #define RENAME(a) a ## _MMX | |||||
| #include "swscale_template.c" | |||||
| #endif | |||||
| //MMX2 versions | |||||
| #if HAVE_MMX2 | |||||
| #undef RENAME | |||||
| #undef COMPILE_TEMPLATE_MMX2 | |||||
| #define COMPILE_TEMPLATE_MMX2 1 | |||||
| #define RENAME(a) a ## _MMX2 | |||||
| #include "swscale_template.c" | |||||
| #endif | |||||
| void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex, | |||||
| int lastInLumBuf, int lastInChrBuf) | |||||
| { | |||||
| const int dstH= c->dstH; | |||||
| const int flags= c->flags; | |||||
| int16_t **lumPixBuf= c->lumPixBuf; | |||||
| int16_t **chrUPixBuf= c->chrUPixBuf; | |||||
| int16_t **alpPixBuf= c->alpPixBuf; | |||||
| const int vLumBufSize= c->vLumBufSize; | |||||
| const int vChrBufSize= c->vChrBufSize; | |||||
| int16_t *vLumFilterPos= c->vLumFilterPos; | |||||
| int16_t *vChrFilterPos= c->vChrFilterPos; | |||||
| int16_t *vLumFilter= c->vLumFilter; | |||||
| int16_t *vChrFilter= c->vChrFilter; | |||||
| int32_t *lumMmxFilter= c->lumMmxFilter; | |||||
| int32_t *chrMmxFilter= c->chrMmxFilter; | |||||
| int32_t av_unused *alpMmxFilter= c->alpMmxFilter; | |||||
| const int vLumFilterSize= c->vLumFilterSize; | |||||
| const int vChrFilterSize= c->vChrFilterSize; | |||||
| const int chrDstY= dstY>>c->chrDstVSubSample; | |||||
| const int firstLumSrcY= vLumFilterPos[dstY]; //First line needed as input | |||||
| const int firstChrSrcY= vChrFilterPos[chrDstY]; //First line needed as input | |||||
| c->blueDither= ff_dither8[dstY&1]; | |||||
| if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555) | |||||
| c->greenDither= ff_dither8[dstY&1]; | |||||
| else | |||||
| c->greenDither= ff_dither4[dstY&1]; | |||||
| c->redDither= ff_dither8[(dstY+1)&1]; | |||||
| if (dstY < dstH - 2) { | |||||
| const int16_t **lumSrcPtr= (const int16_t **) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize; | |||||
| const int16_t **chrUSrcPtr= (const int16_t **) chrUPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize; | |||||
| const int16_t **alpSrcPtr= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? (const int16_t **) alpPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize : NULL; | |||||
| int i; | |||||
| if (flags & SWS_ACCURATE_RND) { | |||||
| int s= APCK_SIZE / 8; | |||||
| for (i=0; i<vLumFilterSize; i+=2) { | |||||
| *(const void**)&lumMmxFilter[s*i ]= lumSrcPtr[i ]; | |||||
| *(const void**)&lumMmxFilter[s*i+APCK_PTR2/4 ]= lumSrcPtr[i+(vLumFilterSize>1)]; | |||||
| lumMmxFilter[s*i+APCK_COEF/4 ]= | |||||
| lumMmxFilter[s*i+APCK_COEF/4+1]= vLumFilter[dstY*vLumFilterSize + i ] | |||||
| + (vLumFilterSize>1 ? vLumFilter[dstY*vLumFilterSize + i + 1]<<16 : 0); | |||||
| if (CONFIG_SWSCALE_ALPHA && alpPixBuf) { | |||||
| *(const void**)&alpMmxFilter[s*i ]= alpSrcPtr[i ]; | |||||
| *(const void**)&alpMmxFilter[s*i+APCK_PTR2/4 ]= alpSrcPtr[i+(vLumFilterSize>1)]; | |||||
| alpMmxFilter[s*i+APCK_COEF/4 ]= | |||||
| alpMmxFilter[s*i+APCK_COEF/4+1]= lumMmxFilter[s*i+APCK_COEF/4 ]; | |||||
| } | |||||
| } | |||||
| for (i=0; i<vChrFilterSize; i+=2) { | |||||
| *(const void**)&chrMmxFilter[s*i ]= chrUSrcPtr[i ]; | |||||
| *(const void**)&chrMmxFilter[s*i+APCK_PTR2/4 ]= chrUSrcPtr[i+(vChrFilterSize>1)]; | |||||
| chrMmxFilter[s*i+APCK_COEF/4 ]= | |||||
| chrMmxFilter[s*i+APCK_COEF/4+1]= vChrFilter[chrDstY*vChrFilterSize + i ] | |||||
| + (vChrFilterSize>1 ? vChrFilter[chrDstY*vChrFilterSize + i + 1]<<16 : 0); | |||||
| } | |||||
| } else { | |||||
| for (i=0; i<vLumFilterSize; i++) { | |||||
| *(const void**)&lumMmxFilter[4*i+0]= lumSrcPtr[i]; | |||||
| lumMmxFilter[4*i+2]= | |||||
| lumMmxFilter[4*i+3]= | |||||
| ((uint16_t)vLumFilter[dstY*vLumFilterSize + i])*0x10001; | |||||
| if (CONFIG_SWSCALE_ALPHA && alpPixBuf) { | |||||
| *(const void**)&alpMmxFilter[4*i+0]= alpSrcPtr[i]; | |||||
| alpMmxFilter[4*i+2]= | |||||
| alpMmxFilter[4*i+3]= lumMmxFilter[4*i+2]; | |||||
| } | |||||
| } | |||||
| for (i=0; i<vChrFilterSize; i++) { | |||||
| *(const void**)&chrMmxFilter[4*i+0]= chrUSrcPtr[i]; | |||||
| chrMmxFilter[4*i+2]= | |||||
| chrMmxFilter[4*i+3]= | |||||
| ((uint16_t)vChrFilter[chrDstY*vChrFilterSize + i])*0x10001; | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
| void ff_sws_init_swScale_mmx(SwsContext *c) | |||||
| { | |||||
| int cpu_flags = av_get_cpu_flags(); | |||||
| if (cpu_flags & AV_CPU_FLAG_MMX) | |||||
| sws_init_swScale_MMX(c); | |||||
| if (cpu_flags & AV_CPU_FLAG_MMX2) | |||||
| sws_init_swScale_MMX2(c); | |||||
| } | |||||
| @@ -18,8 +18,6 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #include "swscale_template.h" | |||||
| #undef REAL_MOVNTQ | #undef REAL_MOVNTQ | ||||
| #undef MOVNTQ | #undef MOVNTQ | ||||
| #undef PREFETCH | #undef PREFETCH | ||||
| @@ -2185,86 +2183,6 @@ static inline void RENAME(hcscale_fast)(SwsContext *c, int16_t *dst1, int16_t *d | |||||
| } | } | ||||
| #endif /* COMPILE_TEMPLATE_MMX2 */ | #endif /* COMPILE_TEMPLATE_MMX2 */ | ||||
| #if !COMPILE_TEMPLATE_MMX2 | |||||
| static void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex, | |||||
| int lastInLumBuf, int lastInChrBuf) | |||||
| { | |||||
| const int dstH= c->dstH; | |||||
| const int flags= c->flags; | |||||
| int16_t **lumPixBuf= c->lumPixBuf; | |||||
| int16_t **chrUPixBuf= c->chrUPixBuf; | |||||
| int16_t **alpPixBuf= c->alpPixBuf; | |||||
| const int vLumBufSize= c->vLumBufSize; | |||||
| const int vChrBufSize= c->vChrBufSize; | |||||
| int16_t *vLumFilterPos= c->vLumFilterPos; | |||||
| int16_t *vChrFilterPos= c->vChrFilterPos; | |||||
| int16_t *vLumFilter= c->vLumFilter; | |||||
| int16_t *vChrFilter= c->vChrFilter; | |||||
| int32_t *lumMmxFilter= c->lumMmxFilter; | |||||
| int32_t *chrMmxFilter= c->chrMmxFilter; | |||||
| int32_t av_unused *alpMmxFilter= c->alpMmxFilter; | |||||
| const int vLumFilterSize= c->vLumFilterSize; | |||||
| const int vChrFilterSize= c->vChrFilterSize; | |||||
| const int chrDstY= dstY>>c->chrDstVSubSample; | |||||
| const int firstLumSrcY= vLumFilterPos[dstY]; //First line needed as input | |||||
| const int firstChrSrcY= vChrFilterPos[chrDstY]; //First line needed as input | |||||
| c->blueDither= ff_dither8[dstY&1]; | |||||
| if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555) | |||||
| c->greenDither= ff_dither8[dstY&1]; | |||||
| else | |||||
| c->greenDither= ff_dither4[dstY&1]; | |||||
| c->redDither= ff_dither8[(dstY+1)&1]; | |||||
| if (dstY < dstH - 2) { | |||||
| const int16_t **lumSrcPtr= (const int16_t **) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize; | |||||
| const int16_t **chrUSrcPtr= (const int16_t **) chrUPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize; | |||||
| const int16_t **alpSrcPtr= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? (const int16_t **) alpPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize : NULL; | |||||
| int i; | |||||
| if (flags & SWS_ACCURATE_RND) { | |||||
| int s= APCK_SIZE / 8; | |||||
| for (i=0; i<vLumFilterSize; i+=2) { | |||||
| *(const void**)&lumMmxFilter[s*i ]= lumSrcPtr[i ]; | |||||
| *(const void**)&lumMmxFilter[s*i+APCK_PTR2/4 ]= lumSrcPtr[i+(vLumFilterSize>1)]; | |||||
| lumMmxFilter[s*i+APCK_COEF/4 ]= | |||||
| lumMmxFilter[s*i+APCK_COEF/4+1]= vLumFilter[dstY*vLumFilterSize + i ] | |||||
| + (vLumFilterSize>1 ? vLumFilter[dstY*vLumFilterSize + i + 1]<<16 : 0); | |||||
| if (CONFIG_SWSCALE_ALPHA && alpPixBuf) { | |||||
| *(const void**)&alpMmxFilter[s*i ]= alpSrcPtr[i ]; | |||||
| *(const void**)&alpMmxFilter[s*i+APCK_PTR2/4 ]= alpSrcPtr[i+(vLumFilterSize>1)]; | |||||
| alpMmxFilter[s*i+APCK_COEF/4 ]= | |||||
| alpMmxFilter[s*i+APCK_COEF/4+1]= lumMmxFilter[s*i+APCK_COEF/4 ]; | |||||
| } | |||||
| } | |||||
| for (i=0; i<vChrFilterSize; i+=2) { | |||||
| *(const void**)&chrMmxFilter[s*i ]= chrUSrcPtr[i ]; | |||||
| *(const void**)&chrMmxFilter[s*i+APCK_PTR2/4 ]= chrUSrcPtr[i+(vChrFilterSize>1)]; | |||||
| chrMmxFilter[s*i+APCK_COEF/4 ]= | |||||
| chrMmxFilter[s*i+APCK_COEF/4+1]= vChrFilter[chrDstY*vChrFilterSize + i ] | |||||
| + (vChrFilterSize>1 ? vChrFilter[chrDstY*vChrFilterSize + i + 1]<<16 : 0); | |||||
| } | |||||
| } else { | |||||
| for (i=0; i<vLumFilterSize; i++) { | |||||
| *(const void**)&lumMmxFilter[4*i+0]= lumSrcPtr[i]; | |||||
| lumMmxFilter[4*i+2]= | |||||
| lumMmxFilter[4*i+3]= | |||||
| ((uint16_t)vLumFilter[dstY*vLumFilterSize + i])*0x10001; | |||||
| if (CONFIG_SWSCALE_ALPHA && alpPixBuf) { | |||||
| *(const void**)&alpMmxFilter[4*i+0]= alpSrcPtr[i]; | |||||
| alpMmxFilter[4*i+2]= | |||||
| alpMmxFilter[4*i+3]= lumMmxFilter[4*i+2]; | |||||
| } | |||||
| } | |||||
| for (i=0; i<vChrFilterSize; i++) { | |||||
| *(const void**)&chrMmxFilter[4*i+0]= chrUSrcPtr[i]; | |||||
| chrMmxFilter[4*i+2]= | |||||
| chrMmxFilter[4*i+3]= | |||||
| ((uint16_t)vChrFilter[chrDstY*vChrFilterSize + i])*0x10001; | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
| #endif /* !COMPILE_TEMPLATE_MMX2 */ | |||||
| static void RENAME(sws_init_swScale)(SwsContext *c) | static void RENAME(sws_init_swScale)(SwsContext *c) | ||||
| { | { | ||||
| enum PixelFormat srcFormat = c->srcFormat; | enum PixelFormat srcFormat = c->srcFormat; | ||||
| @@ -1,79 +0,0 @@ | |||||
| /* | |||||
| * Copyright (C) 2001-2003 Michael Niedermayer <michaelni@gmx.at> | |||||
| * | |||||
| * This file is part of Libav. | |||||
| * | |||||
| * Libav is free software; you can redistribute it and/or | |||||
| * modify it under the terms of the GNU Lesser General Public | |||||
| * License as published by the Free Software Foundation; either | |||||
| * version 2.1 of the License, or (at your option) any later version. | |||||
| * | |||||
| * Libav is distributed in the hope that it will be useful, | |||||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||||
| * Lesser General Public License for more details. | |||||
| * | |||||
| * You should have received a copy of the GNU Lesser General Public | |||||
| * License along with Libav; if not, write to the Free Software | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |||||
| */ | |||||
| #ifndef SWSCALE_X86_SWSCALE_TEMPLATE_H | |||||
| #define SWSCALE_X86_SWSCALE_TEMPLATE_H | |||||
| DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, w10)= 0x0010001000100010LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, w02)= 0x0002000200020002LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bm00001111)=0x00000000FFFFFFFFLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bm00000111)=0x0000000000FFFFFFLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bm11111000)=0xFFFFFFFFFF000000LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, bm01010101)=0x00FF00FF00FF00FFLL; | |||||
| const DECLARE_ALIGNED(8, uint64_t, ff_dither4)[2] = { | |||||
| 0x0103010301030103LL, | |||||
| 0x0200020002000200LL,}; | |||||
| const DECLARE_ALIGNED(8, uint64_t, ff_dither8)[2] = { | |||||
| 0x0602060206020602LL, | |||||
| 0x0004000400040004LL,}; | |||||
| DECLARE_ASM_CONST(8, uint64_t, b16Mask)= 0x001F001F001F001FLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, g16Mask)= 0x07E007E007E007E0LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, r16Mask)= 0xF800F800F800F800LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, b15Mask)= 0x001F001F001F001FLL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, g15Mask)= 0x03E003E003E003E0LL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, r15Mask)= 0x7C007C007C007C00LL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_M24A) = 0x00FF0000FF0000FFLL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_M24B) = 0xFF0000FF0000FF00LL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_M24C) = 0x0000FF0000FF0000LL; | |||||
| #ifdef FAST_BGR2YV12 | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff) = 0x000000210041000DULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff) = 0x0000FFEEFFDC0038ULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff) = 0x00000038FFD2FFF8ULL; | |||||
| #else | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff) = 0x000020E540830C8BULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff) = 0x0000ED0FDAC23831ULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff) = 0x00003831D0E6F6EAULL; | |||||
| #endif /* FAST_BGR2YV12 */ | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YOffset) = 0x1010101010101010ULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UVOffset) = 0x8080808080808080ULL; | |||||
| DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toY1Coeff) = 0x0C88000040870C88ULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toY2Coeff) = 0x20DE4087000020DEULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY1Coeff) = 0x20DE0000408720DEULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY2Coeff) = 0x0C88408700000C88ULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toYOffset) = 0x0008400000084000ULL; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUV)[2][4] = { | |||||
| {0x38380000DAC83838ULL, 0xECFFDAC80000ECFFULL, 0xF6E40000D0E3F6E4ULL, 0x3838D0E300003838ULL}, | |||||
| {0xECFF0000DAC8ECFFULL, 0x3838DAC800003838ULL, 0x38380000D0E33838ULL, 0xF6E4D0E30000F6E4ULL}, | |||||
| }; | |||||
| DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUVOffset)= 0x0040400000404000ULL; | |||||
| #endif /* SWSCALE_X86_SWSCALE_TEMPLATE_H */ | |||||