Commit 3164d25e authored by Cédric Schieli's avatar Cédric Schieli

Reindent after last commit

Originally committed as revision 29014 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
parent b3b5946c
...@@ -979,25 +979,25 @@ static inline void RENAME(yuv2yuv1)(SwsContext *c, int16_t *lumSrc, int16_t *chr ...@@ -979,25 +979,25 @@ static inline void RENAME(yuv2yuv1)(SwsContext *c, int16_t *lumSrc, int16_t *chr
if (c->flags & SWS_ACCURATE_RND){ if (c->flags & SWS_ACCURATE_RND){
while(p--){ while(p--){
if (dst[p]){ if (dst[p]){
__asm__ volatile( __asm__ volatile(
YSCALEYUV2YV121_ACCURATE YSCALEYUV2YV121_ACCURATE
:: "r" (src[p]), "r" (dst[p] + counter[p]), :: "r" (src[p]), "r" (dst[p] + counter[p]),
"g" (-counter[p]) "g" (-counter[p])
: "%"REG_a : "%"REG_a
); );
} }
} }
}else{ }else{
while(p--){ while(p--){
if (dst[p]){ if (dst[p]){
__asm__ volatile( __asm__ volatile(
YSCALEYUV2YV121 YSCALEYUV2YV121
:: "r" (src[p]), "r" (dst[p] + counter[p]), :: "r" (src[p]), "r" (dst[p] + counter[p]),
"g" (-counter[p]) "g" (-counter[p])
: "%"REG_a : "%"REG_a
); );
} }
} }
} }
return; return;
...@@ -1068,12 +1068,12 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_ ...@@ -1068,12 +1068,12 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_
YSCALEYUV2PACKEDX_END YSCALEYUV2PACKEDX_END
}else{ }else{
YSCALEYUV2PACKEDX_ACCURATE YSCALEYUV2PACKEDX_ACCURATE
YSCALEYUV2RGBX YSCALEYUV2RGBX
"pcmpeqd %%mm7, %%mm7 \n\t" "pcmpeqd %%mm7, %%mm7 \n\t"
WRITEBGR32(%4, %5, %%REGa, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6) WRITEBGR32(%4, %5, %%REGa, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6)
YSCALEYUV2PACKEDX_END YSCALEYUV2PACKEDX_END
} }
return; return;
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
...@@ -1145,11 +1145,11 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_ ...@@ -1145,11 +1145,11 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_
WRITEBGR32(%4, %5, %%REGa, %%mm2, %%mm4, %%mm5, %%mm1, %%mm0, %%mm7, %%mm3, %%mm6) WRITEBGR32(%4, %5, %%REGa, %%mm2, %%mm4, %%mm5, %%mm1, %%mm0, %%mm7, %%mm3, %%mm6)
YSCALEYUV2PACKEDX_END YSCALEYUV2PACKEDX_END
}else{ }else{
YSCALEYUV2PACKEDX YSCALEYUV2PACKEDX
YSCALEYUV2RGBX YSCALEYUV2RGBX
"pcmpeqd %%mm7, %%mm7 \n\t" "pcmpeqd %%mm7, %%mm7 \n\t"
WRITEBGR32(%4, %5, %%REGa, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6) WRITEBGR32(%4, %5, %%REGa, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6)
YSCALEYUV2PACKEDX_END YSCALEYUV2PACKEDX_END
} }
return; return;
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
...@@ -1285,19 +1285,19 @@ static inline void RENAME(yuv2packed2)(SwsContext *c, uint16_t *buf0, uint16_t * ...@@ -1285,19 +1285,19 @@ static inline void RENAME(yuv2packed2)(SwsContext *c, uint16_t *buf0, uint16_t *
); );
#endif #endif
}else{ }else{
__asm__ volatile( __asm__ volatile(
"mov %%"REG_b", "ESP_OFFSET"(%5) \n\t" "mov %%"REG_b", "ESP_OFFSET"(%5) \n\t"
"mov %4, %%"REG_b" \n\t" "mov %4, %%"REG_b" \n\t"
"push %%"REG_BP" \n\t" "push %%"REG_BP" \n\t"
YSCALEYUV2RGB(%%REGBP, %5) YSCALEYUV2RGB(%%REGBP, %5)
"pcmpeqd %%mm7, %%mm7 \n\t" "pcmpeqd %%mm7, %%mm7 \n\t"
WRITEBGR32(%%REGb, 8280(%5), %%REGBP, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6) WRITEBGR32(%%REGb, 8280(%5), %%REGBP, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6)
"pop %%"REG_BP" \n\t" "pop %%"REG_BP" \n\t"
"mov "ESP_OFFSET"(%5), %%"REG_b" \n\t" "mov "ESP_OFFSET"(%5), %%"REG_b" \n\t"
:: "c" (buf0), "d" (buf1), "S" (uvbuf0), "D" (uvbuf1), "m" (dest), :: "c" (buf0), "d" (buf1), "S" (uvbuf0), "D" (uvbuf1), "m" (dest),
"a" (&c->redDither) "a" (&c->redDither)
); );
} }
return; return;
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
...@@ -1417,19 +1417,19 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t * ...@@ -1417,19 +1417,19 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t *
"a" (&c->redDither) "a" (&c->redDither)
); );
}else{ }else{
__asm__ volatile( __asm__ volatile(
"mov %%"REG_b", "ESP_OFFSET"(%5) \n\t" "mov %%"REG_b", "ESP_OFFSET"(%5) \n\t"
"mov %4, %%"REG_b" \n\t" "mov %4, %%"REG_b" \n\t"
"push %%"REG_BP" \n\t" "push %%"REG_BP" \n\t"
YSCALEYUV2RGB1(%%REGBP, %5) YSCALEYUV2RGB1(%%REGBP, %5)
"pcmpeqd %%mm7, %%mm7 \n\t" "pcmpeqd %%mm7, %%mm7 \n\t"
WRITEBGR32(%%REGb, 8280(%5), %%REGBP, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6) WRITEBGR32(%%REGb, 8280(%5), %%REGBP, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6)
"pop %%"REG_BP" \n\t" "pop %%"REG_BP" \n\t"
"mov "ESP_OFFSET"(%5), %%"REG_b" \n\t" "mov "ESP_OFFSET"(%5), %%"REG_b" \n\t"
:: "c" (buf0), "d" (buf1), "S" (uvbuf0), "D" (uvbuf1), "m" (dest), :: "c" (buf0), "d" (buf1), "S" (uvbuf0), "D" (uvbuf1), "m" (dest),
"a" (&c->redDither) "a" (&c->redDither)
); );
} }
return; return;
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
...@@ -1526,19 +1526,19 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t * ...@@ -1526,19 +1526,19 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t *
"a" (&c->redDither) "a" (&c->redDither)
); );
}else{ }else{
__asm__ volatile( __asm__ volatile(
"mov %%"REG_b", "ESP_OFFSET"(%5) \n\t" "mov %%"REG_b", "ESP_OFFSET"(%5) \n\t"
"mov %4, %%"REG_b" \n\t" "mov %4, %%"REG_b" \n\t"
"push %%"REG_BP" \n\t" "push %%"REG_BP" \n\t"
YSCALEYUV2RGB1b(%%REGBP, %5) YSCALEYUV2RGB1b(%%REGBP, %5)
"pcmpeqd %%mm7, %%mm7 \n\t" "pcmpeqd %%mm7, %%mm7 \n\t"
WRITEBGR32(%%REGb, 8280(%5), %%REGBP, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6) WRITEBGR32(%%REGb, 8280(%5), %%REGBP, %%mm2, %%mm4, %%mm5, %%mm7, %%mm0, %%mm1, %%mm3, %%mm6)
"pop %%"REG_BP" \n\t" "pop %%"REG_BP" \n\t"
"mov "ESP_OFFSET"(%5), %%"REG_b" \n\t" "mov "ESP_OFFSET"(%5), %%"REG_b" \n\t"
:: "c" (buf0), "d" (buf1), "S" (uvbuf0), "D" (uvbuf1), "m" (dest), :: "c" (buf0), "d" (buf1), "S" (uvbuf0), "D" (uvbuf1), "m" (dest),
"a" (&c->redDither) "a" (&c->redDither)
); );
} }
return; return;
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
...@@ -2281,7 +2281,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth, ...@@ -2281,7 +2281,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth,
if (isAlpha) if (isAlpha)
RENAME(abgrToA)(formatConvBuffer, src+3, srcW, pal); RENAME(abgrToA)(formatConvBuffer, src+3, srcW, pal);
else else
RENAME(bgr32ToY)(formatConvBuffer, src, srcW, pal); RENAME(bgr32ToY)(formatConvBuffer, src, srcW, pal);
src= formatConvBuffer; src= formatConvBuffer;
} }
else if (srcFormat==PIX_FMT_RGB32_1) else if (srcFormat==PIX_FMT_RGB32_1)
...@@ -2289,7 +2289,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth, ...@@ -2289,7 +2289,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth,
if (isAlpha) if (isAlpha)
RENAME(abgrToA)(formatConvBuffer, src, srcW, pal); RENAME(abgrToA)(formatConvBuffer, src, srcW, pal);
else else
RENAME(bgr32ToY)(formatConvBuffer, src+ALT32_CORR, srcW, pal); RENAME(bgr32ToY)(formatConvBuffer, src+ALT32_CORR, srcW, pal);
src= formatConvBuffer; src= formatConvBuffer;
} }
else if (srcFormat==PIX_FMT_BGR24) else if (srcFormat==PIX_FMT_BGR24)
...@@ -2312,7 +2312,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth, ...@@ -2312,7 +2312,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth,
if (isAlpha) if (isAlpha)
RENAME(abgrToA)(formatConvBuffer, src+3, srcW, pal); RENAME(abgrToA)(formatConvBuffer, src+3, srcW, pal);
else else
RENAME(rgb32ToY)(formatConvBuffer, src, srcW, pal); RENAME(rgb32ToY)(formatConvBuffer, src, srcW, pal);
src= formatConvBuffer; src= formatConvBuffer;
} }
else if (srcFormat==PIX_FMT_BGR32_1) else if (srcFormat==PIX_FMT_BGR32_1)
...@@ -2320,7 +2320,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth, ...@@ -2320,7 +2320,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth,
if (isAlpha) if (isAlpha)
RENAME(abgrToA)(formatConvBuffer, src, srcW, pal); RENAME(abgrToA)(formatConvBuffer, src, srcW, pal);
else else
RENAME(rgb32ToY)(formatConvBuffer, src+ALT32_CORR, srcW, pal); RENAME(rgb32ToY)(formatConvBuffer, src+ALT32_CORR, srcW, pal);
src= formatConvBuffer; src= formatConvBuffer;
} }
else if (srcFormat==PIX_FMT_RGB24) else if (srcFormat==PIX_FMT_RGB24)
......
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