Commit c1b7f3bb authored by ramiro's avatar ramiro

Indent libswscale:

- Use 4 spaces throughout for indentation;
- Fix inconsistent indentation;
- Indent function calls and declarations aligning arguments on multiple lines
  to the column after the opening parentheses;
- Align asm code to the column 4 spaces after the call to __asm__();
- Align cases in switch statements to the same column as "switch".


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@29522 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 33e97d1b
...@@ -1597,7 +1597,7 @@ static inline void RENAME(yuvPlanartoyuy2)(const uint8_t *ysrc, const uint8_t *u ...@@ -1597,7 +1597,7 @@ static inline void RENAME(yuvPlanartoyuy2)(const uint8_t *ysrc, const uint8_t *u
dst += dstStride; dst += dstStride;
} }
#if HAVE_MMX #if HAVE_MMX
__asm__( EMMS" \n\t" __asm__(EMMS" \n\t"
SFENCE" \n\t" SFENCE" \n\t"
:::"memory"); :::"memory");
#endif #endif
...@@ -1703,7 +1703,7 @@ static inline void RENAME(yuvPlanartouyvy)(const uint8_t *ysrc, const uint8_t *u ...@@ -1703,7 +1703,7 @@ static inline void RENAME(yuvPlanartouyvy)(const uint8_t *ysrc, const uint8_t *u
dst += dstStride; dst += dstStride;
} }
#if HAVE_MMX #if HAVE_MMX
__asm__( EMMS" \n\t" __asm__(EMMS" \n\t"
SFENCE" \n\t" SFENCE" \n\t"
:::"memory"); :::"memory");
#endif #endif
...@@ -1859,7 +1859,7 @@ static inline void RENAME(yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t ...@@ -1859,7 +1859,7 @@ static inline void RENAME(yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t
src += srcStride; src += srcStride;
} }
#if HAVE_MMX #if HAVE_MMX
__asm__ volatile( EMMS" \n\t" __asm__ volatile(EMMS" \n\t"
SFENCE" \n\t" SFENCE" \n\t"
:::"memory"); :::"memory");
#endif #endif
...@@ -1971,7 +1971,7 @@ static inline void RENAME(planar2x)(const uint8_t *src, uint8_t *dst, long srcWi ...@@ -1971,7 +1971,7 @@ static inline void RENAME(planar2x)(const uint8_t *src, uint8_t *dst, long srcWi
#endif #endif
#if HAVE_MMX #if HAVE_MMX
__asm__ volatile( EMMS" \n\t" __asm__ volatile(EMMS" \n\t"
SFENCE" \n\t" SFENCE" \n\t"
:::"memory"); :::"memory");
#endif #endif
...@@ -2097,7 +2097,7 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t ...@@ -2097,7 +2097,7 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t
src += srcStride; src += srcStride;
} }
#if HAVE_MMX #if HAVE_MMX
__asm__ volatile( EMMS" \n\t" __asm__ volatile(EMMS" \n\t"
SFENCE" \n\t" SFENCE" \n\t"
:::"memory"); :::"memory");
#endif #endif
...@@ -2349,7 +2349,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_ ...@@ -2349,7 +2349,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_
src += srcStride*2; src += srcStride*2;
} }
__asm__ volatile( EMMS" \n\t" __asm__ volatile(EMMS" \n\t"
SFENCE" \n\t" SFENCE" \n\t"
:::"memory"); :::"memory");
#else #else
......
...@@ -932,11 +932,11 @@ static inline void RENAME(yuv2yuvX)(SwsContext *c, const int16_t *lumFilter, con ...@@ -932,11 +932,11 @@ static inline void RENAME(yuv2yuvX)(SwsContext *c, const int16_t *lumFilter, con
} }
#endif #endif
#if COMPILE_TEMPLATE_ALTIVEC #if COMPILE_TEMPLATE_ALTIVEC
yuv2yuvX_altivec_real(lumFilter, lumSrc, lumFilterSize, yuv2yuvX_altivec_real(lumFilter, lumSrc, lumFilterSize,
chrFilter, chrSrc, chrFilterSize, chrFilter, chrSrc, chrFilterSize,
dest, uDest, vDest, dstW, chrDstW); dest, uDest, vDest, dstW, chrDstW);
#else //COMPILE_TEMPLATE_ALTIVEC #else //COMPILE_TEMPLATE_ALTIVEC
yuv2yuvXinC(lumFilter, lumSrc, lumFilterSize, yuv2yuvXinC(lumFilter, lumSrc, lumFilterSize,
chrFilter, chrSrc, chrFilterSize, chrFilter, chrSrc, chrFilterSize,
alpSrc, dest, uDest, vDest, aDest, dstW, chrDstW); alpSrc, dest, uDest, vDest, aDest, dstW, chrDstW);
#endif //!COMPILE_TEMPLATE_ALTIVEC #endif //!COMPILE_TEMPLATE_ALTIVEC
...@@ -946,7 +946,7 @@ static inline void RENAME(yuv2nv12X)(SwsContext *c, const int16_t *lumFilter, co ...@@ -946,7 +946,7 @@ static inline void RENAME(yuv2nv12X)(SwsContext *c, const int16_t *lumFilter, co
const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize, const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
uint8_t *dest, uint8_t *uDest, int dstW, int chrDstW, int dstFormat) uint8_t *dest, uint8_t *uDest, int dstW, int chrDstW, int dstFormat)
{ {
yuv2nv12XinC(lumFilter, lumSrc, lumFilterSize, yuv2nv12XinC(lumFilter, lumSrc, lumFilterSize,
chrFilter, chrSrc, chrFilterSize, chrFilter, chrSrc, chrFilterSize,
dest, uDest, dstW, chrDstW, dstFormat); dest, uDest, dstW, chrDstW, dstFormat);
} }
...@@ -1358,7 +1358,7 @@ static inline void RENAME(yuv2packed2)(SwsContext *c, const uint16_t *buf0, cons ...@@ -1358,7 +1358,7 @@ static inline void RENAME(yuv2packed2)(SwsContext *c, const uint16_t *buf0, cons
} }
} }
#endif //COMPILE_TEMPLATE_MMX #endif //COMPILE_TEMPLATE_MMX
YSCALE_YUV_2_ANYRGB_C(YSCALE_YUV_2_RGB2_C, YSCALE_YUV_2_PACKED2_C(void,0), YSCALE_YUV_2_GRAY16_2_C, YSCALE_YUV_2_MONO2_C) YSCALE_YUV_2_ANYRGB_C(YSCALE_YUV_2_RGB2_C, YSCALE_YUV_2_PACKED2_C(void,0), YSCALE_YUV_2_GRAY16_2_C, YSCALE_YUV_2_MONO2_C)
} }
/** /**
...@@ -2305,14 +2305,14 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth, ...@@ -2305,14 +2305,14 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth,
#endif /* ARCH_X86_64 */ #endif /* ARCH_X86_64 */
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
#if defined(PIC) #if defined(PIC)
"mov %5, %%"REG_b" \n\t" "mov %5, %%"REG_b" \n\t"
...@@ -2470,10 +2470,10 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth, ...@@ -2470,10 +2470,10 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth,
PREFETCH" 32(%%"REG_c") \n\t" PREFETCH" 32(%%"REG_c") \n\t"
PREFETCH" 64(%%"REG_c") \n\t" PREFETCH" 64(%%"REG_c") \n\t"
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
"xor %%"REG_a", %%"REG_a" \n\t" // i "xor %%"REG_a", %%"REG_a" \n\t" // i
"mov %5, %%"REG_c" \n\t" // src "mov %5, %%"REG_c" \n\t" // src
"mov %1, %%"REG_D" \n\t" // buf1 "mov %1, %%"REG_D" \n\t" // buf1
...@@ -2482,10 +2482,10 @@ CALL_MMX2_FILTER_CODE ...@@ -2482,10 +2482,10 @@ CALL_MMX2_FILTER_CODE
PREFETCH" 32(%%"REG_c") \n\t" PREFETCH" 32(%%"REG_c") \n\t"
PREFETCH" 64(%%"REG_c") \n\t" PREFETCH" 64(%%"REG_c") \n\t"
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
CALL_MMX2_FILTER_CODE CALL_MMX2_FILTER_CODE
#if defined(PIC) #if defined(PIC)
"mov %6, %%"REG_b" \n\t" "mov %6, %%"REG_b" \n\t"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment