Revision b411dfff libswscale/swscale_template.c

View differences:

libswscale/swscale_template.c
944 944

  
945 945
static inline void RENAME(yuv2nv12X)(SwsContext *c, const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize,
946 946
                                     const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
947
                                     uint8_t *dest, uint8_t *uDest, int dstW, int chrDstW, int dstFormat)
947
                                     uint8_t *dest, uint8_t *uDest, int dstW, int chrDstW, enum PixelFormat dstFormat)
948 948
{
949 949
    yuv2nv12XinC(lumFilter, lumSrc, lumFilterSize,
950 950
                 chrFilter, chrSrc, chrFilterSize,
......
1361 1361
 * YV12 to RGB without scaling or interpolating
1362 1362
 */
1363 1363
static inline void RENAME(yuv2packed1)(SwsContext *c, const uint16_t *buf0, const uint16_t *uvbuf0, const uint16_t *uvbuf1,
1364
                          const uint16_t *abuf0, uint8_t *dest, int dstW, int uvalpha, int dstFormat, int flags, int y)
1364
                          const uint16_t *abuf0, uint8_t *dest, int dstW, int uvalpha, enum PixelFormat dstFormat, int flags, int y)
1365 1365
{
1366 1366
    const int yalpha1=0;
1367 1367
    int i;
......
1785 1785
}
1786 1786

  
1787 1787
#if COMPILE_TEMPLATE_MMX
1788
static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, const uint8_t *src, long width, int srcFormat)
1788
static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, const uint8_t *src, long width, enum PixelFormat srcFormat)
1789 1789
{
1790 1790

  
1791 1791
    if(srcFormat == PIX_FMT_BGR24) {
......
1838 1838
    );
1839 1839
}
1840 1840

  
1841
static inline void RENAME(bgr24ToUV_mmx)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, long width, int srcFormat)
1841
static inline void RENAME(bgr24ToUV_mmx)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, long width, enum PixelFormat srcFormat)
1842 1842
{
1843 1843
    __asm__ volatile(
1844 1844
        "movq                    24+%4, %%mm6       \n\t"
......
2197 2197
static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth, const uint8_t *src, int srcW, int xInc,
2198 2198
                                   int flags, const int16_t *hLumFilter,
2199 2199
                                   const int16_t *hLumFilterPos, int hLumFilterSize,
2200
                                   int srcFormat, uint8_t *formatConvBuffer,
2200
                                   enum PixelFormat srcFormat, uint8_t *formatConvBuffer,
2201 2201
                                   uint32_t *pal, int isAlpha)
2202 2202
{
2203 2203
    int32_t av_unused *mmx2FilterPos = c->lumMmx2FilterPos;
......
2374 2374
inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth, const uint8_t *src1, const uint8_t *src2,
2375 2375
                                   int srcW, int xInc, int flags, const int16_t *hChrFilter,
2376 2376
                                   const int16_t *hChrFilterPos, int hChrFilterSize,
2377
                                   int srcFormat, uint8_t *formatConvBuffer,
2377
                                   enum PixelFormat srcFormat, uint8_t *formatConvBuffer,
2378 2378
                                   uint32_t *pal)
2379 2379
{
2380 2380
    int32_t av_unused *mmx2FilterPos = c->chrMmx2FilterPos;
......
2543 2543
    const int chrSrcW= c->chrSrcW;
2544 2544
    const int lumXInc= c->lumXInc;
2545 2545
    const int chrXInc= c->chrXInc;
2546
    const int dstFormat= c->dstFormat;
2547
    const int srcFormat= c->srcFormat;
2546
    const enum PixelFormat dstFormat= c->dstFormat;
2547
    const enum PixelFormat srcFormat= c->srcFormat;
2548 2548
    const int flags= c->flags;
2549 2549
    int16_t *vLumFilterPos= c->vLumFilterPos;
2550 2550
    int16_t *vChrFilterPos= c->vChrFilterPos;

Also available in: Unified diff