From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 88C094228C for ; Tue, 1 Mar 2022 14:30:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 337D568B266; Tue, 1 Mar 2022 16:30:09 +0200 (EET) Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80E5168B0C4 for ; Tue, 1 Mar 2022 16:30:03 +0200 (EET) Received: by mail-yb1-f181.google.com with SMTP id g26so1932738ybj.10 for ; Tue, 01 Mar 2022 06:30:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=tt+LH3HXiBaNAGyvRUzjchxnLUL5iFnFI7SIv8aDC68=; b=Ehpe0NKm2SGvflafu/G+rExB3yW3g0kSkJ47UbjQMDvbzDO/wORfWH7SaGJC1XfOvQ x3eTSwG80DgroltQmjhnzQZYEbvFgli0zrUtTmqIxu8rG/epGjB4nkC3gk2k0JxNJZGu X221auy/1jtIV6J/VD6wzXA4nD5HvCoFPaL6/oI8gUltUDyYxycsrGUggZr5lsqJGP4/ /56k4wUmnjcR1igrqOgZXyOErqd+i8tU4u6mSBs2LA1agRa1wsxykvZ8qS/PBZ46K8jL rvASvGYFigaYSs03jzcgkhufwM2i4eVj9r45xGCq9E59gjrhfQO67oVWsRziRdxRnhCz 3zjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=tt+LH3HXiBaNAGyvRUzjchxnLUL5iFnFI7SIv8aDC68=; b=BsLBs+6Ml7PlvQirHXZ+97h3y91tEtY28XeDFRvlSL8JuFE4SXosLbXYSJnpQwQeX0 mmdgUCwNwCAcKR1RqZrdEZRbDOIzr/eHVNonFE0E0PQp0O9vozmbF7qNIR9ikmM2QqGI y45v4PoxzOcyPgtvQOH0WwhcAPxGeorHR98vMsiA4Ohsxitue8lvD8Abkak60DoXyrFf 7MRkW7o7QgEcWA4KaeH5DOfm9XjIVPlCWC2YwXwpDbLZPu72fdB4xwPi/8bRYrK8dJJA 6xyPpgg2sSMtfsdH1uC5NnTl1tnPw3ytEH4xjYpdrY9KaUzjnuAQ6Mip5AUNedAgawsD DYig== X-Gm-Message-State: AOAM530JnV+q/RgALJAwQKu6TsJL7giDq1tc7KaSrVfsZ4NjxY1H+NFC fnmxopEJZTDX0UOcgOt7wdaldTQpUyTnrX9QpC5jnClpHQA= X-Google-Smtp-Source: ABdhPJzMz8L+52npCf4Xa3fFPryacJaUmWcAQFYCnFG5CyppJeJ6OM+si9PqVFTFQiuGS5x0UP91tyD9HVhX92k11VA= X-Received: by 2002:a25:ae92:0:b0:621:114b:f627 with SMTP id b18-20020a25ae92000000b00621114bf627mr24405759ybj.49.1646145002018; Tue, 01 Mar 2022 06:30:02 -0800 (PST) MIME-Version: 1.0 References: <20220301142310.16367-1-jamrial@gmail.com> In-Reply-To: <20220301142310.16367-1-jamrial@gmail.com> From: Paul B Mahol Date: Tue, 1 Mar 2022 15:31:41 +0100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] avfilter/framepool: use av_image_fill_plane_sizes() to calculate pool sizes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Tue, Mar 1, 2022 at 3:23 PM James Almer wrote: > Signed-off-by: James Almer > --- > libavfilter/framepool.c | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c > index 5b510c9af9..cf6a1d0ea0 100644 > --- a/libavfilter/framepool.c > +++ b/libavfilter/framepool.c > @@ -57,6 +57,8 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* > (*alloc)(size_t size), > int i, ret; > FFFramePool *pool; > const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); > + ptrdiff_t linesizes[4]; > + size_t sizes[4]; > > if (!desc) > return NULL; > @@ -89,13 +91,19 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* > (*alloc)(size_t size), > } > } > > - for (i = 0; i < 4 && pool->linesize[i]; i++) { > - int h = pool->height; > - if (i == 1 || i == 2) > - h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h); > + for (i = 0; i < 4; i++) > + linesizes[i] = pool->linesize[i]; > > - pool->pools[i] = av_buffer_pool_init(pool->linesize[i] * h + > align, > - alloc); > + if (av_image_fill_plane_sizes(sizes, pool->format, > + FFALIGN(pool->height, align), > This is not needed for height. Original reporter never posted valgrind report of bug. > + linesizes) < 0) { > + goto fail; > + } > + > + for (i = 0; i < 4 && sizes[i]; i++) { > + if (sizes[i] > SIZE_MAX - align) > + goto fail; > + pool->pools[i] = av_buffer_pool_init(sizes[i] + align, alloc); > if (!pool->pools[i]) > goto fail; > } > -- > 2.35.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".