From patchwork Tue Jun 2 15:26:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20124 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bac9:0:0:0:0:0 with SMTP id a9csp3784459ybk; Tue, 2 Jun 2020 08:32:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2Ajs5NB/ff1vt4FKC5LfK2oP+bWZXOXimzXcr76F47zd3vHXJWBS4Le37yokqZ0jyNNDV X-Received: by 2002:a05:6000:1083:: with SMTP id y3mr25925676wrw.425.1591111952299; Tue, 02 Jun 2020 08:32:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591111952; cv=none; d=google.com; s=arc-20160816; b=VVmHZSAiAUC3lnWuAmFXPGKHcmYgaPw9piVrJXnshG/UFewkZyfD/g4++3Y7pq1Z2t yXpTUpRcrXx+BhdKg7LKzdaAfFvx9w8bwYcrAbxzz4XlAiRdvIVHZUTIK3RV1H1NznTS V8u37ipJ9ED9kiigp0DeME2Hjv3tQGH21x+dGlQGmpW0d+eCkCQbASYxDWWp2uYYxC1z 4CbVK4rdJD14mQ5yfT7+ieQ0Wj/bgVjW/4TL0+ItBvzAV7mUcNFoNCOe0J/hGIcAQXkU onOIU5X4zE6eKPSSUPDGq3VPs0vZFp2kcy9a8ZgajhZS9Kv/frfKcCptfeKPQydHCpKA cJ/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=/x9KLTT9TtAMJgTmmBWDJqtTKZK7I2KvXaLt9RkG+JU=; b=KkOPnsHhAMIPXdecml0gP+CwRIqSDlDrCsdE838ubufBR09zE4GmF1y5oRyn83BG5q WB66WEthBiZM0Jm43GgbIVfgZ2i7+GUVDztd1EdmJXTzHt+QlWDKLUpozqQ4PUGN7dpf tvP8rnRhQIMNT6WZQtnJomvNWBjAug5YLCpZIqGjaDa00yhOr9dhovpIz2Fah4cEK4FX RSFedvqKIG3XvCPDBlyf/zslz5804WwA2IM7RvltAPCtcAOJcYD1nCFPwvaqbbWoAXR8 3xNmWb+LGQZiGsu9/v45iJ5jo80whGxo5jJfcvT1f4ij0r/obY6oYTuwKXgpdz4X+G2l ECwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lLwvhErs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i4si2468484wrw.255.2020.06.02.08.32.31; Tue, 02 Jun 2020 08:32:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lLwvhErs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E01168B3CA; Tue, 2 Jun 2020 18:29:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B925068B035 for ; Tue, 2 Jun 2020 18:29:06 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id m7so1481458plt.5 for ; Tue, 02 Jun 2020 08:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L1lo+r0JWSXY1uPa3AVIhEm+F1YHtVod8TVsYsJUDMY=; b=lLwvhErs57cWL3y+oCzTqqIFHqW1k92ohmtUfdJSZdZlGw3Oc57WYwhAJe5qd2bxuA IzOg9EwiCx8q/aanft9ayFgZaLJ2QyODpSPCS4NtVXeedKWpumn6jkvbkDzfib+ICLJ+ 9i8wl74U3xuIxVZ/rjMUapaZIRbycROtQf68MBdKu58CC3a+EfKHMM0i5mYmu2+7q6pU zLiVaYfFGJ3wxGoiFDFWfwUOQ7uoMdaFXLaIAVEjSZH34TebjXZyDj9qemR6ecPzd1vD 8mF+aKjYZ7IUrqCVzbHkk6Ul5T1SyTisP1wEsiJAJ0YkvZcD6C25aY2tQ6nrXwhWv0ym u+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L1lo+r0JWSXY1uPa3AVIhEm+F1YHtVod8TVsYsJUDMY=; b=FzxexD7FnpW0ckh61quQCIiyEgmG+Vnay2i/diORxzZwC1MibxKa5ZwKmKMJSfI/nj 91d2+kqjgNRwslmaBNeFtQaQGp4MYxb0aMKgEp7NSHFvXotbBh69DithU8YeI1bXAYji Y02EjQpmXA4E2/l4pR5P7FwxCBde5UX61cI0A/8T1Uqb+fSgeShF+iERhNk4jeg/v+m3 LMi7+fKIISv2i5s+kDvrHlLHfZSI+unr1oJKW6wk6wgUPSygWtozk5i30q/d6p2bNB3z +Sv8Oy3tMGury9ZU8b4bBDtG/71Raieo1lsMY/eDYX/31x7qcIQeyOzkCu0qIGdDNg1W TgDw== X-Gm-Message-State: AOAM530/TdC5RElILnNKoTrZDnD+O+h7S0n2FG908F6jaPo2HTjlbMxp UStTcrVvsKMXMSK1p2Xvl0EWqDIc X-Received: by 2002:a17:902:aa01:: with SMTP id be1mr25155331plb.63.1591111744780; Tue, 02 Jun 2020 08:29:04 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.29.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:29:04 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:57 +0800 Message-Id: <1591111618-15778-23-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 23/24] swscale/utils: remove FF_ALLOC_ARRAY_OR_GOTO macros X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3C3yMUX6Na/Z Content-Length: 9861 From: Limin Wang Signed-off-by: Limin Wang --- libswscale/utils.c | 55 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 111062e..961750e 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -352,13 +352,14 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, emms_c(); // FIXME should not be required but IS (even for non-MMX versions) // NOTE: the +3 is for the MMX(+1) / SSE(+3) scaler which reads over the end - FF_ALLOC_ARRAY_OR_GOTO(NULL, *filterPos, (dstW + 3), sizeof(**filterPos), fail); + if (!FF_ALLOC_TYPED_ARRAY(*filterPos, dstW + 3)) + goto nomem; if (FFABS(xInc - 0x10000) < 10 && srcPos == dstPos) { // unscaled int i; filterSize = 1; - FF_ALLOCZ_ARRAY_OR_GOTO(NULL, filter, - dstW, sizeof(*filter) * filterSize, fail); + if (!FF_ALLOCZ_TYPED_ARRAY(filter, dstW * filterSize)) + goto nomem; for (i = 0; i < dstW; i++) { filter[i * filterSize] = fone; @@ -368,8 +369,8 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, int i; int64_t xDstInSrc; filterSize = 1; - FF_ALLOC_ARRAY_OR_GOTO(NULL, filter, - dstW, sizeof(*filter) * filterSize, fail); + if (!FF_ALLOC_TYPED_ARRAY(filter, dstW * filterSize)) + goto nomem; xDstInSrc = ((dstPos*(int64_t)xInc)>>8) - ((srcPos*0x8000LL)>>7); for (i = 0; i < dstW; i++) { @@ -384,8 +385,8 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, int i; int64_t xDstInSrc; filterSize = 2; - FF_ALLOC_ARRAY_OR_GOTO(NULL, filter, - dstW, sizeof(*filter) * filterSize, fail); + if (!FF_ALLOC_TYPED_ARRAY(filter, dstW * filterSize)) + goto nomem; xDstInSrc = ((dstPos*(int64_t)xInc)>>8) - ((srcPos*0x8000LL)>>7); for (i = 0; i < dstW; i++) { @@ -425,9 +426,8 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, filterSize = FFMIN(filterSize, srcW - 2); filterSize = FFMAX(filterSize, 1); - FF_ALLOC_ARRAY_OR_GOTO(NULL, filter, - dstW, sizeof(*filter) * filterSize, fail); - + if (!FF_ALLOC_TYPED_ARRAY(filter, dstW * filterSize)) + goto nomem; xDstInSrc = ((dstPos*(int64_t)xInc)>>7) - ((srcPos*0x10000LL)>>7); for (i = 0; i < dstW; i++) { int xx = (xDstInSrc - (filterSize - 2) * (1LL<<16)) / (1 << 17); @@ -525,8 +525,8 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, if (dstFilter) filter2Size += dstFilter->length - 1; av_assert0(filter2Size > 0); - FF_ALLOCZ_ARRAY_OR_GOTO(NULL, filter2, dstW, filter2Size * sizeof(*filter2), fail); - + if (!FF_ALLOCZ_TYPED_ARRAY(filter2, dstW * filter2Size)) + goto nomem; for (i = 0; i < dstW; i++) { int j, k; @@ -684,8 +684,8 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, // Note the +1 is for the MMX scaler which reads over the end /* align at 16 for AltiVec (needed by hScale_altivec_real) */ - FF_ALLOCZ_ARRAY_OR_GOTO(NULL, *outFilter, - (dstW + 3), *outFilterSize * sizeof(int16_t), fail); + if (!FF_ALLOCZ_TYPED_ARRAY(*outFilter, *outFilterSize * (dstW + 3))) + goto nomem; /* normalize & store in outFilter */ for (i = 0; i < dstW; i++) { @@ -721,10 +721,13 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, } ret = 0; - + goto done; +nomem: + ret = AVERROR(ENOMEM); fail: if(ret < 0) av_log(NULL, ret == RETCODE_USE_CASCADE ? AV_LOG_DEBUG : AV_LOG_ERROR, "sws: initFilter failed\n"); +done: av_free(filter); av_free(filter2); return ret; @@ -1417,7 +1420,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, c->chrDstW = AV_CEIL_RSHIFT(dstW, c->chrDstHSubSample); c->chrDstH = AV_CEIL_RSHIFT(dstH, c->chrDstVSubSample); - FF_ALLOCZ_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail); + if (!FF_ALLOCZ_TYPED_ARRAY(c->formatConvBuffer, FFALIGN(srcW * 2 + 78, 16) * 2)) + goto nomem; c->srcBpc = desc_src->comp[0].depth; if (c->srcBpc < 8) @@ -1657,10 +1661,11 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, return AVERROR(ENOMEM); } - FF_ALLOCZ_OR_GOTO(c, c->hLumFilter, (dstW / 8 + 8) * sizeof(int16_t), fail); - FF_ALLOCZ_OR_GOTO(c, c->hChrFilter, (c->chrDstW / 4 + 8) * sizeof(int16_t), fail); - FF_ALLOCZ_OR_GOTO(c, c->hLumFilterPos, (dstW / 2 / 8 + 8) * sizeof(int32_t), fail); - FF_ALLOCZ_OR_GOTO(c, c->hChrFilterPos, (c->chrDstW / 2 / 4 + 8) * sizeof(int32_t), fail); + if (!FF_ALLOCZ_TYPED_ARRAY(c->hLumFilter, dstW / 8 + 8) || + !FF_ALLOCZ_TYPED_ARRAY(c->hChrFilter, c->chrDstW / 4 + 8) || + !FF_ALLOCZ_TYPED_ARRAY(c->hLumFilterPos, dstW / 2 / 8 + 8) || + !FF_ALLOCZ_TYPED_ARRAY(c->hChrFilterPos, c->chrDstW / 2 / 4 + 8)) + goto nomem; ff_init_hscaler_mmxext( dstW, c->lumXInc, c->lumMmxextFilterCode, c->hLumFilter, (uint32_t*)c->hLumFilterPos, 8); @@ -1728,8 +1733,9 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, goto fail; #if HAVE_ALTIVEC - FF_ALLOC_OR_GOTO(c, c->vYCoeffsBank, sizeof(vector signed short) * c->vLumFilterSize * c->dstH, fail); - FF_ALLOC_OR_GOTO(c, c->vCCoeffsBank, sizeof(vector signed short) * c->vChrFilterSize * c->chrDstH, fail); + if (!FF_ALLOC_TYPED_ARRAY(c->vYCoeffsBank, c->vLumFilterSize * c->dstH) || + !FF_ALLOC_TYPED_ARRAY(c->vCCoeffsBank, c->vChrFilterSize * c->chrDstH)) + goto nomem; for (i = 0; i < c->vLumFilterSize * c->dstH; i++) { int j; @@ -1748,7 +1754,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, } for (i = 0; i < 4; i++) - FF_ALLOCZ_OR_GOTO(c, c->dither_error[i], (c->dstW+2) * sizeof(int), fail); + if (!FF_ALLOCZ_TYPED_ARRAY(c->dither_error[i], c->dstW + 2)) + goto nomem; c->needAlpha = (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat) && isALPHA(c->dstFormat)) ? 1 : 0; @@ -1838,6 +1845,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, c->swscale = ff_getSwsFunc(c); return ff_init_filters(c); +nomem: + ret = AVERROR(ENOMEM); fail: // FIXME replace things by appropriate error codes if (ret == RETCODE_USE_CASCADE) { int tmpW = sqrt(srcW * (int64_t)dstW);