On Tue, May 24, 2011 at 05:31:34PM -0400, Ronald S. Bultje wrote:
> Interleave macros and code so that it's easier to find the
> actual code that belongs to a function. Also reindent where
> appropriate.
> ---
> 
> --- a/libswscale/x86/swscale_template.c
> +++ b/libswscale/x86/swscale_template.c
> @@ -148,6 +184,28 @@
>      "add                   $8, %%"REG_a"  \n\t"\
>      "jnc                   1b             \n\t"
>  
> +static inline void RENAME(yuv2yuv1)(SwsContext *c, const int16_t *lumSrc,
> +                                    const int16_t *chrSrc, const int16_t 
> *alpSrc,
> +                                    uint8_t *dest, uint8_t *uDest, uint8_t 
> *vDest,
> +                                    uint8_t *aDest, long dstW, long chrDstW)
> +{
> +    long p= 4;
> +    const uint8_t *src[4]= { alpSrc + dstW, lumSrc + dstW, chrSrc + chrDstW, 
> chrSrc + VOFW + chrDstW };
> +    uint8_t *dst[4]= { aDest, dest, uDest, vDest };
> +    x86_reg counter[4]= { dstW, dstW, chrDstW, chrDstW };
> +    

trailing whitespace

> @@ -166,13 +224,28 @@
>      "add                   $8, %%"REG_a"  \n\t"\
>      "jnc                   1b             \n\t"
>  
> -/*
> -    :: "m" (-lumFilterSize), "m" (-chrFilterSize),
> -       "m" (lumMmxFilter+lumFilterSize*4), "m" 
> (chrMmxFilter+chrFilterSize*4),
> -       "r" (dest), "m" (dstW_reg),
> -       "m" (lumSrc+lumFilterSize), "m" (chrSrc+chrFilterSize)
> -    : "%eax", "%ebx", "%ecx", "%edx", "%esi"
> -*/

dead code removal

> @@ -826,688 +832,701 @@
>  /**
>   * vertical scale YV12 to RGB
>   */
> -static inline void RENAME(yuv2rgb32_X_ar)(SwsContext *c, const int16_t 
> *lumFilter, const int16_t **lumSrc, int lumFilterSize,
> -                                       const int16_t *chrFilter, const 
> int16_t **chrSrc, int chrFilterSize,
> -                                       const int16_t **alpSrc, uint8_t 
> *dest, long dstW, long dstY)
> +static inline void RENAME(yuv2yuyv422_X_ar)(SwsContext *c, const int16_t 
> *lumFilter,
> +                                            const int16_t **lumSrc, int 
> lumFilterSize,
> +                                            const int16_t *chrFilter, const 
> int16_t **chrSrc,
> +                                            int chrFilterSize, const int16_t 
> **alpSrc,
> +                                            uint8_t *dest, long dstW, long 
> dstY)

The comment is now misplaced, it belongs to yuv2rgb32_X_ar().


Fix these issues and push.

Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to