From 342009a438caf531ba6d5ecd67ececf04910f8c4 Mon Sep 17 00:00:00 2001 From: ramiro Date: Mon, 21 Dec 2009 01:34:45 +0000 Subject: Check if chroma horizontal scaler is needed in sws_init_swScale(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30096 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale_internal.h | 2 ++ libswscale/swscale_template.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index f60ffb0a11..eb73fa6dae 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -279,6 +279,8 @@ typedef struct SwsContext { int chrSrcOffset; ///< Offset given to chroma src pointers passed to horizontal input functions. int alpSrcOffset; ///< Offset given to alpha src pointers passed to horizontal input functions. + int needs_hcscale; ///< Set if there are chroma planes to be converted. + } SwsContext; //FIXME check init (where 0) diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 9208a07498..3c6c8ebe8d 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2438,9 +2438,6 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth, int av_unused canMMX2BeUsed = c->canMMX2BeUsed; void av_unused *mmx2FilterCode= c->chrMmx2FilterCode; - if (isGray(srcFormat) || srcFormat==PIX_FMT_MONOBLACK || srcFormat==PIX_FMT_MONOWHITE) - return; - src1 += c->chrSrcOffset; src2 += c->chrSrcOffset; @@ -2717,7 +2714,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s assert(lastInChrBuf + 1 - chrSrcSliceY >= 0); //FIXME replace parameters through context struct (some at least) - if (!(isGray(srcFormat) || isGray(dstFormat))) + if (c->needs_hcscale) RENAME(hcscale)(c, chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc, flags, hChrFilter, hChrFilterPos, hChrFilterSize, c->srcFormat, formatConvBuffer, @@ -3067,4 +3064,8 @@ static void RENAME(sws_init_swScale)(SwsContext *c) c->chrConvertRange = RENAME(chrRangeToJpeg); } } + + if (!(isGray(srcFormat) || isGray(c->dstFormat) || + srcFormat == PIX_FMT_MONOBLACK || srcFormat == PIX_FMT_MONOWHITE)) + c->needs_hcscale = 1; } -- cgit v1.2.3