diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2001-10-23 00:03:19 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2001-10-23 00:03:19 +0000 |
| commit | 57d04d3f11290d1848efa3b47031762f936d4cb3 (patch) | |
| tree | 16e02591ee84a3fd9ee1157155c0dfb706a49b3e /postproc | |
| parent | 911879d15eeb5cae8ff00ab4ad28408c2ee9f31b (diff) | |
| download | ffmpeg-streaming-57d04d3f11290d1848efa3b47031762f936d4cb3.zip ffmpeg-streaming-57d04d3f11290d1848efa3b47031762f936d4cb3.tar.gz | |
negative black bugfix
Originally committed as revision 2395 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc')
| -rw-r--r-- | postproc/postprocess.c | 21 | ||||
| -rw-r--r-- | postproc/postprocess_template.c | 21 |
2 files changed, 20 insertions, 22 deletions
diff --git a/postproc/postprocess.c b/postproc/postprocess.c index 5f3717a..3ea0031 100644 --- a/postproc/postprocess.c +++ b/postproc/postprocess.c @@ -136,7 +136,6 @@ int vFlatnessThreshold= 56 - 16; double maxClippedThreshold= 0.01; int maxAllowedY=234; -//FIXME can never make a movie´s black brighter (anyone needs that?) int minAllowedY=16; static struct PPFilter filters[]= @@ -2507,13 +2506,13 @@ static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int sr #define SCALED_CPY \ "movq (%0), %%mm0 \n\t"\ "movq (%0,%2), %%mm1 \n\t"\ - "psubusb %%mm2, %%mm0 \n\t"\ - "psubusb %%mm2, %%mm1 \n\t"\ "movq %%mm0, %%mm5 \n\t"\ "punpcklbw %%mm4, %%mm0 \n\t"\ "punpckhbw %%mm4, %%mm5 \n\t"\ - "psllw $7, %%mm0 \n\t"\ - "psllw $7, %%mm5 \n\t"\ + "psubw %%mm2, %%mm0 \n\t"\ + "psubw %%mm2, %%mm5 \n\t"\ + "psllw $6, %%mm0 \n\t"\ + "psllw $6, %%mm5 \n\t"\ "pmulhw %%mm3, %%mm0 \n\t"\ "pmulhw %%mm3, %%mm5 \n\t"\ "packuswb %%mm5, %%mm0 \n\t"\ @@ -2521,8 +2520,10 @@ static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int sr "movq %%mm1, %%mm5 \n\t"\ "punpcklbw %%mm4, %%mm1 \n\t"\ "punpckhbw %%mm4, %%mm5 \n\t"\ - "psllw $7, %%mm1 \n\t"\ - "psllw $7, %%mm5 \n\t"\ + "psubw %%mm2, %%mm1 \n\t"\ + "psubw %%mm2, %%mm5 \n\t"\ + "psllw $6, %%mm1 \n\t"\ + "psllw $6, %%mm5 \n\t"\ "pmulhw %%mm3, %%mm1 \n\t"\ "pmulhw %%mm3, %%mm5 \n\t"\ "packuswb %%mm5, %%mm1 \n\t"\ @@ -2685,15 +2686,13 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri clipped-= yHistogram[white]; } - // we cant handle negative correctures - packedYOffset= MAX(black - minAllowedY, 0); + packedYOffset= (black - minAllowedY) & 0xFFFF; packedYOffset|= packedYOffset<<32; packedYOffset|= packedYOffset<<16; - packedYOffset|= packedYOffset<<8; scale= (double)(maxAllowedY - minAllowedY) / (double)(white-black); - packedYScale= (uint16_t)(scale*512.0 + 0.5); + packedYScale= (uint16_t)(scale*1024.0 + 0.5); packedYScale|= packedYScale<<32; packedYScale|= packedYScale<<16; } diff --git a/postproc/postprocess_template.c b/postproc/postprocess_template.c index 5f3717a..3ea0031 100644 --- a/postproc/postprocess_template.c +++ b/postproc/postprocess_template.c @@ -136,7 +136,6 @@ int vFlatnessThreshold= 56 - 16; double maxClippedThreshold= 0.01; int maxAllowedY=234; -//FIXME can never make a movie´s black brighter (anyone needs that?) int minAllowedY=16; static struct PPFilter filters[]= @@ -2507,13 +2506,13 @@ static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int sr #define SCALED_CPY \ "movq (%0), %%mm0 \n\t"\ "movq (%0,%2), %%mm1 \n\t"\ - "psubusb %%mm2, %%mm0 \n\t"\ - "psubusb %%mm2, %%mm1 \n\t"\ "movq %%mm0, %%mm5 \n\t"\ "punpcklbw %%mm4, %%mm0 \n\t"\ "punpckhbw %%mm4, %%mm5 \n\t"\ - "psllw $7, %%mm0 \n\t"\ - "psllw $7, %%mm5 \n\t"\ + "psubw %%mm2, %%mm0 \n\t"\ + "psubw %%mm2, %%mm5 \n\t"\ + "psllw $6, %%mm0 \n\t"\ + "psllw $6, %%mm5 \n\t"\ "pmulhw %%mm3, %%mm0 \n\t"\ "pmulhw %%mm3, %%mm5 \n\t"\ "packuswb %%mm5, %%mm0 \n\t"\ @@ -2521,8 +2520,10 @@ static inline void blockCopy(uint8_t dst[], int dstStride, uint8_t src[], int sr "movq %%mm1, %%mm5 \n\t"\ "punpcklbw %%mm4, %%mm1 \n\t"\ "punpckhbw %%mm4, %%mm5 \n\t"\ - "psllw $7, %%mm1 \n\t"\ - "psllw $7, %%mm5 \n\t"\ + "psubw %%mm2, %%mm1 \n\t"\ + "psubw %%mm2, %%mm5 \n\t"\ + "psllw $6, %%mm1 \n\t"\ + "psllw $6, %%mm5 \n\t"\ "pmulhw %%mm3, %%mm1 \n\t"\ "pmulhw %%mm3, %%mm5 \n\t"\ "packuswb %%mm5, %%mm1 \n\t"\ @@ -2685,15 +2686,13 @@ static void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStri clipped-= yHistogram[white]; } - // we cant handle negative correctures - packedYOffset= MAX(black - minAllowedY, 0); + packedYOffset= (black - minAllowedY) & 0xFFFF; packedYOffset|= packedYOffset<<32; packedYOffset|= packedYOffset<<16; - packedYOffset|= packedYOffset<<8; scale= (double)(maxAllowedY - minAllowedY) / (double)(white-black); - packedYScale= (uint16_t)(scale*512.0 + 0.5); + packedYScale= (uint16_t)(scale*1024.0 + 0.5); packedYScale|= packedYScale<<32; packedYScale|= packedYScale<<16; } |
