Commit 97535ffb authored by Ronald S. Bultje's avatar Ronald S. Bultje

swscale: remove unused xInc/srcW arguments from hScale().

parent 9a0dda8b
...@@ -222,8 +222,7 @@ yuv2yuvX_altivec_real(SwsContext *c, ...@@ -222,8 +222,7 @@ yuv2yuvX_altivec_real(SwsContext *c,
} }
static void hScale_altivec_real(int16_t *dst, int dstW, static void hScale_altivec_real(int16_t *dst, int dstW,
const uint8_t *src, int srcW, const uint8_t *src, const int16_t *filter,
int xInc, const int16_t *filter,
const int16_t *filterPos, int filterSize) const int16_t *filterPos, int filterSize)
{ {
register int i; register int i;
......
...@@ -1804,10 +1804,8 @@ static void rgb24ToUV_half_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, ...@@ -1804,10 +1804,8 @@ static void rgb24ToUV_half_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
} }
} }
// bilinear / bicubic scaling // bilinear / bicubic scaling
static void hScale_c(int16_t *dst, int dstW, const uint8_t *src, static void hScale_c(int16_t *dst, int dstW, const uint8_t *src,
int srcW, int xInc,
const int16_t *filter, const int16_t *filterPos, const int16_t *filter, const int16_t *filterPos,
int filterSize) int filterSize)
{ {
...@@ -1886,7 +1884,7 @@ static av_always_inline void hyscale(SwsContext *c, uint16_t *dst, int dstWidth, ...@@ -1886,7 +1884,7 @@ static av_always_inline void hyscale(SwsContext *c, uint16_t *dst, int dstWidth,
} }
if (!c->hyscale_fast) { if (!c->hyscale_fast) {
c->hScale(dst, dstWidth, src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize); c->hScale(dst, dstWidth, src, hLumFilter, hLumFilterPos, hLumFilterSize);
} else { // fast bilinear upscale / crap downscale } else { // fast bilinear upscale / crap downscale
c->hyscale_fast(c, dst, dstWidth, src, srcW, xInc); c->hyscale_fast(c, dst, dstWidth, src, srcW, xInc);
} }
...@@ -1924,8 +1922,8 @@ static av_always_inline void hcscale(SwsContext *c, uint16_t *dst1, uint16_t *ds ...@@ -1924,8 +1922,8 @@ static av_always_inline void hcscale(SwsContext *c, uint16_t *dst1, uint16_t *ds
} }
if (!c->hcscale_fast) { if (!c->hcscale_fast) {
c->hScale(dst1, dstWidth, src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize); c->hScale(dst1, dstWidth, src1, hChrFilter, hChrFilterPos, hChrFilterSize);
c->hScale(dst2, dstWidth, src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize); c->hScale(dst2, dstWidth, src2, hChrFilter, hChrFilterPos, hChrFilterSize);
} else { // fast bilinear upscale / crap downscale } else { // fast bilinear upscale / crap downscale
c->hcscale_fast(c, dst1, dst2, dstWidth, src1, src2, srcW, xInc); c->hcscale_fast(c, dst1, dst2, dstWidth, src1, src2, srcW, xInc);
} }
......
...@@ -306,8 +306,8 @@ typedef struct SwsContext { ...@@ -306,8 +306,8 @@ typedef struct SwsContext {
const uint8_t *src1, const uint8_t *src2, const uint8_t *src1, const uint8_t *src2,
int srcW, int xInc); int srcW, int xInc);
void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW, void (*hScale)(int16_t *dst, int dstW, const uint8_t *src,
int xInc, const int16_t *filter, const int16_t *filterPos, const int16_t *filter, const int16_t *filterPos,
int filterSize); int filterSize);
void (*lumConvertRange)(int16_t *dst, int width); ///< Color range conversion function for luma plane if needed. void (*lumConvertRange)(int16_t *dst, int width); ///< Color range conversion function for luma plane if needed.
......
...@@ -1906,8 +1906,7 @@ static void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, ...@@ -1906,8 +1906,7 @@ static void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV,
#if !COMPILE_TEMPLATE_MMX2 #if !COMPILE_TEMPLATE_MMX2
// bilinear / bicubic scaling // bilinear / bicubic scaling
static void RENAME(hScale)(int16_t *dst, int dstW, static void RENAME(hScale)(int16_t *dst, int dstW,
const uint8_t *src, int srcW, const uint8_t *src, const int16_t *filter,
int xInc, const int16_t *filter,
const int16_t *filterPos, int filterSize) const int16_t *filterPos, int filterSize)
{ {
assert(filterSize % 4 == 0 && filterSize>0); assert(filterSize % 4 == 0 && filterSize>0);
......
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