Skip to content

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

minor QP scaling & auto-contrast bugfix 

fixed compilation problem without -fomit-frame-pointer


git-svn-id: file:///var/local/repositories/mplayer/trunk/postproc@2181 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 66fdc743
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
postprocess.c
View file @ 8855032f
...@@ -850,7 +850,7 @@ static inline void horizX1Filter(uint8_t *src, int stride, int QP) ...@@ -850,7 +850,7 @@ static inline void horizX1Filter(uint8_t *src, int stride, int QP)
"leal (%%eax, %1, 4), %%ebx \n\t" "leal (%%eax, %1, 4), %%ebx \n\t"
"movq b80, %%mm6 \n\t" "movq b80, %%mm6 \n\t"
"movd %2, %%mm5 \n\t" // QP "movd pQPb, %%mm5 \n\t" // QP
"movq %%mm5, %%mm4 \n\t" "movq %%mm5, %%mm4 \n\t"
"paddusb %%mm5, %%mm5 \n\t" // 2QP "paddusb %%mm5, %%mm5 \n\t" // 2QP
"paddusb %%mm5, %%mm4 \n\t" // 3QP "paddusb %%mm5, %%mm4 \n\t" // 3QP
...@@ -933,7 +933,7 @@ HX1old((%%ebx, %1, 2)) ...@@ -933,7 +933,7 @@ HX1old((%%ebx, %1, 2))
"psubusb %%mm3, %%mm2 \n\t"\ "psubusb %%mm3, %%mm2 \n\t"\
"movd %%mm1, %%ecx \n\t"\ "movd %%mm1, %%ecx \n\t"\
"psubusb %%mm4, %%mm3 \n\t"\ "psubusb %%mm4, %%mm3 \n\t"\
"paddsb (%3, %%ecx, 8), %%mm0 \n\t"\ "paddsb (%2, %%ecx, 8), %%mm0 \n\t"\
"por %%mm2, %%mm3 \n\t" /* px = |px - p(x+1)| */\ "por %%mm2, %%mm3 \n\t" /* px = |px - p(x+1)| */\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"pcmpeqb %%mm7, %%mm2 \n\t" /* px = sgn[px - p(x+1)] */\ "pcmpeqb %%mm7, %%mm2 \n\t" /* px = sgn[px - p(x+1)] */\
...@@ -954,18 +954,18 @@ HX1old((%%ebx, %1, 2)) ...@@ -954,18 +954,18 @@ HX1old((%%ebx, %1, 2))
"movd 4" #c ", %%mm1 \n\t"\ "movd 4" #c ", %%mm1 \n\t"\
"punpckldq %%mm1, %%mm0 \n\t"\ "punpckldq %%mm1, %%mm0 \n\t"\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"paddsb (%3, %%ecx, 8), %%mm0 \n\t"\ "paddsb (%2, %%ecx, 8), %%mm0 \n\t"\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"movq %%mm0, " #c " \n\t"\ "movq %%mm0, " #c " \n\t"\
"movd %%mm3, %%ecx \n\t"\ "movd %%mm3, %%ecx \n\t"\
"movd " #d ", %%mm0 \n\t"\ "movd " #d ", %%mm0 \n\t"\
"paddsb (%3, %%ecx, 8), %%mm4 \n\t"\ "paddsb (%2, %%ecx, 8), %%mm4 \n\t"\
"movd 4" #d ", %%mm1 \n\t"\ "movd 4" #d ", %%mm1 \n\t"\
"paddb %%mm6, %%mm4 \n\t"\ "paddb %%mm6, %%mm4 \n\t"\
"punpckldq %%mm1, %%mm0 \n\t"\ "punpckldq %%mm1, %%mm0 \n\t"\
"movq %%mm4, " #b " \n\t"\ "movq %%mm4, " #b " \n\t"\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"paddsb (%3, %%ecx, 8), %%mm0 \n\t"\ "paddsb (%2, %%ecx, 8), %%mm0 \n\t"\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"movq %%mm0, " #d " \n\t"\ "movq %%mm0, " #d " \n\t"\
...@@ -974,7 +974,7 @@ HX1b((%0, %1, 4),(%%ebx),(%%ebx, %1),(%%ebx, %1, 2)) ...@@ -974,7 +974,7 @@ HX1b((%0, %1, 4),(%%ebx),(%%ebx, %1),(%%ebx, %1, 2))
: :
: "r" (src), "r" (stride), "r" (QP), "r" (lut) : "r" (src), "r" (stride), "r" (lut)
: "%eax", "%ebx", "%ecx" : "%eax", "%ebx", "%ecx"
); );
#else #else
...@@ -2101,7 +2101,8 @@ void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int ...@@ -2101,7 +2101,8 @@ void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int
const int stride= dstStride; const int stride= dstStride;
int QP= isColor ? int QP= isColor ?
QPs[(y>>3)*QPStride + (x>>3)]: QPs[(y>>3)*QPStride + (x>>3)]:
(QPs[(y>>4)*QPStride + (x>>4)] * (packedYScale &0xFFFF))>>8; QPs[(y>>4)*QPStride + (x>>4)];
if(!isColor && (mode & LEVEL_FIX)) QP= (QP* (packedYScale &0xFFFF))>>8;
#ifdef HAVE_MMX #ifdef HAVE_MMX
asm volatile( asm volatile(
"movd %0, %%mm7 \n\t" "movd %0, %%mm7 \n\t"
......
postprocess_template.c
View file @ 8855032f
...@@ -850,7 +850,7 @@ static inline void horizX1Filter(uint8_t *src, int stride, int QP) ...@@ -850,7 +850,7 @@ static inline void horizX1Filter(uint8_t *src, int stride, int QP)
"leal (%%eax, %1, 4), %%ebx \n\t" "leal (%%eax, %1, 4), %%ebx \n\t"
"movq b80, %%mm6 \n\t" "movq b80, %%mm6 \n\t"
"movd %2, %%mm5 \n\t" // QP "movd pQPb, %%mm5 \n\t" // QP
"movq %%mm5, %%mm4 \n\t" "movq %%mm5, %%mm4 \n\t"
"paddusb %%mm5, %%mm5 \n\t" // 2QP "paddusb %%mm5, %%mm5 \n\t" // 2QP
"paddusb %%mm5, %%mm4 \n\t" // 3QP "paddusb %%mm5, %%mm4 \n\t" // 3QP
...@@ -933,7 +933,7 @@ HX1old((%%ebx, %1, 2)) ...@@ -933,7 +933,7 @@ HX1old((%%ebx, %1, 2))
"psubusb %%mm3, %%mm2 \n\t"\ "psubusb %%mm3, %%mm2 \n\t"\
"movd %%mm1, %%ecx \n\t"\ "movd %%mm1, %%ecx \n\t"\
"psubusb %%mm4, %%mm3 \n\t"\ "psubusb %%mm4, %%mm3 \n\t"\
"paddsb (%3, %%ecx, 8), %%mm0 \n\t"\ "paddsb (%2, %%ecx, 8), %%mm0 \n\t"\
"por %%mm2, %%mm3 \n\t" /* px = |px - p(x+1)| */\ "por %%mm2, %%mm3 \n\t" /* px = |px - p(x+1)| */\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"pcmpeqb %%mm7, %%mm2 \n\t" /* px = sgn[px - p(x+1)] */\ "pcmpeqb %%mm7, %%mm2 \n\t" /* px = sgn[px - p(x+1)] */\
...@@ -954,18 +954,18 @@ HX1old((%%ebx, %1, 2)) ...@@ -954,18 +954,18 @@ HX1old((%%ebx, %1, 2))
"movd 4" #c ", %%mm1 \n\t"\ "movd 4" #c ", %%mm1 \n\t"\
"punpckldq %%mm1, %%mm0 \n\t"\ "punpckldq %%mm1, %%mm0 \n\t"\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"paddsb (%3, %%ecx, 8), %%mm0 \n\t"\ "paddsb (%2, %%ecx, 8), %%mm0 \n\t"\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"movq %%mm0, " #c " \n\t"\ "movq %%mm0, " #c " \n\t"\
"movd %%mm3, %%ecx \n\t"\ "movd %%mm3, %%ecx \n\t"\
"movd " #d ", %%mm0 \n\t"\ "movd " #d ", %%mm0 \n\t"\
"paddsb (%3, %%ecx, 8), %%mm4 \n\t"\ "paddsb (%2, %%ecx, 8), %%mm4 \n\t"\
"movd 4" #d ", %%mm1 \n\t"\ "movd 4" #d ", %%mm1 \n\t"\
"paddb %%mm6, %%mm4 \n\t"\ "paddb %%mm6, %%mm4 \n\t"\
"punpckldq %%mm1, %%mm0 \n\t"\ "punpckldq %%mm1, %%mm0 \n\t"\
"movq %%mm4, " #b " \n\t"\ "movq %%mm4, " #b " \n\t"\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"paddsb (%3, %%ecx, 8), %%mm0 \n\t"\ "paddsb (%2, %%ecx, 8), %%mm0 \n\t"\
"paddb %%mm6, %%mm0 \n\t"\ "paddb %%mm6, %%mm0 \n\t"\
"movq %%mm0, " #d " \n\t"\ "movq %%mm0, " #d " \n\t"\
...@@ -974,7 +974,7 @@ HX1b((%0, %1, 4),(%%ebx),(%%ebx, %1),(%%ebx, %1, 2)) ...@@ -974,7 +974,7 @@ HX1b((%0, %1, 4),(%%ebx),(%%ebx, %1),(%%ebx, %1, 2))
: :
: "r" (src), "r" (stride), "r" (QP), "r" (lut) : "r" (src), "r" (stride), "r" (lut)
: "%eax", "%ebx", "%ecx" : "%eax", "%ebx", "%ecx"
); );
#else #else
...@@ -2101,7 +2101,8 @@ void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int ...@@ -2101,7 +2101,8 @@ void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int
const int stride= dstStride; const int stride= dstStride;
int QP= isColor ? int QP= isColor ?
QPs[(y>>3)*QPStride + (x>>3)]: QPs[(y>>3)*QPStride + (x>>3)]:
(QPs[(y>>4)*QPStride + (x>>4)] * (packedYScale &0xFFFF))>>8; QPs[(y>>4)*QPStride + (x>>4)];
if(!isColor && (mode & LEVEL_FIX)) QP= (QP* (packedYScale &0xFFFF))>>8;
#ifdef HAVE_MMX #ifdef HAVE_MMX
asm volatile( asm volatile(
"movd %0, %%mm7 \n\t" "movd %0, %%mm7 \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