Skip to content

L
libswscale
Commit a9408b47 authored by michael's avatar michael
Browse files
Options

fixed a sig4 bug an non mmx2 cpus (in case of more sig4 errors please send me... 

fixed a sig4 bug an non mmx2 cpus (in case of more sig4 errors please send me a "disassemble $eip-16 $eip+16" from gdb)


git-svn-id: file:///var/local/repositories/mplayer/trunk/postproc@2182 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 8855032f
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 34 deletions
postprocess.c
View file @ a9408b47
...@@ -1909,28 +1909,31 @@ static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int sr ...@@ -1909,28 +1909,31 @@ static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int sr
"leal (%3,%3), %%ebx \n\t" "leal (%3,%3), %%ebx \n\t"
"movq packedYOffset, %%mm2 \n\t" "movq packedYOffset, %%mm2 \n\t"
"movq packedYScale, %%mm3 \n\t" "movq packedYScale, %%mm3 \n\t"
"pxor %%mm4, %%mm4 \n\t"
#define SCALED_CPY \ #define SCALED_CPY \
"movq (%0), %%mm0 \n\t"\ "movq (%0), %%mm0 \n\t"\
"movq (%0,%2), %%mm1 \n\t"\ "movq (%0,%2), %%mm1 \n\t"\
"psubusb %%mm2, %%mm0 \n\t"\ "psubusb %%mm2, %%mm0 \n\t"\
"psubusb %%mm2, %%mm1 \n\t"\ "psubusb %%mm2, %%mm1 \n\t"\
"pxor %%mm4, %%mm4 \n\t"\ "movq %%mm0, %%mm5 \n\t"\
"pxor %%mm5, %%mm5 \n\t"\ "punpcklbw %%mm4, %%mm0 \n\t"\
"punpcklbw %%mm0, %%mm4 \n\t"\ "punpckhbw %%mm4, %%mm5 \n\t"\
"punpckhbw %%mm0, %%mm5 \n\t"\ "psllw $7, %%mm0 \n\t"\
"pmulhuw %%mm3, %%mm4 \n\t"\ "psllw $7, %%mm5 \n\t"\
"pmulhuw %%mm3, %%mm5 \n\t"\ "pmulhw %%mm3, %%mm0 \n\t"\
"packuswb %%mm5, %%mm4 \n\t"\ "pmulhw %%mm3, %%mm5 \n\t"\
"movq %%mm4, (%1) \n\t"\ "packuswb %%mm5, %%mm0 \n\t"\
"pxor %%mm4, %%mm4 \n\t"\ "movq %%mm0, (%1) \n\t"\
"pxor %%mm5, %%mm5 \n\t"\ "movq %%mm1, %%mm5 \n\t"\
"punpcklbw %%mm1, %%mm4 \n\t"\ "punpcklbw %%mm4, %%mm1 \n\t"\
"punpckhbw %%mm1, %%mm5 \n\t"\ "punpckhbw %%mm4, %%mm5 \n\t"\
"pmulhuw %%mm3, %%mm4 \n\t"\ "psllw $7, %%mm1 \n\t"\
"pmulhuw %%mm3, %%mm5 \n\t"\ "psllw $7, %%mm5 \n\t"\
"packuswb %%mm5, %%mm4 \n\t"\ "pmulhw %%mm3, %%mm1 \n\t"\
"movq %%mm4, (%1, %3) \n\t"\ "pmulhw %%mm3, %%mm5 \n\t"\
"packuswb %%mm5, %%mm1 \n\t"\
"movq %%mm1, (%1, %3) \n\t"\
"1: \n\t" "1: \n\t"
SCALED_CPY SCALED_CPY
...@@ -2073,7 +2076,7 @@ void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int ...@@ -2073,7 +2076,7 @@ void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int
scale= (double)(maxAllowedY - minAllowedY) / (double)(white-black); scale= (double)(maxAllowedY - minAllowedY) / (double)(white-black);
packedYScale= (uint16_t)(scale*256.0 + 0.5); packedYScale= (uint16_t)(scale*512.0 + 0.5);
packedYScale|= packedYScale<<32; packedYScale|= packedYScale<<32;
packedYScale|= packedYScale<<16; packedYScale|= packedYScale<<16;
} }
......
postprocess_template.c
View file @ a9408b47
...@@ -1909,28 +1909,31 @@ static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int sr ...@@ -1909,28 +1909,31 @@ static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int sr
"leal (%3,%3), %%ebx \n\t" "leal (%3,%3), %%ebx \n\t"
"movq packedYOffset, %%mm2 \n\t" "movq packedYOffset, %%mm2 \n\t"
"movq packedYScale, %%mm3 \n\t" "movq packedYScale, %%mm3 \n\t"
"pxor %%mm4, %%mm4 \n\t"
#define SCALED_CPY \ #define SCALED_CPY \
"movq (%0), %%mm0 \n\t"\ "movq (%0), %%mm0 \n\t"\
"movq (%0,%2), %%mm1 \n\t"\ "movq (%0,%2), %%mm1 \n\t"\
"psubusb %%mm2, %%mm0 \n\t"\ "psubusb %%mm2, %%mm0 \n\t"\
"psubusb %%mm2, %%mm1 \n\t"\ "psubusb %%mm2, %%mm1 \n\t"\
"pxor %%mm4, %%mm4 \n\t"\ "movq %%mm0, %%mm5 \n\t"\
"pxor %%mm5, %%mm5 \n\t"\ "punpcklbw %%mm4, %%mm0 \n\t"\
"punpcklbw %%mm0, %%mm4 \n\t"\ "punpckhbw %%mm4, %%mm5 \n\t"\
"punpckhbw %%mm0, %%mm5 \n\t"\ "psllw $7, %%mm0 \n\t"\
"pmulhuw %%mm3, %%mm4 \n\t"\ "psllw $7, %%mm5 \n\t"\
"pmulhuw %%mm3, %%mm5 \n\t"\ "pmulhw %%mm3, %%mm0 \n\t"\
"packuswb %%mm5, %%mm4 \n\t"\ "pmulhw %%mm3, %%mm5 \n\t"\
"movq %%mm4, (%1) \n\t"\ "packuswb %%mm5, %%mm0 \n\t"\
"pxor %%mm4, %%mm4 \n\t"\ "movq %%mm0, (%1) \n\t"\
"pxor %%mm5, %%mm5 \n\t"\ "movq %%mm1, %%mm5 \n\t"\
"punpcklbw %%mm1, %%mm4 \n\t"\ "punpcklbw %%mm4, %%mm1 \n\t"\
"punpckhbw %%mm1, %%mm5 \n\t"\ "punpckhbw %%mm4, %%mm5 \n\t"\
"pmulhuw %%mm3, %%mm4 \n\t"\ "psllw $7, %%mm1 \n\t"\
"pmulhuw %%mm3, %%mm5 \n\t"\ "psllw $7, %%mm5 \n\t"\
"packuswb %%mm5, %%mm4 \n\t"\ "pmulhw %%mm3, %%mm1 \n\t"\
"movq %%mm4, (%1, %3) \n\t"\ "pmulhw %%mm3, %%mm5 \n\t"\
"packuswb %%mm5, %%mm1 \n\t"\
"movq %%mm1, (%1, %3) \n\t"\
"1: \n\t" "1: \n\t"
SCALED_CPY SCALED_CPY
...@@ -2073,7 +2076,7 @@ void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int ...@@ -2073,7 +2076,7 @@ void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int
scale= (double)(maxAllowedY - minAllowedY) / (double)(white-black); scale= (double)(maxAllowedY - minAllowedY) / (double)(white-black);
packedYScale= (uint16_t)(scale*256.0 + 0.5); packedYScale= (uint16_t)(scale*512.0 + 0.5);
packedYScale|= packedYScale<<32; packedYScale|= packedYScale<<32;
packedYScale|= packedYScale<<16; packedYScale|= packedYScale<<16;
} }
......
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