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 2598840AAA for ; Sun, 6 Mar 2022 15:40:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 58A5968B056; Sun, 6 Mar 2022 17:40:41 +0200 (EET) Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C7AB68A351 for ; Sun, 6 Mar 2022 17:40:35 +0200 (EET) Received: by mail-ot1-f45.google.com with SMTP id k9-20020a056830242900b005ad25f8ebfdso11266026ots.7 for ; Sun, 06 Mar 2022 07:40:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=MVwquR+yEzqJ5N5DTGs7KXiBOhndYLE8J7ZatIOPI98=; b=KsjiAqcj1YQTq24IRi7djpBAFue8OzxGfgVbkzE3wDXtO/f2hjByMhX9hbDcVysX/P S3YcajEZMvJIxQid8wFlSkweqjLkdrg7eoUPM6KIAoQ81Uirn/KDDlDczw3b8h9ngcFM MoTjbLywhexCyfVyIVZvWVJLuZXfjgpaSsZ+IkSoTHkMcZgKGuS7d07J3PBBH0+io+4y uKxTKpFfYkmscecMMPQmPDMaAvhQBzYahHiDAM5i9Vr912PWdPK/6zeJ56BfX9K5XSiH Dzjl8DK2+B7Qcg/it8ty+3DrZuZvzweSkx4/LLpiewMb5VYLfNrnSR7lDc+Lq9Gr/BFD zHVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=MVwquR+yEzqJ5N5DTGs7KXiBOhndYLE8J7ZatIOPI98=; b=gT3Eox5mSrsynpJeXt3LV5CsJHZxEKa6b7GtddVm6LrBxjYlmDka4z0XSvo9ic+F96 6sdmI/w4x2jQErzu6DU1Hr0rUwG4T6gg6gNEG7dMa6ev96DAQs4f4Rbo34xRfYeCXQWF tIPliON5uRV6xx5V4XlTrvIADRlnC7LWehoz/NAXrwMiYMxvL/wsQ79AsaRzHyzB6byH 40VezpXzgIIcucKJXgkCRriGWrJRkztU5YIc0tEB/DxdoTijLX6b+e+8FN6nDssQVxlU q3F/79enJVwd127JKsr3D4sTQk/M8RO1MrO0fgyTJWP4FcAdGpdj+CnQcNNJz7A1fTNA iYkw== X-Gm-Message-State: AOAM530G1lQPt2VbEUvImEOMCO9iVphOwrtUHRM3GwXCSwH9/ZEYJOb7 O2JU7ch7X5jg3Y/Aau5atMXWN2GQ5cx8zw== X-Google-Smtp-Source: ABdhPJx3DEnPJp+dV9Ml0wtsBI4TR2fJLj3BFsz1fJaD0vcR6O0pwH53btQbMLte7VHmsSkxkI3ztQ== X-Received: by 2002:a9d:6a44:0:b0:5af:1886:86ec with SMTP id h4-20020a9d6a44000000b005af188686ecmr3821854otn.333.1646581233346; Sun, 06 Mar 2022 07:40:33 -0800 (PST) Received: from localhost.localdomain ([181.23.70.178]) by smtp.gmail.com with ESMTPSA id a27-20020a4ae93b000000b0031be7c7d2d3sm4769953ooe.0.2022.03.06.07.40.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Mar 2022 07:40:32 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Mar 2022 12:39:39 -0300 Message-Id: <20220306153939.5285-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [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: 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]); } else { for (i = 0; frame->frame->data[i]; i++) for (y = 0; y < (s->ps.sps->height >> s->ps.sps->vshift[i]); y++) { -- 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".