March 2016 - ffmpeg-cvslog - lists.ffmpeg.org

swscale: cleanup unused code
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Pedro Arthur <bygrandao(a)gmail.com> | Mon Mar 28 13:25:18 2016 -0300| [6de58b49032a206985602effec91e5e46c886ea2] | committer: Pedro Arthur swscale: cleanup unused code Removed previous swscale code under '#ifndef NEW_FILTER' and removed unused fields of SwsContext > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6de58b49032a20698… --- libswscale/input.c | 2 +- libswscale/output.c | 40 ++--- libswscale/ppc/swscale_altivec.c | 4 +- libswscale/slice.c | 4 +- libswscale/swscale.c | 336 +++---------------------------------- libswscale/swscale_internal.h | 10 +- libswscale/utils.c | 78 +-------- libswscale/vscale.c | 4 +- libswscale/x86/swscale.c | 38 +---- libswscale/x86/swscale_template.c | 12 +- 10 files changed, 65 insertions(+), 463 deletions(-) diff --git a/libswscale/input.c b/libswscale/input.c index 16314b6..eed0f49 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1482,7 +1482,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) c->lumToYV12 = p010BEToY_c; break; } - if (c->alpPixBuf) { + if (c->needAlpha) { if (is16BPS(srcFormat) || isNBPS(srcFormat)) { if (HAVE_BIGENDIAN == !isBE(srcFormat)) c->alpToYV12 = bswap16Y_c; diff --git a/libswscale/output.c b/libswscale/output.c index 0c763c3..e9bbb3d 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -1513,8 +1513,8 @@ static void name ## ext ## _1_c(SwsContext *c, const int16_t *buf0, \ } #if CONFIG_SMALL -YUV2RGBWRAPPER(yuv2rgb,, 32_1, AV_PIX_FMT_RGB32_1, CONFIG_SWSCALE_ALPHA && c->alpPixBuf) -YUV2RGBWRAPPER(yuv2rgb,, 32, AV_PIX_FMT_RGB32, CONFIG_SWSCALE_ALPHA && c->alpPixBuf) +YUV2RGBWRAPPER(yuv2rgb,, 32_1, AV_PIX_FMT_RGB32_1, CONFIG_SWSCALE_ALPHA && c->needAlpha) +YUV2RGBWRAPPER(yuv2rgb,, 32, AV_PIX_FMT_RGB32, CONFIG_SWSCALE_ALPHA && c->needAlpha) #else #if CONFIG_SWSCALE_ALPHA YUV2RGBWRAPPER(yuv2rgb,, a32_1, AV_PIX_FMT_RGB32_1, 1) @@ -1823,10 +1823,10 @@ yuv2rgb_full_1_c_template(SwsContext *c, const int16_t *buf0, } #if CONFIG_SMALL -YUV2RGBWRAPPER(yuv2, rgb_full, bgra32_full, AV_PIX_FMT_BGRA, CONFIG_SWSCALE_ALPHA && c->alpPixBuf) -YUV2RGBWRAPPER(yuv2, rgb_full, abgr32_full, AV_PIX_FMT_ABGR, CONFIG_SWSCALE_ALPHA && c->alpPixBuf) -YUV2RGBWRAPPER(yuv2, rgb_full, rgba32_full, AV_PIX_FMT_RGBA, CONFIG_SWSCALE_ALPHA && c->alpPixBuf) -YUV2RGBWRAPPER(yuv2, rgb_full, argb32_full, AV_PIX_FMT_ARGB, CONFIG_SWSCALE_ALPHA && c->alpPixBuf) +YUV2RGBWRAPPER(yuv2, rgb_full, bgra32_full, AV_PIX_FMT_BGRA, CONFIG_SWSCALE_ALPHA && c->needAlpha) +YUV2RGBWRAPPER(yuv2, rgb_full, abgr32_full, AV_PIX_FMT_ABGR, CONFIG_SWSCALE_ALPHA && c->needAlpha) +YUV2RGBWRAPPER(yuv2, rgb_full, rgba32_full, AV_PIX_FMT_RGBA, CONFIG_SWSCALE_ALPHA && c->needAlpha) +YUV2RGBWRAPPER(yuv2, rgb_full, argb32_full, AV_PIX_FMT_ARGB, CONFIG_SWSCALE_ALPHA && c->needAlpha) #else #if CONFIG_SWSCALE_ALPHA YUV2RGBWRAPPER(yuv2, rgb_full, bgra32_full, AV_PIX_FMT_BGRA, 1) @@ -2119,7 +2119,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2packed1 = yuv2rgba32_full_1_c; #else #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packedX = yuv2rgba32_full_X_c; *yuv2packed2 = yuv2rgba32_full_2_c; *yuv2packed1 = yuv2rgba32_full_1_c; @@ -2139,7 +2139,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2packed1 = yuv2argb32_full_1_c; #else #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packedX = yuv2argb32_full_X_c; *yuv2packed2 = yuv2argb32_full_2_c; *yuv2packed1 = yuv2argb32_full_1_c; @@ -2159,7 +2159,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2packed1 = yuv2bgra32_full_1_c; #else #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packedX = yuv2bgra32_full_X_c; *yuv2packed2 = yuv2bgra32_full_2_c; *yuv2packed1 = yuv2bgra32_full_1_c; @@ -2179,7 +2179,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2packed1 = yuv2abgr32_full_1_c; #else #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packedX = yuv2abgr32_full_X_c; *yuv2packed2 = yuv2abgr32_full_2_c; *yuv2packed1 = yuv2abgr32_full_1_c; @@ -2194,7 +2194,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, break; case AV_PIX_FMT_RGBA64LE: #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packedX = yuv2rgba64le_full_X_c; *yuv2packed2 = yuv2rgba64le_full_2_c; *yuv2packed1 = yuv2rgba64le_full_1_c; @@ -2208,7 +2208,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, break; case AV_PIX_FMT_RGBA64BE: #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packedX = yuv2rgba64be_full_X_c; *yuv2packed2 = yuv2rgba64be_full_2_c; *yuv2packed1 = yuv2rgba64be_full_1_c; @@ -2222,7 +2222,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, break; case AV_PIX_FMT_BGRA64LE: #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packedX = yuv2bgra64le_full_X_c; *yuv2packed2 = yuv2bgra64le_full_2_c; *yuv2packed1 = yuv2bgra64le_full_1_c; @@ -2236,7 +2236,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, break; case AV_PIX_FMT_BGRA64BE: #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packedX = yuv2bgra64be_full_X_c; *yuv2packed2 = yuv2bgra64be_full_2_c; *yuv2packed1 = yuv2bgra64be_full_1_c; @@ -2321,7 +2321,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, switch (dstFormat) { case AV_PIX_FMT_RGBA64LE: #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packed1 = yuv2rgba64le_1_c; *yuv2packed2 = yuv2rgba64le_2_c; *yuv2packedX = yuv2rgba64le_X_c; @@ -2335,7 +2335,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, break; case AV_PIX_FMT_RGBA64BE: #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packed1 = yuv2rgba64be_1_c; *yuv2packed2 = yuv2rgba64be_2_c; *yuv2packedX = yuv2rgba64be_X_c; @@ -2349,7 +2349,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, break; case AV_PIX_FMT_BGRA64LE: #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packed1 = yuv2bgra64le_1_c; *yuv2packed2 = yuv2bgra64le_2_c; *yuv2packedX = yuv2bgra64le_X_c; @@ -2363,7 +2363,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, break; case AV_PIX_FMT_BGRA64BE: #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packed1 = yuv2bgra64be_1_c; *yuv2packed2 = yuv2bgra64be_2_c; *yuv2packedX = yuv2bgra64be_X_c; @@ -2403,7 +2403,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2packedX = yuv2rgb32_X_c; #else #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packed1 = yuv2rgba32_1_c; *yuv2packed2 = yuv2rgba32_2_c; *yuv2packedX = yuv2rgba32_X_c; @@ -2424,7 +2424,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2packedX = yuv2rgb32_1_X_c; #else #if CONFIG_SWSCALE_ALPHA - if (c->alpPixBuf) { + if (c->needAlpha) { *yuv2packed1 = yuv2rgba32_1_1_c; *yuv2packed2 = yuv2rgba32_1_2_c; *yuv2packedX = yuv2rgba32_1_X_c; diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c index af9fc88..35a08c4 100644 --- a/libswscale/ppc/swscale_altivec.c +++ b/libswscale/ppc/swscale_altivec.c @@ -339,13 +339,13 @@ av_cold void ff_sws_init_swscale_ppc(SwsContext *c) } if (!is16BPS(dstFormat) && !is9_OR_10BPS(dstFormat) && dstFormat != AV_PIX_FMT_NV12 && dstFormat != AV_PIX_FMT_NV21 && - !c->alpPixBuf) { + !c->needAlpha) { c->yuv2planeX = yuv2planeX_altivec; } /* The following list of supported dstFormat values should * match what's found in the body of ff_yuv2packedX_altivec() */ - if (!(c->flags & (SWS_BITEXACT | SWS_FULL_CHR_H_INT)) && !c->alpPixBuf) { + if (!(c->flags & (SWS_BITEXACT | SWS_FULL_CHR_H_INT)) && !c->needAlpha) { switch (c->dstFormat) { case AV_PIX_FMT_ABGR: c->yuv2packedX = ff_yuv2abgr_X_altivec; diff --git a/libswscale/slice.c b/libswscale/slice.c index a701487..0159a73 100644 --- a/libswscale/slice.c +++ b/libswscale/slice.c @@ -279,7 +279,7 @@ int ff_init_filters(SwsContext * c) if (need_lum_conv) { res = ff_init_desc_fmt_convert(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], pal); if (res < 0) goto cleanup; - c->desc[index].alpha = c->alpPixBuf != 0; + c->desc[index].alpha = c->needAlpha; ++index; srcIdx = dstIdx; } @@ -288,7 +288,7 @@ int ff_init_filters(SwsContext * c) dstIdx = FFMAX(num_ydesc, num_cdesc); res = ff_init_desc_hscale(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], c->hLumFilter, c->hLumFilterPos, c->hLumFilterSize, c->lumXInc); if (res < 0) goto cleanup; - c->desc[index].alpha = c->alpPixBuf != 0; + c->desc[index].alpha = c->needAlpha; ++index; diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 2de5ad4..76b0317 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -52,24 +52,6 @@ DECLARE_ALIGNED(8, static const uint8_t, sws_pb_64)[8] = { 64, 64, 64, 64, 64, 64, 64, 64 }; -#ifndef NEW_FILTER -static void gamma_convert(uint8_t * src[], int width, uint16_t *gamma) -{ - int i; - uint16_t *src1 = (uint16_t*)src[0]; - - for (i = 0; i < width; ++i) { - uint16_t r = AV_RL16(src1 + i*4 + 0); - uint16_t g = AV_RL16(src1 + i*4 + 1); - uint16_t b = AV_RL16(src1 + i*4 + 2); - - AV_WL16(src1 + i*4 + 0, gamma[r]); - AV_WL16(src1 + i*4 + 1, gamma[g]); - AV_WL16(src1 + i*4 + 2, gamma[b]); - } -} -#endif - static av_always_inline void fillPlane(uint8_t *plane, int stride, int width, int height, int y, uint8_t val) { @@ -240,79 +222,6 @@ static void lumRangeFromJpeg16_c(int16_t *_dst, int width) dst[i] = (dst[i]*(14071/4) + (33561947<<4)/4)>>12; } -#ifndef NEW_FILTER -// *** horizontal scale Y line to temp buffer -static av_always_inline void hyscale(SwsContext *c, int16_t *dst, int dstWidth, - const uint8_t *src_in[4], - int srcW, int xInc, - const int16_t *hLumFilter, - const int32_t *hLumFilterPos, - int hLumFilterSize, - uint8_t *formatConvBuffer, - uint32_t *pal, int isAlpha) -{ - void (*toYV12)(uint8_t *, const uint8_t *, const uint8_t *, const uint8_t *, int, uint32_t *) = - isAlpha ? c->alpToYV12 : c->lumToYV12; - void (*convertRange)(int16_t *, int) = isAlpha ? NULL : c->lumConvertRange; - const uint8_t *src = src_in[isAlpha ? 3 : 0]; - - if (toYV12) { - toYV12(formatConvBuffer, src, src_in[1], src_in[2], srcW, pal); - src = formatConvBuffer; - } else if (c->readLumPlanar && !isAlpha) { - c->readLumPlanar(formatConvBuffer, src_in, srcW, c->input_rgb2yuv_table); - src = formatConvBuffer; - } else if (c->readAlpPlanar && isAlpha) { - c->readAlpPlanar(formatConvBuffer, src_in, srcW, NULL); - src = formatConvBuffer; - } - - if (!c->hyscale_fast) { - c->hyScale(c, dst, dstWidth, src, hLumFilter, - hLumFilterPos, hLumFilterSize); - } else { // fast bilinear upscale / crap downscale - c->hyscale_fast(c, dst, dstWidth, src, srcW, xInc); - } - - if (convertRange) - convertRange(dst, dstWidth); -} - -static av_always_inline void hcscale(SwsContext *c, int16_t *dst1, - int16_t *dst2, int dstWidth, - const uint8_t *src_in[4], - int srcW, int xInc, - const int16_t *hChrFilter, - const int32_t *hChrFilterPos, - int hChrFilterSize, - uint8_t *formatConvBuffer, uint32_t *pal) -{ - const uint8_t *src1 = src_in[1], *src2 = src_in[2]; - if (c->chrToYV12) { - uint8_t *buf2 = formatConvBuffer + - FFALIGN(srcW*2+78, 16); - c->chrToYV12(formatConvBuffer, buf2, src_in[0], src1, src2, srcW, pal); - src1= formatConvBuffer; - src2= buf2; - } else if (c->readChrPlanar) { - uint8_t *buf2 = formatConvBuffer + - FFALIGN(srcW*2+78, 16); - c->readChrPlanar(formatConvBuffer, buf2, src_in, srcW, c->input_rgb2yuv_table); - src1 = formatConvBuffer; - src2 = buf2; - } - - if (!c->hcscale_fast) { - c->hcScale(c, dst1, dstWidth, src1, hChrFilter, hChrFilterPos, hChrFilterSize); - c->hcScale(c, dst2, dstWidth, src2, hChrFilter, hChrFilterPos, hChrFilterSize); - } else { // fast bilinear upscale / crap downscale - c->hcscale_fast(c, dst1, dst2, dstWidth, src1, src2, srcW, xInc); - } - - if (c->chrConvertRange) - c->chrConvertRange(dst1, dst2, dstWidth); -} -#endif /* NEW_FILTER */ #define DEBUG_SWSCALE_BUFFERS 0 #define DEBUG_BUFFERS(...) \ @@ -325,46 +234,17 @@ static int swscale(SwsContext *c, const uint8_t *src[], { /* 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; - int perform_gamma = c->is_internal_gamma; -#endif + yuv2planar1_fn yuv2plane1 = c->yuv2plane1; yuv2planarX_fn yuv2planeX = c->yuv2planeX; yuv2interleavedX_fn yuv2nv12cX = c->yuv2nv12cX; @@ -385,7 +265,7 @@ static int swscale(SwsContext *c, const uint8_t *src[], int lastInLumBuf = c->lastInLumBuf; int lastInChrBuf = c->lastInChrBuf; -#ifdef NEW_FILTER + int lumStart = 0; int lumEnd = c->descIndex[0]; int chrStart = lumEnd; @@ -397,15 +277,12 @@ static int swscale(SwsContext *c, const uint8_t *src[], SwsSlice *vout_slice = &c->slice[c->numSlice-1]; SwsFilterDescriptor *desc = c->desc; + + int needAlpha = c->needAlpha; + 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] = @@ -427,8 +304,8 @@ static int swscale(SwsContext *c, const uint8_t *src[], dst[2], dstStride[2], dst[3], dstStride[3]); DEBUG_BUFFERS("srcSliceY: %d srcSliceH: %d dstY: %d dstH: %d\n", srcSliceY, srcSliceH, dstY, dstH); - DEBUG_BUFFERS("vLumFilterSize: %d vLumBufSize: %d vChrFilterSize: %d vChrBufSize: %d\n", - vLumFilterSize, vLumBufSize, vChrFilterSize, vChrBufSize); + DEBUG_BUFFERS("vLumFilterSize: %d vChrFilterSize: %d\n", + vLumFilterSize, vChrFilterSize); if (dstStride[0]&15 || dstStride[1]&15 || dstStride[2]&15 || dstStride[3]&15) { @@ -470,7 +347,6 @@ static int swscale(SwsContext *c, const uint8_t *src[], } lastDstY = dstY; -#ifdef NEW_FILTER ff_init_vscale_pfn(c, yuv2plane1, yuv2planeX, yuv2nv12cX, yuv2packed1, yuv2packed2, yuv2packedX, yuv2anyX, c->use_mmx_vfilter); @@ -492,18 +368,9 @@ static int swscale(SwsContext *c, const uint8_t *src[], 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 @@ -517,14 +384,13 @@ static int swscale(SwsContext *c, const uint8_t *src[], 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 = firstLumSrcY; @@ -532,11 +398,11 @@ static int swscale(SwsContext *c, const uint8_t *src[], hout_slice->plane[0].sliceH = hout_slice->plane[3].sliceH = 0; } -#endif + lastInLumBuf = firstLumSrcY - 1; } if (firstChrSrcY > lastInChrBuf) { -#ifdef NEW_FILTER + hasChrHoles = lastInChrBuf != firstChrSrcY - 1; if (hasChrHoles) { hout_slice->plane[1].sliceY = firstChrSrcY; @@ -544,11 +410,11 @@ static int swscale(SwsContext *c, const uint8_t *src[], hout_slice->plane[1].sliceH = hout_slice->plane[2].sliceH = 0; } -#endif + lastInChrBuf = firstChrSrcY - 1; } - av_assert0(firstLumSrcY >= lastInLumBuf - vLumBufSize + 1); - av_assert0(firstChrSrcY >= lastInChrBuf - vChrBufSize + 1); + av_assert0(firstLumSrcY >= lastInLumBuf - vLumFilterSize + 1); + av_assert0(firstChrSrcY >= lastInChrBuf - vChrFilterSize + 1); DEBUG_BUFFERS("dstY: %d\n", dstY); DEBUG_BUFFERS("\tfirstLumSrcY: %d lastLumSrcY: %d lastInLumBuf: %d\n", @@ -567,7 +433,6 @@ static int swscale(SwsContext *c, const uint8_t *src[], lastLumSrcY, lastChrSrcY); } -#ifdef NEW_FILTER posY = hout_slice->plane[0].sliceY + hout_slice->plane[0].sliceH; if (posY <= lastLumSrcY && !hasLumHoles) { firstPosY = FFMAX(firstLumSrcY, posY); @@ -604,62 +469,11 @@ static int swscale(SwsContext *c, const uint8_t *src[], chrBufIndex += lastChrSrcY - lastInChrBuf; lastInChrBuf = lastChrSrcY; -#else - // Do horizontal scaling - while (lastInLumBuf < lastLumSrcY) { - const uint8_t *src1[4] = { - src[0] + (lastInLumBuf + 1 - srcSliceY) * srcStride[0], - src[1] + (lastInLumBuf + 1 - srcSliceY) * srcStride[1], - src[2] + (lastInLumBuf + 1 - srcSliceY) * srcStride[2], - src[3] + (lastInLumBuf + 1 - srcSliceY) * srcStride[3], - }; - lumBufIndex++; - av_assert0(lumBufIndex < 2 * vLumBufSize); - av_assert0(lastInLumBuf + 1 - srcSliceY < srcSliceH); - av_assert0(lastInLumBuf + 1 - srcSliceY >= 0); - - if (perform_gamma) - gamma_convert((uint8_t **)src1, srcW, c->inv_gamma); - - hyscale(c, lumPixBuf[lumBufIndex], dstW, src1, srcW, lumXInc, - hLumFilter, hLumFilterPos, hLumFilterSize, - formatConvBuffer, pal, 0); - if (CONFIG_SWSCALE_ALPHA && alpPixBuf) - hyscale(c, alpPixBuf[lumBufIndex], dstW, src1, srcW, - lumXInc, hLumFilter, hLumFilterPos, hLumFilterSize, - formatConvBuffer, pal, 1); - lastInLumBuf++; - DEBUG_BUFFERS("\t\tlumBufIndex %d: lastInLumBuf: %d\n", - lumBufIndex, lastInLumBuf); - } - while (lastInChrBuf < lastChrSrcY) { - const uint8_t *src1[4] = { - src[0] + (lastInChrBuf + 1 - chrSrcSliceY) * srcStride[0], - src[1] + (lastInChrBuf + 1 - chrSrcSliceY) * srcStride[1], - src[2] + (lastInChrBuf + 1 - chrSrcSliceY) * srcStride[2], - src[3] + (lastInChrBuf + 1 - chrSrcSliceY) * srcStride[3], - }; - chrBufIndex++; - av_assert0(chrBufIndex < 2 * vChrBufSize); - av_assert0(lastInChrBuf + 1 - chrSrcSliceY < (chrSrcSliceH)); - av_assert0(lastInChrBuf + 1 - chrSrcSliceY >= 0); - // FIXME replace parameters through context struct (some at least) - - if (c->needs_hcscale) - hcscale(c, chrUPixBuf[chrBufIndex], chrVPixBuf[chrBufIndex], - chrDstW, src1, chrSrcW, chrXInc, - hChrFilter, hChrFilterPos, hChrFilterSize, - formatConvBuffer, pal); - lastInChrBuf++; - DEBUG_BUFFERS("\t\tchrBufIndex %d: lastInChrBuf: %d\n", - chrBufIndex, lastInChrBuf); - } -#endif // wrap buf index around to stay inside the ring buffer - if (lumBufIndex >= vLumBufSize) - lumBufIndex -= vLumBufSize; - if (chrBufIndex >= vChrBufSize) - chrBufIndex -= vChrBufSize; + if (lumBufIndex >= vLumFilterSize) + lumBufIndex -= vLumFilterSize; + if (chrBufIndex >= vChrFilterSize) + chrBufIndex -= vChrFilterSize; if (!enough_lines) break; // we can't output a dstY line so let's try with the next slice @@ -682,119 +496,11 @@ static int swscale(SwsContext *c, const uint8_t *src[], } { -#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; - int16_t *vLumFilter = c->vLumFilter; - int16_t *vChrFilter = c->vChrFilter; - - if (isPlanarYUV(dstFormat) || - (isGray(dstFormat) && !isALPHA(dstFormat))) { // YV12 like - const int chrSkipMask = (1 << c->chrDstVSubSample) - 1; - - vLumFilter += dstY * vLumFilterSize; - vChrFilter += chrDstY * vChrFilterSize; - -// av_assert0(use_mmx_vfilter != ( -// yuv2planeX == yuv2planeX_10BE_c -// || yuv2planeX == yuv2planeX_10LE_c -// || yuv2planeX == yuv2planeX_9BE_c -// || yuv2planeX == yuv2planeX_9LE_c -// || yuv2planeX == yuv2planeX_16BE_c -// || yuv2planeX == yuv2planeX_16LE_c -// || yuv2planeX == yuv2planeX_8_c) || !ARCH_X86); - - if(use_mmx_vfilter){ - vLumFilter= (int16_t *)c->lumMmxFilter; - vChrFilter= (int16_t *)c->chrMmxFilter; - } - - if (vLumFilterSize == 1) { - yuv2plane1(lumSrcPtr[0], dest[0], dstW, c->lumDither8, 0); - } else { - yuv2planeX(vLumFilter, vLumFilterSize, - lumSrcPtr, dest[0], - dstW, c->lumDither8, 0); - } - - if (!((dstY & chrSkipMask) || isGray(dstFormat))) { - if (yuv2nv12cX) { - yuv2nv12cX(c, vChrFilter, - vChrFilterSize, chrUSrcPtr, chrVSrcPtr, - dest[1], chrDstW); - } else if (vChrFilterSize == 1) { - yuv2plane1(chrUSrcPtr[0], dest[1], chrDstW, c->chrDither8, 0); - yuv2plane1(chrVSrcPtr[0], dest[2], chrDstW, c->chrDither8, 3); - } else { - yuv2planeX(vChrFilter, - vChrFilterSize, chrUSrcPtr, dest[1], - chrDstW, c->chrDither8, 0); - yuv2planeX(vChrFilter, - vChrFilterSize, chrVSrcPtr, dest[2], - chrDstW, c->chrDither8, use_mmx_vfilter ? (c->uv_offx2 >> 1) : 3); - } - } - - if (CONFIG_SWSCALE_ALPHA && alpPixBuf) { - if(use_mmx_vfilter){ - vLumFilter= (int16_t *)c->alpMmxFilter; - } - if (vLumFilterSize == 1) { - yuv2plane1(alpSrcPtr[0], dest[3], dstW, - c->lumDither8, 0); - } else { - yuv2planeX(vLumFilter, - vLumFilterSize, alpSrcPtr, dest[3], - dstW, c->lumDither8, 0); - } - } - } else if (yuv2packedX) { - av_assert1(lumSrcPtr + vLumFilterSize - 1 < (const int16_t **)lumPixBuf + vLumBufSize * 2); - av_assert1(chrUSrcPtr + vChrFilterSize - 1 < (const int16_t **)chrUPixBuf + vChrBufSize * 2); - if (c->yuv2packed1 && vLumFilterSize == 1 && - vChrFilterSize <= 2) { // unscaled RGB - int chrAlpha = vChrFilterSize == 1 ? 0 : vChrFilter[2 * dstY + 1]; - yuv2packed1(c, *lumSrcPtr, chrUSrcPtr, chrVSrcPtr, - alpPixBuf ? *alpSrcPtr : NULL, - dest[0], dstW, chrAlpha, dstY); - } else if (c->yuv2packed2 && vLumFilterSize == 2 && - vChrFilterSize == 2) { // bilinear upscale RGB - int lumAlpha = vLumFilter[2 * dstY + 1]; - int chrAlpha = vChrFilter[2 * dstY + 1]; - lumMmxFilter[2] = - lumMmxFilter[3] = vLumFilter[2 * dstY] * 0x10001; - chrMmxFilter[2] = - chrMmxFilter[3] = vChrFilter[2 * chrDstY] * 0x10001; - yuv2packed2(c, lumSrcPtr, chrUSrcPtr, chrVSrcPtr, - alpPixBuf ? alpSrcPtr : NULL, - dest[0], dstW, lumAlpha, chrAlpha, dstY); - } else { // general RGB - yuv2packedX(c, vLumFilter + dstY * vLumFilterSize, - lumSrcPtr, vLumFilterSize, - vChrFilter + dstY * vChrFilterSize, - chrUSrcPtr, chrVSrcPtr, vChrFilterSize, - alpSrcPtr, dest[0], dstW, dstY); - } - } else { - av_assert1(!yuv2packed1 && !yuv2packed2); - yuv2anyX(c, vLumFilter + dstY * vLumFilterSize, - lumSrcPtr, vLumFilterSize, - vChrFilter + dstY * vChrFilterSize, - chrUSrcPtr, chrVSrcPtr, vChrFilterSize, - alpSrcPtr, dest, dstW, dstY); - } - if (perform_gamma) - gamma_convert(dest, dstW, c->gamma); -#endif } } - if (isPlanar(dstFormat) && isALPHA(dstFormat) && !alpPixBuf) { + if (isPlanar(dstFormat) && isALPHA(dstFormat) && !needAlpha) { int length = dstW; int height = dstY - lastDstY; diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index f48cbac..6647c72 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -350,12 +350,6 @@ typedef struct SwsContext { * vertical scaler is called. */ //@{ - int16_t **lumPixBuf; ///< Ring buffer for scaled horizontal luma plane lines to be fed to the vertical scaler. - int16_t **chrUPixBuf; ///< Ring buffer for scaled horizontal chroma plane lines to be fed to the vertical scaler. - int16_t **chrVPixBuf; ///< Ring buffer for scaled horizontal chroma plane lines to be fed to the vertical scaler. - int16_t **alpPixBuf; ///< Ring buffer for scaled horizontal alpha plane lines to be fed to the vertical scaler. - int vLumBufSize; ///< Number of vertical luma/alpha lines allocated in the ring buffer. - int vChrBufSize; ///< Number of vertical chroma lines allocated in the ring buffer. int lastInLumBuf; ///< Last scaled horizontal luma/alpha line from source in the ring buffer. int lastInChrBuf; ///< Last scaled horizontal chroma line from source in the ring buffer. int lumBufIndex; ///< Index in ring buffer of the last scaled horizontal luma/alpha line from source. @@ -363,6 +357,7 @@ typedef struct SwsContext { //@} uint8_t *formatConvBuffer; + int needAlpha; /** * @name Horizontal and vertical filters. @@ -1038,7 +1033,4 @@ void ff_init_vscale_pfn(SwsContext *c, yuv2planar1_fn yuv2plane1, yuv2planarX_fn //number of extra lines to process #define MAX_LINES_AHEAD 4 -// enable use of refactored scaler code -#define NEW_FILTER - #endif /* SWSCALE_SWSCALE_INTERNAL_H */ diff --git a/libswscale/utils.c b/libswscale/utils.c index 1891c22..2507195 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1696,69 +1696,14 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, #endif } - // calculate buffer sizes so that they won't run out while handling these damn slices - c->vLumBufSize = c->vLumFilterSize; - c->vChrBufSize = c->vChrFilterSize; - for (i = 0; i < dstH; i++) { - int chrI = (int64_t)i * c->chrDstH / dstH; - int nextSlice = FFMAX(c->vLumFilterPos[i] + c->vLumFilterSize - 1, - ((c->vChrFilterPos[chrI] + c->vChrFilterSize - 1) - << c->chrSrcVSubSample)); - - nextSlice >>= c->chrSrcVSubSample; - nextSlice <<= c->chrSrcVSubSample; - if (c->vLumFilterPos[i] + c->vLumBufSize < nextSlice) - c->vLumBufSize = nextSlice - c->vLumFilterPos[i]; - if (c->vChrFilterPos[chrI] + c->vChrBufSize < - (nextSlice >> c->chrSrcVSubSample)) - c->vChrBufSize = (nextSlice >> c->chrSrcVSubSample) - - c->vChrFilterPos[chrI]; - } - for (i = 0; i < 4; i++) FF_ALLOCZ_OR_GOTO(c, c->dither_error[i], (c->dstW+2) * sizeof(int), fail); - /* Allocate pixbufs (we use dynamic allocation because otherwise we would - * need to allocate several megabytes to handle all possible cases) */ - FF_ALLOCZ_OR_GOTO(c, c->lumPixBuf, c->vLumBufSize * 3 * sizeof(int16_t *), fail); - FF_ALLOCZ_OR_GOTO(c, c->chrUPixBuf, c->vChrBufSize * 3 * sizeof(int16_t *), fail); - FF_ALLOCZ_OR_GOTO(c, c->chrVPixBuf, c->vChrBufSize * 3 * sizeof(int16_t *), fail); - if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat) && isALPHA(c->dstFormat)) - FF_ALLOCZ_OR_GOTO(c, c->alpPixBuf, c->vLumBufSize * 3 * sizeof(int16_t *), fail); - /* Note we need at least one pixel more at the end because of the MMX code - * (just in case someone wants to replace the 4000/8000). */ - /* align at 16 bytes for AltiVec */ - for (i = 0; i < c->vLumBufSize; i++) { - FF_ALLOCZ_OR_GOTO(c, c->lumPixBuf[i + c->vLumBufSize], - dst_stride + 16, fail); - c->lumPixBuf[i] = c->lumPixBuf[i + c->vLumBufSize]; - } + c->needAlpha = (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat) && isALPHA(c->dstFormat)) ? 1 : 0; + // 64 / c->scalingBpp is the same as 16 / sizeof(scaling_intermediate) c->uv_off = (dst_stride>>1) + 64 / (c->dstBpc &~ 7); c->uv_offx2 = dst_stride + 16; - for (i = 0; i < c->vChrBufSize; i++) { - FF_ALLOC_OR_GOTO(c, c->chrUPixBuf[i + c->vChrBufSize], - dst_stride * 2 + 32, fail); - c->chrUPixBuf[i] = c->chrUPixBuf[i + c->vChrBufSize]; - c->chrVPixBuf[i] = c->chrVPixBuf[i + c->vChrBufSize] - = c->chrUPixBuf[i] + (dst_stride >> 1) + 8; - } - if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) - for (i = 0; i < c->vLumBufSize; i++) { - FF_ALLOCZ_OR_GOTO(c, c->alpPixBuf[i + c->vLumBufSize], - dst_stride + 16, fail); - c->alpPixBuf[i] = c->alpPixBuf[i + c->vLumBufSize]; - } - - // try to avoid drawing green stuff between the right end and the stride end - for (i = 0; i < c->vChrBufSize; i++) - if(desc_dst->comp[0].depth == 16){ - av_assert0(c->dstBpc > 14); - for(j=0; j<dst_stride/2+1; j++) - ((int32_t*)(c->chrUPixBuf[i]))[j] = 1<<18; - } else - for(j=0; j<dst_stride+1; j++) - ((int16_t*)(c->chrUPixBuf[i]))[j] = 1<<14; av_assert0(c->chrDstH <= dstH); @@ -2325,25 +2270,6 @@ void sws_freeContext(SwsContext *c) if (!c) return; - if (c->lumPixBuf) { - for (i = 0; i < c->vLumBufSize; i++) - av_freep(&c->lumPixBuf[i]); - av_freep(&c->lumPixBuf); - } - - if (c->chrUPixBuf) { - for (i = 0; i < c->vChrBufSize; i++) - av_freep(&c->chrUPixBuf[i]); - av_freep(&c->chrUPixBuf); - av_freep(&c->chrVPixBuf); - } - - if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) { - for (i = 0; i < c->vLumBufSize; i++) - av_freep(&c->alpPixBuf[i]); - av_freep(&c->alpPixBuf); - } - for (i = 0; i < 4; i++) av_freep(&c->dither_error[i]); diff --git a/libswscale/vscale.c b/libswscale/vscale.c index 72f799d..72352de 100644 --- a/libswscale/vscale.c +++ b/libswscale/vscale.c @@ -218,7 +218,7 @@ int ff_init_vscale(SwsContext *c, SwsFilterDescriptor *desc, SwsSlice *src, SwsS desc[0].instance = lumCtx; desc[0].src = src; desc[0].dst = dst; - desc[0].alpha = c->alpPixBuf != 0; + desc[0].alpha = c->needAlpha; if (!isGray(c->dstFormat)) { chrCtx = av_mallocz(sizeof(VScalerContext)); @@ -239,7 +239,7 @@ int ff_init_vscale(SwsContext *c, SwsFilterDescriptor *desc, SwsSlice *src, SwsS desc[0].instance = lumCtx; desc[0].src = src; desc[0].dst = dst; - desc[0].alpha = c->alpPixBuf != 0; + desc[0].alpha = c->needAlpha; } ff_init_vscale_pfn(c, c->yuv2plane1, c->yuv2planeX, c->yuv2nv12cX, diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 66ac7d5..3b370be 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -85,18 +85,12 @@ void ff_updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrB { const int dstH= c->dstH; const int flags= c->flags; -#ifdef NEW_FILTER + SwsPlane *lumPlane = &c->slice[c->numSlice-2].plane[0]; SwsPlane *chrUPlane = &c->slice[c->numSlice-2].plane[1]; SwsPlane *alpPlane = &c->slice[c->numSlice-2].plane[3]; -#else - int16_t **lumPixBuf= c->lumPixBuf; - int16_t **chrUPixBuf= c->chrUPixBuf; - int16_t **alpPixBuf= c->alpPixBuf; - const int vLumBufSize= c->vLumBufSize; - const int vChrBufSize= c->vChrBufSize; -#endif - int hasAlpha = c->alpPixBuf != NULL; + + int hasAlpha = c->needAlpha; int32_t *vLumFilterPos= c->vLumFilterPos; int32_t *vChrFilterPos= c->vChrFilterPos; int16_t *vLumFilter= c->vLumFilter; @@ -117,22 +111,14 @@ void ff_updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrB c->greenDither= ff_dither4[dstY&1]; c->redDither= ff_dither8[(dstY+1)&1]; if (dstY < dstH - 2) { -#ifdef NEW_FILTER const int16_t **lumSrcPtr = (const int16_t **)(void*) lumPlane->line + firstLumSrcY - lumPlane->sliceY; const int16_t **chrUSrcPtr = (const int16_t **)(void*) chrUPlane->line + firstChrSrcY - chrUPlane->sliceY; - const int16_t **alpSrcPtr = (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) ? (const int16_t **)(void*) alpPlane->line + firstLumSrcY - alpPlane->sliceY : NULL; -#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 **alpSrcPtr= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? (const int16_t **)(void*) alpPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize : NULL; -#endif + const int16_t **alpSrcPtr = (CONFIG_SWSCALE_ALPHA && hasAlpha) ? (const int16_t **)(void*) alpPlane->line + firstLumSrcY - alpPlane->sliceY : NULL; + int i; if (firstLumSrcY < 0 || firstLumSrcY + vLumFilterSize > c->srcH) { -#ifdef NEW_FILTER const int16_t **tmpY = (const int16_t **) lumPlane->tmp; -#else - const int16_t **tmpY = (const int16_t **) lumPixBuf + 2 * vLumBufSize; -#endif + int neg = -firstLumSrcY, i, end = FFMIN(c->srcH - firstLumSrcY, vLumFilterSize); for (i = 0; i < neg; i++) tmpY[i] = lumSrcPtr[neg]; @@ -143,11 +129,7 @@ void ff_updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrB lumSrcPtr = tmpY; if (alpSrcPtr) { -#ifdef NEW_FILTER const int16_t **tmpA = (const int16_t **) alpPlane->tmp; -#else - const int16_t **tmpA = (const int16_t **) alpPixBuf + 2 * vLumBufSize; -#endif for (i = 0; i < neg; i++) tmpA[i] = alpSrcPtr[neg]; for ( ; i < end; i++) @@ -158,11 +140,7 @@ void ff_updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrB } } if (firstChrSrcY < 0 || firstChrSrcY + vChrFilterSize > c->chrSrcH) { -#ifdef NEW_FILTER const int16_t **tmpU = (const int16_t **) chrUPlane->tmp; -#else - const int16_t **tmpU = (const int16_t **) chrUPixBuf + 2 * vChrBufSize; -#endif int neg = -firstChrSrcY, i, end = FFMIN(c->chrSrcH - firstChrSrcY, vChrFilterSize); for (i = 0; i < neg; i++) { tmpU[i] = chrUSrcPtr[neg]; @@ -479,7 +457,7 @@ switch(c->dstBpc){ \ switch (c->srcFormat) { case AV_PIX_FMT_YA8: c->lumToYV12 = ff_yuyvToY_mmx; - if (c->alpPixBuf) + if (c->needAlpha) c->alpToYV12 = ff_uyvyToY_mmx; break; case AV_PIX_FMT_YUYV422: @@ -528,7 +506,7 @@ switch(c->dstBpc){ \ switch (c->srcFormat) { case AV_PIX_FMT_YA8: c->lumToYV12 = ff_yuyvToY_sse2; - if (c->alpPixBuf) + if (c->needAlpha) c->alpToYV12 = ff_uyvyToY_sse2; break; case AV_PIX_FMT_YUYV422: diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c index bbda6d0..3b38e98 100644 --- a/libswscale/x86/swscale_template.c +++ b/libswscale/x86/swscale_template.c @@ -348,7 +348,7 @@ static void RENAME(yuv2rgb32_X_ar)(SwsContext *c, const int16_t *lumFilter, x86_reg dstW_reg = dstW; x86_reg uv_off = c->uv_offx2; - if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) { + if (CONFIG_SWSCALE_ALPHA && c->needAlpha) { YSCALEYUV2PACKEDX_ACCURATE YSCALEYUV2RGBX "movq %%mm2, "U_TEMP"(%0) \n\t" @@ -381,7 +381,7 @@ static void RENAME(yuv2rgb32_X)(SwsContext *c, const int16_t *lumFilter, x86_reg dstW_reg = dstW; x86_reg uv_off = c->uv_offx2; - if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) { + if (CONFIG_SWSCALE_ALPHA && c->needAlpha) { YSCALEYUV2PACKEDX YSCALEYUV2RGBX YSCALEYUV2PACKEDX_YA(ALP_MMX_FILTER_OFFSET, %%mm0, %%mm3, %%mm6, %%mm1, %%mm7) @@ -410,7 +410,7 @@ static void RENAME(yuv2bgr32_X)(SwsContext *c, const int16_t *lumFilter, x86_reg dstW_reg = dstW; x86_reg uv_off = c->uv_offx2; - if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) { + if (CONFIG_SWSCALE_ALPHA && c->needAlpha) { YSCALEYUV2PACKEDX YSCALEYUV2RGBX YSCALEYUV2PACKEDX_YA(ALP_MMX_FILTER_OFFSET, %%mm0, %%mm3, %%mm6, %%mm1, %%mm7) @@ -889,7 +889,7 @@ static void RENAME(yuv2rgb32_2)(SwsContext *c, const int16_t *buf[2], const int16_t *buf0 = buf[0], *buf1 = buf[1], *ubuf0 = ubuf[0], *ubuf1 = ubuf[1]; - if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) { + if (CONFIG_SWSCALE_ALPHA && c->needAlpha) { const int16_t *abuf0 = abuf[0], *abuf1 = abuf[1]; #if ARCH_X86_64 __asm__ volatile( @@ -1215,7 +1215,7 @@ static void RENAME(yuv2rgb32_1)(SwsContext *c, const int16_t *buf0, if (uvalpha < 2048) { // note this is not correct (shifts chrominance by 0.5 pixels) but it is a bit faster const int16_t *ubuf1 = ubuf[0]; - if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) { + if (CONFIG_SWSCALE_ALPHA && c->needAlpha) { __asm__ volatile( "mov %%"REG_b", "ESP_OFFSET"(%5) \n\t" "mov %4, %%"REG_b" \n\t" @@ -1244,7 +1244,7 @@ static void RENAME(yuv2rgb32_1)(SwsContext *c, const int16_t *buf0, } } else { const int16_t *ubuf1 = ubuf[1]; - if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) { + if (CONFIG_SWSCALE_ALPHA && c->needAlpha) { __asm__ volatile( "mov %%"REG_b", "ESP_OFFSET"(%5) \n\t" "mov %4, %%"REG_b" \n\t"

1 0

swscale: Deprecate vector functions which are unused outside swscale
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Mar 31 17:20:58 2016 +0200| [3b905b9fe611efb3282aa4c5c659e1870d91a83b] | committer: Michael Niedermayer swscale: Deprecate vector functions which are unused outside swscale There are no known users of these functions within debian It should be thus possible to remove these functions without recommandition of a replacement Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b905b9fe611efb32… --- libswscale/swscale.h | 37 ++++++++++--------------------------- libswscale/utils.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ libswscale/version.h | 4 ++++ 3 files changed, 60 insertions(+), 27 deletions(-) diff --git a/libswscale/swscale.h b/libswscale/swscale.h index da9dd2e..8449948 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -248,18 +248,6 @@ SwsVector *sws_allocVec(int length); SwsVector *sws_getGaussianVec(double variance, double quality); /** - * Allocate and return a vector with length coefficients, all - * with the same value c. - */ -SwsVector *sws_getConstVec(double c, int length); - -/** - * Allocate and return a vector with just one coefficient, with - * value 1.0. - */ -SwsVector *sws_getIdentityVec(void); - -/** * Scale all the coefficients of a by the scalar value. */ void sws_scaleVec(SwsVector *a, double scalar); @@ -268,22 +256,17 @@ void sws_scaleVec(SwsVector *a, double scalar); * Scale all the coefficients of a so that their sum equals height. */ void sws_normalizeVec(SwsVector *a, double height); -void sws_convVec(SwsVector *a, SwsVector *b); -void sws_addVec(SwsVector *a, SwsVector *b); -void sws_subVec(SwsVector *a, SwsVector *b); -void sws_shiftVec(SwsVector *a, int shift); -/** - * Allocate and return a clone of the vector a, that is a vector - * with the same coefficients as a. - */ -SwsVector *sws_cloneVec(SwsVector *a); - -/** - * Print with av_log() a textual representation of the vector a - * if log_level <= av_log_level. - */ -void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level); +#if FF_API_SWS_VECTOR +attribute_deprecated SwsVector *sws_getConstVec(double c, int length); +attribute_deprecated SwsVector *sws_getIdentityVec(void); +attribute_deprecated void sws_convVec(SwsVector *a, SwsVector *b); +attribute_deprecated void sws_addVec(SwsVector *a, SwsVector *b); +attribute_deprecated void sws_subVec(SwsVector *a, SwsVector *b); +attribute_deprecated void sws_shiftVec(SwsVector *a, int shift); +attribute_deprecated SwsVector *sws_cloneVec(SwsVector *a); +attribute_deprecated void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level); +#endif void sws_freeVec(SwsVector *a); diff --git a/libswscale/utils.c b/libswscale/utils.c index 24ddd13..1891c22 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -53,10 +53,23 @@ #include "libavutil/ppc/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" + +// We have to implement deprecated functions until they are removed, this is the +// simplest way to prevent warnings +#undef attribute_deprecated +#define attribute_deprecated + #include "rgb2rgb.h" #include "swscale.h" #include "swscale_internal.h" +#if !FF_API_SWS_VECTOR +static SwsVector *sws_getIdentityVec(void); +static void sws_addVec(SwsVector *a, SwsVector *b); +static void sws_shiftVec(SwsVector *a, int shift); +static void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level); +#endif + static void handle_formats(SwsContext *c); unsigned swscale_version(void) @@ -2049,6 +2062,13 @@ SwsVector *sws_getGaussianVec(double variance, double quality) return vec; } +/** + * Allocate and return a vector with length coefficients, all + * with the same value c. + */ +#if !FF_API_SWS_VECTOR +static +#endif SwsVector *sws_getConstVec(double c, int length) { int i; @@ -2063,6 +2083,13 @@ SwsVector *sws_getConstVec(double c, int length) return vec; } +/** + * Allocate and return a vector with just one coefficient, with + * value 1.0. + */ +#if !FF_API_SWS_VECTOR +static +#endif SwsVector *sws_getIdentityVec(void) { return sws_getConstVec(1.0, 1); @@ -2092,6 +2119,7 @@ void sws_normalizeVec(SwsVector *a, double height) sws_scaleVec(a, height / sws_dcVec(a)); } +#if FF_API_SWS_VECTOR static SwsVector *sws_getConvVec(SwsVector *a, SwsVector *b) { int length = a->length + b->length - 1; @@ -2109,6 +2137,7 @@ static SwsVector *sws_getConvVec(SwsVector *a, SwsVector *b) return vec; } +#endif static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b) { @@ -2127,6 +2156,7 @@ static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b) return vec; } +#if FF_API_SWS_VECTOR static SwsVector *sws_diffVec(SwsVector *a, SwsVector *b) { int length = FFMAX(a->length, b->length); @@ -2143,6 +2173,7 @@ static SwsVector *sws_diffVec(SwsVector *a, SwsVector *b) return vec; } +#endif /* shift left / or right if "shift" is negative */ static SwsVector *sws_getShiftedVec(SwsVector *a, int shift) @@ -2162,6 +2193,9 @@ static SwsVector *sws_getShiftedVec(SwsVector *a, int shift) return vec; } +#if !FF_API_SWS_VECTOR +static +#endif void sws_shiftVec(SwsVector *a, int shift) { SwsVector *shifted = sws_getShiftedVec(a, shift); @@ -2175,6 +2209,9 @@ void sws_shiftVec(SwsVector *a, int shift) av_free(shifted); } +#if !FF_API_SWS_VECTOR +static +#endif void sws_addVec(SwsVector *a, SwsVector *b) { SwsVector *sum = sws_sumVec(a, b); @@ -2188,6 +2225,7 @@ void sws_addVec(SwsVector *a, SwsVector *b) av_free(sum); } +#if FF_API_SWS_VECTOR void sws_subVec(SwsVector *a, SwsVector *b) { SwsVector *diff = sws_diffVec(a, b); @@ -2225,7 +2263,15 @@ SwsVector *sws_cloneVec(SwsVector *a) return vec; } +#endif +/** + * Print with av_log() a textual representation of the vector a + * if log_level <= av_log_level. + */ +#if !FF_API_SWS_VECTOR +static +#endif void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level) { int i; diff --git a/libswscale/version.h b/libswscale/version.h index 24908b8..5c1cfb1 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -46,4 +46,8 @@ * the public API and may change, break or disappear at any time. */ +#ifndef FF_API_SWS_VECTOR +#define FF_API_SWS_VECTOR (LIBSWSCALE_VERSION_MAJOR < 6) +#endif + #endif /* SWSCALE_VERSION_H */

1 0

configure: Fix debugging on mingw-w64 with gdb
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Alex Smith <alex.smith(a)warpsharp.info> | Tue Mar 29 01:30:50 2016 -0400| [a677121cc568db7c101ebf3a797a779a983fc668] | committer: Michael Niedermayer configure: Fix debugging on mingw-w64 with gdb The relocation hack broke debugging on mingw-w64 when using gdb. This makes the reloc hack dependent on --disable-debug so it's still enabled for release builds. This is simply an immediate fix for the issue of broken debugging, we should probably still look at the possibility of reverting it outright if it proves to be more trouble than it's worth. For now keeping it enabled for release builds is a reasonable trade off. Signed-off-by: Alex Smith <theryuu(a)warpsharp.info> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a677121cc568db7c1… --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e550547..e8c4a7b 100755 --- a/configure +++ b/configure @@ -4634,9 +4634,9 @@ case $target_os in # however ld then forgets what the entry point should be (oops) so we # have to manually (re)set it. if enabled x86_32; then - add_ldexeflags -Wl,--pic-executable,-e,_mainCRTStartup + disabled debug && add_ldexeflags -Wl,--pic-executable,-e,_mainCRTStartup elif enabled x86_64; then - add_ldexeflags -Wl,--pic-executable,-e,mainCRTStartup + disabled debug && add_ldexeflags -Wl,--pic-executable,-e,mainCRTStartup check_ldflags -Wl,--high-entropy-va # binutils 2.25 # Set image base >4GB for extra entropy with HEASLR add_ldexeflags -Wl,--image-base,0x140000000

1 0

doc/filters: add stereotools examples
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Mar 31 11:12:40 2016 +0200| [cf925e0ac19d6ca02ab5e60575cad4b0e519b94d] | committer: Paul B Mahol doc/filters: add stereotools examples Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf925e0ac19d6ca02… --- doc/filters.texi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 7f694af..592fc24 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3352,6 +3352,22 @@ Set S/C level. Default is 1. Allowed range is from 1 to 100. Set the stereo phase in degrees. Default is 0. Allowed range is from 0 to 360. @end table +@subsection Examples + +@itemize +@item +Apply karaoke like effect: +@example +stereotools=mlev=0.015625 +@end example + +@item +Convert M/S signal to L/R: +@example +"stereotools=mode=ms>lr" +@end example +@end itemize + @section stereowiden This filter enhance the stereo effect by suppressing signal common to both

1 0

doc/filters: add sofalizer examples
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Mar 31 11:04:42 2016 +0200| [241a3a6ca49305558d4f29aa349b3d398422c5f3] | committer: Paul B Mahol doc/filters: add sofalizer examples Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=241a3a6ca49305558… --- doc/filters.texi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 5d6cf52..7f694af 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3232,6 +3232,29 @@ For example to override front left and front right channel positions use: Descriptions with unrecognised channel names are ignored. @end table +@subsection Examples + +@itemize +@item +Using ClubFritz6 sofa file: +@example +sofalizer=sofa=/path/to/ClubFritz6.sofa:type=freq:radius=1 +@end example + +@item +Using ClubFritz12 sofa file and bigger radius with small rotation: +@example +sofalizer=sofa=/path/to/ClubFritz12.sofa:type=freq:radius=2:rotation=5 +@end example + +@item +Similar as above but with custom speaker positions for front left, front right, rear left and rear right +and also with custom gain: +@example +"sofalizer=sofa=/path/to/ClubFritz6.sofa:type=freq:radius=2:speakers=FL 45|FR 315|RL 135|RR 225:gain=28" +@end example +@end itemize + @section stereotools This filter has some handy utilities to manage stereo signals, for converting

1 0

sws/aarch64: add ff_hscale_8_to_15_neon
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Fri Mar 18 16:39:34 2016 +0100| [263eb76bdf5c5486c9eed0ac2e3416ce13db9821] | committer: Clément Bœsch sws/aarch64: add ff_hscale_8_to_15_neon ./ffmpeg -nostats -f lavfi -i testsrc2=4k:d=2 -vf bench=start,scale=1024x1024,bench=stop -f null - before: t:0.489726 avg:0.489883 max:0.491852 min:0.489482 after: t:0.256515 avg:0.256458 max:0.256999 min:0.253755 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=263eb76bdf5c5486c… --- libswscale/aarch64/Makefile | 6 +++-- libswscale/aarch64/hscale.S | 59 +++++++++++++++++++++++++++++++++++++++++ libswscale/aarch64/swscale.c | 37 ++++++++++++++++++++++++++ libswscale/swscale.c | 2 ++ libswscale/swscale_internal.h | 1 + libswscale/utils.c | 4 ++- 6 files changed, 106 insertions(+), 3 deletions(-) diff --git a/libswscale/aarch64/Makefile b/libswscale/aarch64/Makefile index 823806e..51bff08 100644 --- a/libswscale/aarch64/Makefile +++ b/libswscale/aarch64/Makefile @@ -1,3 +1,5 @@ -OBJS += aarch64/swscale_unscaled.o +OBJS += aarch64/swscale.o \ + aarch64/swscale_unscaled.o \ -NEON-OBJS += aarch64/yuv2rgb_neon.o +NEON-OBJS += aarch64/hscale.o \ + aarch64/yuv2rgb_neon.o \ diff --git a/libswscale/aarch64/hscale.S b/libswscale/aarch64/hscale.S new file mode 100644 index 0000000..c32394c --- /dev/null +++ b/libswscale/aarch64/hscale.S @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2016 Clément Bœsch <clement stupeflix.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/aarch64/asm.S" + +function ff_hscale_8_to_15_neon, export=1 + add x10, x4, w6, UXTW #1 // filter2 = filter + filterSize*2 (x2 because int16) +1: ldr w8, [x5], #4 // filterPos[0] + ldr w9, [x5], #4 // filterPos[1] + movi v4.4S, #0 // val sum part 1 (for dst[0]) + movi v5.4S, #0 // val sum part 2 (for dst[1]) + mov w7, w6 // filterSize counter + mov x13, x3 // srcp = src +2: add x11, x13, w8, UXTW // srcp + filterPos[0] + add x12, x13, w9, UXTW // srcp + filterPos[1] + ld1 {v0.8B}, [x11] // srcp[filterPos[0] + {0..7}] + ld1 {v1.8B}, [x12] // srcp[filterPos[1] + {0..7}] + ld1 {v2.8H}, [x4], #16 // load 8x16-bit filter values, part 1 + ld1 {v3.8H}, [x10], #16 // ditto at filter+filterSize for part 2 + uxtl v0.8H, v0.8B // unpack part 1 to 16-bit + uxtl v1.8H, v1.8B // unpack part 2 to 16-bit + smull v16.4S, v0.4H, v2.4H // v16.i32{0..3} = part 1 of: srcp[filterPos[0] + {0..7}] * filter[{0..7}] + smull v18.4S, v1.4H, v3.4H // v18.i32{0..3} = part 1 of: srcp[filterPos[1] + {0..7}] * filter[{0..7}] + smull2 v17.4S, v0.8H, v2.8H // v17.i32{0..3} = part 2 of: srcp[filterPos[0] + {0..7}] * filter[{0..7}] + smull2 v19.4S, v1.8H, v3.8H // v19.i32{0..3} = part 2 of: srcp[filterPos[1] + {0..7}] * filter[{0..7}] + addp v16.4S, v16.4S, v17.4S // horizontal pair adding of the 8x32-bit multiplied values for part 1 into 4x32-bit + addp v18.4S, v18.4S, v19.4S // horizontal pair adding of the 8x32-bit multiplied values for part 2 into 4x32-bit + add v4.4S, v4.4S, v16.4S // update val accumulator for part 1 + add v5.4S, v5.4S, v18.4S // update val accumulator for part 2 + add x13, x13, #8 // srcp += 8 + subs w7, w7, #8 // processed 8/filterSize + b.gt 2b // inner loop if filterSize not consumed completely + mov x4, x10 // filter = filter2 + add x10, x10, w6, UXTW #1 // filter2 += filterSize*2 + addp v4.4S, v4.4S, v5.4S // horizontal pair adding of the 8x32-bit sums into 4x32-bit + addp v4.4S, v4.4S, v4.4S // horizontal pair adding of the 4x32-bit sums into 2x32-bit + sqrshrun v4.4H, v4.4S, #7 // shift and clip the 2x16-bit final values + st1 {v4.S}[0], [x1], #4 // write to destination + subs w2, w2, #2 // dstW -= 2 + b.gt 1b // loop until end of line + ret +endfunc diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c new file mode 100644 index 0000000..6b9b046 --- /dev/null +++ b/libswscale/aarch64/swscale.c @@ -0,0 +1,37 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "libswscale/swscale.h" +#include "libswscale/swscale_internal.h" +#include "libavutil/aarch64/cpu.h" + +void ff_hscale_8_to_15_neon(SwsContext *c, int16_t *dst, int dstW, + const uint8_t *src, const int16_t *filter, + const int32_t *filterPos, int filterSize); + +av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) +{ + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags)) { + if (c->srcBpc == 8 && c->dstBpc <= 14) { + c->hyScale = c->hcScale = ff_hscale_8_to_15_neon; + } + } +} diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 8d20577..2de5ad4 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -889,6 +889,8 @@ SwsFunc ff_getSwsFunc(SwsContext *c) ff_sws_init_swscale_ppc(c); if (ARCH_X86) ff_sws_init_swscale_x86(c); + if (ARCH_AARCH64) + ff_sws_init_swscale_aarch64(c); return swscale; } diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 450805a..f48cbac 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -896,6 +896,7 @@ void ff_sws_init_output_funcs(SwsContext *c, yuv2anyX_fn *yuv2anyX); void ff_sws_init_swscale_ppc(SwsContext *c); void ff_sws_init_swscale_x86(SwsContext *c); +void ff_sws_init_swscale_aarch64(SwsContext *c); void ff_hyscale_fast_c(SwsContext *c, int16_t *dst, int dstWidth, const uint8_t *src, int srcW, int xInc); diff --git a/libswscale/utils.c b/libswscale/utils.c index ba409d6..24ddd13 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -49,6 +49,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavutil/aarch64/cpu.h" #include "libavutil/ppc/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" @@ -1614,7 +1615,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, #endif /* HAVE_MMXEXT_INLINE */ { const int filterAlign = X86_MMX(cpu_flags) ? 4 : - PPC_ALTIVEC(cpu_flags) ? 8 : 1; + PPC_ALTIVEC(cpu_flags) ? 8 : + have_neon(cpu_flags) ? 4 : 1; if ((ret = initFilter(&c->hLumFilter, &c->hLumFilterPos, &c->hLumFilterSize, c->lumXInc,

1 0

AAC encoder: fix undefined behavior
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | Claudio Freire <klaussfreire(a)gmail.com> | Wed Mar 30 18:34:08 2016 -0300| [be746ae4706302a100cc9e53f93fa6167215a674] | committer: Claudio Freire AAC encoder: fix undefined behavior Fix uninitialized access of minsf in short windows Fix potential invocation of coef2minsf(0) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be746ae4706302a10… --- libavcodec/aaccoder_twoloop.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/aaccoder_twoloop.h b/libavcodec/aaccoder_twoloop.h index 4747c79..41d3ffd 100644 --- a/libavcodec/aaccoder_twoloop.h +++ b/libavcodec/aaccoder_twoloop.h @@ -300,8 +300,12 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, start = w*128; for (g = 0; g < sce->ics.num_swb; g++) { const float *scaled = s->scoefs + start; + int minsfidx; maxvals[w*16+g] = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled); - minsf[w*16+g] = coef2minsf(maxvals[w*16+g]); + if (maxvals[w*16+g] > 0) + minsfidx = coef2minsf(maxvals[w*16+g]); + for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) + minsf[(w+w2)*16+g] = minsfidx; start += sce->ics.swb_sizes[g]; } }

