{
/* load a few things into local vars to make the code more readable?
* and faster */
+#ifndef NEW_FILTER
const int srcW = c->srcW;
+#endif
const int dstW = c->dstW;
const int dstH = c->dstH;
+#ifndef NEW_FILTER
const int chrDstW = c->chrDstW;
const int chrSrcW = c->chrSrcW;
const int lumXInc = c->lumXInc;
const int chrXInc = c->chrXInc;
+#endif
const enum AVPixelFormat dstFormat = c->dstFormat;
const int flags = c->flags;
int32_t *vLumFilterPos = c->vLumFilterPos;
int32_t *vChrFilterPos = c->vChrFilterPos;
+#ifndef NEW_FILTER
int32_t *hLumFilterPos = c->hLumFilterPos;
int32_t *hChrFilterPos = c->hChrFilterPos;
int16_t *hLumFilter = c->hLumFilter;
int16_t *hChrFilter = c->hChrFilter;
int32_t *lumMmxFilter = c->lumMmxFilter;
int32_t *chrMmxFilter = c->chrMmxFilter;
+#endif
const int vLumFilterSize = c->vLumFilterSize;
const int vChrFilterSize = c->vChrFilterSize;
+#ifndef NEW_FILTER
const int hLumFilterSize = c->hLumFilterSize;
const int hChrFilterSize = c->hChrFilterSize;
int16_t **lumPixBuf = c->lumPixBuf;
int16_t **chrUPixBuf = c->chrUPixBuf;
int16_t **chrVPixBuf = c->chrVPixBuf;
+#endif
int16_t **alpPixBuf = c->alpPixBuf;
const int vLumBufSize = c->vLumBufSize;
const int vChrBufSize = c->vChrBufSize;
+#ifndef NEW_FILTER
uint8_t *formatConvBuffer = c->formatConvBuffer;
uint32_t *pal = c->pal_yuv;
+#endif
yuv2planar1_fn yuv2plane1 = c->yuv2plane1;
yuv2planarX_fn yuv2planeX = c->yuv2planeX;
yuv2interleavedX_fn yuv2nv12cX = c->yuv2nv12cX;
int lastInChrBuf = c->lastInChrBuf;
int perform_gamma = c->is_internal_gamma;
- int numDesc = c->numDesc;
+#ifdef NEW_FILTER
int lumStart = 0;
int lumEnd = c->descIndex[0];
int chrStart = lumEnd;
int chrEnd = c->descIndex[1];
+ int vStart = chrEnd;
+ int vEnd = c->numDesc;
SwsSlice *src_slice = &c->slice[lumStart];
- SwsSlice *dst_slice = &c->slice[c->numSlice-1];
+ SwsSlice *hout_slice = &c->slice[c->numSlice-2];
+ SwsSlice *vout_slice = &c->slice[c->numSlice-1];
SwsFilterDescriptor *desc = c->desc;
+ int hasLumHoles = 1;
+ int hasChrHoles = 1;
+#endif
+#ifndef NEW_FILTER
if (!usePal(c->srcFormat)) {
pal = c->input_rgb2yuv_table;
}
+#endif
if (isPacked(c->srcFormat)) {
src[0] =
}
lastDstY = dstY;
-#define NEW_FILTER 1
+#ifdef NEW_FILTER
+ ff_init_vscale_pfn(c, yuv2plane1, yuv2planeX, yuv2nv12cX,
+ yuv2packed1, yuv2packed2, yuv2packedX, yuv2anyX, c->use_mmx_vfilter);
ff_init_slice_from_src(src_slice, (uint8_t**)src, srcStride, c->srcW,
- srcSliceY, srcSliceH,
- chrSrcSliceY, chrSrcSliceH);
-
- dst_slice->plane[0].sliceY = lastInLumBuf + 1;
- dst_slice->plane[1].sliceY = lastInChrBuf + 1;
- dst_slice->plane[2].sliceY = lastInChrBuf + 1;
- dst_slice->plane[3].sliceY = lastInLumBuf + 1;
-
- dst_slice->plane[0].sliceH =
- dst_slice->plane[1].sliceH =
- dst_slice->plane[2].sliceH =
- dst_slice->plane[3].sliceH = 0;
- dst_slice->width = dstW;
+ srcSliceY, srcSliceH, chrSrcSliceY, chrSrcSliceH);
+
+ ff_init_slice_from_src(vout_slice, (uint8_t**)dst, dstStride, c->dstW,
+ dstY, dstH, dstY >> c->chrDstVSubSample,
+ FF_CEIL_RSHIFT(dstH, c->chrDstVSubSample));
+
+ hout_slice->plane[0].sliceY = lastInLumBuf + 1;
+ hout_slice->plane[1].sliceY = lastInChrBuf + 1;
+ hout_slice->plane[2].sliceY = lastInChrBuf + 1;
+ hout_slice->plane[3].sliceY = lastInLumBuf + 1;
+
+ hout_slice->plane[0].sliceH =
+ hout_slice->plane[1].sliceH =
+ hout_slice->plane[2].sliceH =
+ hout_slice->plane[3].sliceH = 0;
+ hout_slice->width = dstW;
+#endif
for (; dstY < dstH; dstY++) {
const int chrDstY = dstY >> c->chrDstVSubSample;
+#ifndef NEW_FILTER
uint8_t *dest[4] = {
dst[0] + dstStride[0] * dstY,
dst[1] + dstStride[1] * chrDstY,
dst[2] + dstStride[2] * chrDstY,
(CONFIG_SWSCALE_ALPHA && alpPixBuf) ? dst[3] + dstStride[3] * dstY : NULL,
};
+#endif
int use_mmx_vfilter= c->use_mmx_vfilter;
// First line needed as input
int lastLumSrcY2 = FFMIN(c->srcH, firstLumSrcY2 + vLumFilterSize) - 1;
int lastChrSrcY = FFMIN(c->chrSrcH, firstChrSrcY + vChrFilterSize) - 1;
int enough_lines;
+#ifdef NEW_FILTER
int i;
+ int posY, cPosY, firstPosY, lastPosY, firstCPosY, lastCPosY;
+#endif
// handle holes (FAST_BILINEAR & weird filters)
if (firstLumSrcY > lastInLumBuf) {
+#ifdef NEW_FILTER
+ hasLumHoles = lastInLumBuf != firstLumSrcY - 1;
+ if (hasLumHoles) {
+ hout_slice->plane[0].sliceY = lastInLumBuf + 1;
+ hout_slice->plane[3].sliceY = lastInLumBuf + 1;
+ hout_slice->plane[0].sliceH =
+ hout_slice->plane[3].sliceH = 0;
+ }
+#endif
lastInLumBuf = firstLumSrcY - 1;
- dst_slice->plane[0].sliceY = lastInLumBuf + 1;
- dst_slice->plane[3].sliceY = lastInLumBuf + 1;
- dst_slice->plane[0].sliceH =
- dst_slice->plane[3].sliceH = 0;
}
if (firstChrSrcY > lastInChrBuf) {
+#ifdef NEW_FILTER
+ hasChrHoles = lastInChrBuf != firstChrSrcY - 1;
+ if (hasChrHoles) {
+ hout_slice->plane[1].sliceY = lastInChrBuf + 1;
+ hout_slice->plane[2].sliceY = lastInChrBuf + 1;
+ hout_slice->plane[1].sliceH =
+ hout_slice->plane[2].sliceH = 0;
+ }
+#endif
lastInChrBuf = firstChrSrcY - 1;
- dst_slice->plane[1].sliceY = lastInChrBuf + 1;
- dst_slice->plane[2].sliceY = lastInChrBuf + 1;
- dst_slice->plane[1].sliceH =
- dst_slice->plane[2].sliceH = 0;
}
av_assert0(firstLumSrcY >= lastInLumBuf - vLumBufSize + 1);
av_assert0(firstChrSrcY >= lastInChrBuf - vChrBufSize + 1);
lastLumSrcY, lastChrSrcY);
}
-#if NEW_FILTER
- ff_rotate_slice(dst_slice, lastLumSrcY, lastChrSrcY);
+#ifdef NEW_FILTER
+ posY = hout_slice->plane[0].sliceY + hout_slice->plane[0].sliceH;
+ if (posY <= lastLumSrcY && !hasLumHoles) {
+ firstPosY = FFMAX(firstLumSrcY, posY);
+ lastPosY = FFMIN(lastLumSrcY + MAX_LINES_AHEAD, srcSliceY + srcSliceH - 1);
+ } else {
+ firstPosY = lastInLumBuf + 1;
+ lastPosY = lastLumSrcY;
+ }
+
+ cPosY = hout_slice->plane[1].sliceY + hout_slice->plane[1].sliceH;
+ if (cPosY <= lastChrSrcY && !hasChrHoles) {
+ firstCPosY = FFMAX(firstChrSrcY, cPosY);
+ lastCPosY = FFMIN(lastChrSrcY + MAX_LINES_AHEAD, FF_CEIL_RSHIFT(srcSliceY + srcSliceH, c->chrSrcVSubSample) - 1);
+ } else {
+ firstCPosY = lastInChrBuf + 1;
+ lastCPosY = lastChrSrcY;
+ }
- if (lastInLumBuf < lastLumSrcY)
+ ff_rotate_slice(hout_slice, lastPosY, lastCPosY);
+
+ if (posY < lastLumSrcY + 1) {
for (i = lumStart; i < lumEnd; ++i)
- desc[i].process(c, &desc[i], lastInLumBuf + 1, lastLumSrcY - lastInLumBuf);
+ desc[i].process(c, &desc[i], firstPosY, lastPosY - firstPosY + 1);
+ }
+
lumBufIndex += lastLumSrcY - lastInLumBuf;
lastInLumBuf = lastLumSrcY;
- if (lastInChrBuf < lastChrSrcY)
+ if (cPosY < lastChrSrcY + 1) {
for (i = chrStart; i < chrEnd; ++i)
- desc[i].process(c, &desc[i], lastInChrBuf + 1, lastChrSrcY - lastInChrBuf);
+ desc[i].process(c, &desc[i], firstCPosY, lastCPosY - firstCPosY + 1);
+ }
+
chrBufIndex += lastChrSrcY - lastInChrBuf;
lastInChrBuf = lastChrSrcY;
av_assert0(lastInLumBuf + 1 - srcSliceY < srcSliceH);
av_assert0(lastInLumBuf + 1 - srcSliceY >= 0);
- //if (perform_gamma)
- // gamma_convert((uint8_t **)src1, srcW, c->inv_gamma);
+ if (perform_gamma)
+ gamma_convert((uint8_t **)src1, srcW, c->inv_gamma);
hyscale(c, lumPixBuf[lumBufIndex], dstW, src1, srcW, lumXInc,
hLumFilter, hLumFilterPos, hLumFilterSize,
ff_sws_init_output_funcs(c, &yuv2plane1, &yuv2planeX, &yuv2nv12cX,
&yuv2packed1, &yuv2packed2, &yuv2packedX, &yuv2anyX);
use_mmx_vfilter= 0;
+ ff_init_vscale_pfn(c, yuv2plane1, yuv2planeX, yuv2nv12cX,
+ yuv2packed1, yuv2packed2, yuv2packedX, yuv2anyX, use_mmx_vfilter);
}
{
-#if NEW_FILTER
- const int16_t **lumSrcPtr = (const int16_t **)(void*) dst_slice->plane[0].line + firstLumSrcY - dst_slice->plane[0].sliceY;
- const int16_t **chrUSrcPtr = (const int16_t **)(void*) dst_slice->plane[1].line + firstChrSrcY - dst_slice->plane[1].sliceY;
- const int16_t **chrVSrcPtr = (const int16_t **)(void*) dst_slice->plane[2].line + firstChrSrcY - dst_slice->plane[2].sliceY;
- const int16_t **alpSrcPtr = (CONFIG_SWSCALE_ALPHA && alpPixBuf) ?
- (const int16_t **)(void*) dst_slice->plane[3].line + firstLumSrcY - dst_slice->plane[3].sliceY : NULL;
+#ifdef NEW_FILTER
+ for (i = vStart; i < vEnd; ++i)
+ desc[i].process(c, &desc[i], dstY, 1);
#else
const int16_t **lumSrcPtr = (const int16_t **)(void*) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
const int16_t **chrUSrcPtr = (const int16_t **)(void*) chrUPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
const int16_t **chrVSrcPtr = (const int16_t **)(void*) chrVPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
const int16_t **alpSrcPtr = (CONFIG_SWSCALE_ALPHA && alpPixBuf) ?
(const int16_t **)(void*) alpPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize : NULL;
-#endif
int16_t *vLumFilter = c->vLumFilter;
int16_t *vChrFilter = c->vChrFilter;
}
}
} else if (yuv2packedX) {
-#if !NEW_FILTER
av_assert1(lumSrcPtr + vLumFilterSize - 1 < (const int16_t **)lumPixBuf + vLumBufSize * 2);
av_assert1(chrUSrcPtr + vChrFilterSize - 1 < (const int16_t **)chrUPixBuf + vChrBufSize * 2);
-#endif
if (c->yuv2packed1 && vLumFilterSize == 1 &&
vChrFilterSize <= 2) { // unscaled RGB
int chrAlpha = vChrFilterSize == 1 ? 0 : vChrFilter[2 * dstY + 1];
chrUSrcPtr, chrVSrcPtr, vChrFilterSize,
alpSrcPtr, dest, dstW, dstY);
}
- //if (perform_gamma)
- // gamma_convert(dest, dstW, c->gamma);
+ if (perform_gamma)
+ gamma_convert(dest, dstW, c->gamma);
+#endif
}
}
if (isPlanar(dstFormat) && isALPHA(dstFormat) && !alpPixBuf) {
projects / ffmpeg / blobdiff