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 5180040BE3 for ; Tue, 8 Mar 2022 12:49:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75E7268AF00; Tue, 8 Mar 2022 14:49:35 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2448268AB48 for ; Tue, 8 Mar 2022 14:49:29 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 7C2EE240179 for ; Tue, 8 Mar 2022 13:49:28 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ZSoFUgHwyz_z for ; Tue, 8 Mar 2022 13:49:28 +0100 (CET) Received: from lain.red.khirnov.net (lain.red.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.red.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id F22D92400F5 for ; Tue, 8 Mar 2022 13:49:27 +0100 (CET) Received: by lain.red.khirnov.net (Postfix, from userid 1000) id 54D0C1601AD; Tue, 8 Mar 2022 13:49:28 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220306153939.5285-1-jamrial@gmail.com> References: <20220306153939.5285-1-jamrial@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Tue, 08 Mar 2022 13:49:28 +0100 Message-ID: <164674376831.19727.10448729510669371223@lain.red.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/hevc_refs: don't use the frame's AVBufferRef sizes when initializing planes 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: Quoting James Almer (2022-03-06 16:39:39) > Use the actual plane sizes instead. > > Signed-off-by: James Almer > --- > libavcodec/hevc_refs.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c > index 35b8e5e696..b0035356ac 100644 > --- a/libavcodec/hevc_refs.c > +++ b/libavcodec/hevc_refs.c > @@ -22,6 +22,7 @@ > */ > > #include "libavutil/avassert.h" > +#include "libavutil/imgutils.h" > > #include "thread.h" > #include "hevc.h" > @@ -401,9 +402,16 @@ static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc) > > if (!s->avctx->hwaccel) { > if (!s->ps.sps->pixel_shift) { > - for (i = 0; frame->frame->buf[i]; i++) > - memset(frame->frame->buf[i]->data, 1 << (s->ps.sps->bit_depth - 1), > - frame->frame->buf[i]->size); > + size_t sizes[4]; > + ptrdiff_t linesizes[4]; > + for (i = 0; i < 4; i++) > + linesizes[i] = frame->frame->linesize[i]; > + if (av_image_fill_plane_sizes(sizes, frame->frame->format, frame->frame->height, linesizes) < 0) { > + ff_hevc_unref_frame(s, frame, ~0); > + return NULL; > + } > + for (i = 0; frame->frame->data[i]; i++) > + memset(frame->frame->data[i], 1 << (s->ps.sps->bit_depth - 1), sizes[i]); wouldn't it be simpler and shorter to use linesize[i] * (height >> sps->vshift)? -- Anton Khirnov _______________________________________________ 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".