1 0

avformat/latmenc: auto-insert aac_adtstoasc bitstream filter when needed
by git＠videolan.org 31 Mar '16

31 Mar '16

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Mar 26 01:42:35 2016 -0300| [9bf3d01d91479f78a0c3f02a706fa4dcc52617d3] | committer: James Almer avformat/latmenc: auto-insert aac_adtstoasc bitstream filter when needed Reviewed-by: Ronald S. Bultje <rsbultje(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bf3d01d91479f78a… --- libavformat/latmenc.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index db6977e..9713b1b 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -25,6 +25,7 @@ #include "libavcodec/mpeg4audio.h" #include "libavutil/opt.h" #include "avformat.h" +#include "internal.h" #include "rawenc.h" #define MAX_EXTRADATA_SIZE 1024 @@ -153,11 +154,6 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt) if (s->streams[0]->codec->codec_id == AV_CODEC_ID_AAC_LATM) return ff_raw_write_packet(s, pkt); - if (pkt->size > 2 && pkt->data[0] == 0xff && (pkt->data[1] >> 4) == 0xf) { - av_log(s, AV_LOG_ERROR, "ADTS header detected - ADTS will not be incorrectly muxed into LATM\n"); - return AVERROR_INVALIDDATA; - } - if (!s->streams[0]->codec->extradata) { if(pkt->size > 2 && pkt->data[0] == 0x56 && (pkt->data[1] >> 4) == 0xe && (AV_RB16(pkt->data + 1) & 0x1FFF) + 3 == pkt->size) @@ -217,6 +213,19 @@ too_large: return AVERROR_INVALIDDATA; } +static int latm_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) +{ + int ret = 1; + AVStream *st = s->streams[pkt->stream_index]; + + if (st->codec->codec_id == AV_CODEC_ID_AAC) { + if (pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) + ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL); + } + + return ret; +} + AVOutputFormat ff_latm_muxer = { .name = "latm", .long_name = NULL_IF_CONFIG_SMALL("LOAS/LATM"), @@ -228,5 +237,6 @@ AVOutputFormat ff_latm_muxer = { .write_header = latm_write_header, .write_packet = latm_write_packet, .priv_class = &latm_muxer_class, + .check_bitstream= latm_check_bitstream, .flags = AVFMT_NOTIMESTAMPS, };

1 0

fate: Add filter-metadata-cropdetect
by git＠videolan.org 30 Mar '16

30 Mar '16

1 0

AAC encoder: fix signed integer overflow
by git＠videolan.org 30 Mar '16

30 Mar '16

ffmpeg | branch: master | Claudio Freire <klaussfreire(a)gmail.com> | Wed Mar 30 10:05:03 2016 -0300| [c883da6bf4610ee37848687346f543dfb73de011] | committer: Claudio Freire AAC encoder: fix signed integer overflow Clamp scalefactors by coef2minsf to avoid undefined behavior caused by signed integer overflow. It also avoids clipping of coefficients so it should avoid artifacts as well, on very rare corner cases. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c883da6bf4610ee37… --- libavcodec/aaccoder_twoloop.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/aaccoder_twoloop.h b/libavcodec/aaccoder_twoloop.h index 397a4db..4747c79 100644 --- a/libavcodec/aaccoder_twoloop.h +++ b/libavcodec/aaccoder_twoloop.h @@ -77,7 +77,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, int toomanybits, toofewbits; char nzs[128]; uint8_t nextband[128]; - int maxsf[128]; + int maxsf[128], minsf[128]; float dists[128] = { 0 }, qenergies[128] = { 0 }, uplims[128], euplims[128], energies[128]; float maxvals[128], spread_thr_r[128]; float min_spread_thr_r, max_spread_thr_r; @@ -294,11 +294,14 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, abs_pow34_v(s->scoefs, sce->coeffs, 1024); ff_quantize_band_cost_cache_init(s); + for (i = 0; i < sizeof(minsf) / sizeof(minsf[0]); ++i) + minsf[i] = 0; for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) { start = w*128; for (g = 0; g < sce->ics.num_swb; g++) { const float *scaled = s->scoefs + start; maxvals[w*16+g] = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled); + minsf[w*16+g] = coef2minsf(maxvals[w*16+g]); start += sce->ics.swb_sizes[g]; } } @@ -425,7 +428,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, recomprd = 1; for (i = 0; i < 128; i++) { if (sce->sf_idx[i] > SCALE_ONE_POS) { - int new_sf = FFMAX(SCALE_ONE_POS, sce->sf_idx[i] - qstep); + int new_sf = FFMAX3(minsf[i], SCALE_ONE_POS, sce->sf_idx[i] - qstep); if (new_sf != sce->sf_idx[i]) { sce->sf_idx[i] = new_sf; changed = 1; @@ -595,7 +598,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, int cmb = find_min_book(maxvals[w*16+g], sce->sf_idx[w*16+g]); int mindeltasf = FFMAX(0, prev - SCALE_MAX_DIFF); int maxdeltasf = FFMIN(SCALE_MAX_POS - SCALE_DIV_512, prev + SCALE_MAX_DIFF); - if ((!cmb || dists[w*16+g] > uplims[w*16+g]) && sce->sf_idx[w*16+g] > mindeltasf) { + if ((!cmb || dists[w*16+g] > uplims[w*16+g]) && sce->sf_idx[w*16+g] > FFMAX(mindeltasf, minsf[w*16+g])) { /* Try to make sure there is some energy in every nonzero band * NOTE: This algorithm must be forcibly imbalanced, pushing harder * on holes or more distorted bands at first, otherwise there's

1 0