From patchwork Thu Dec 8 14:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39655 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp342153pzb; Thu, 8 Dec 2022 06:07:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf5QPRYhERzk9TRbv76sQ3pz+U4R5ucwIfbo9VllQUNqod/yx4Fo6VUVpDcRTtToOOrfhYfp X-Received: by 2002:a17:906:4406:b0:7c1:1de6:d25f with SMTP id x6-20020a170906440600b007c11de6d25fmr1775393ejo.31.1670508476381; Thu, 08 Dec 2022 06:07:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670508476; cv=none; d=google.com; s=arc-20160816; b=1IyBTwp/r07JgLqPW5nh22uk/FORp1EIr5345hnojZ2a3Fvz29QHWAyI4aGJ1Wzi5v J7Tx0bvsmNs5I6mvmbnOPu2nMPgxfIBzjzhw/1sNXsfn1objFvgqHXxQ6H4YmcEXYaOw T/mnK5OJBbltkVExWL/h2fj6IeZ+bOvqesSc3nJPCCPjpNZXspf95aZWLG6IL29F4gcw rTCS1HrXhFvYt25Qqi3AWnSmN9bNczSqa0o6JL0pAV5upUnnUDKgV3BHos5SAkBYE/iy 5DfA1w1FaL1JEzjjvuxG4PbQLRHtYYiBKufKJTNs8lZbaVR+qFB60A/kJsN8bZYANnVO Jddw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=yMiLxv+B6Mj63yqrLEHdBGGhxRoi5z3J1ggZXVORzNE=; b=o2xYwNX8XsD7PwRqesyC3sYrPnyPaGR1NaU+i7E1GcP3Lq2GsqfXrL4TSAvX5fFe0k dXDEFb64xkUBQuY0J0/EZrOkGiuUQ1DqmPqHSxXQteZgd3juZFY5kcIDaptFuz93WEiz GLeyV4cqbHfx3bf4XudQ1YA3vg2+wJmqn7dYbMBRR2xAJvuLAQQq+ut7JZi3G/hkrxSs 0ZeVoZ5MYvTMHqLGS4Mi5zHt7uRGyDG4gj1G4INTIsMU5nCE30HOH2p0zfLyD/GLmP+u 0fZT/kGoYk5NHfl1XlI42dzmgpitVrR2X6DPtxPodQzCNM6WduTnWFht1JTlgBjm/qh+ xE1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=MUxMT6co; 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 dm5-20020a170907948500b007a46fa50b26si19056457ejc.517.2022.12.08.06.07.56; Thu, 08 Dec 2022 06:07:56 -0800 (PST) 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=20210112 header.b=MUxMT6co; 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 B640668BA5C; Thu, 8 Dec 2022 16:07:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEBF668A37E for ; Thu, 8 Dec 2022 16:07:25 +0200 (EET) Received: by mail-oi1-f182.google.com with SMTP id m204so1494944oib.6 for ; Thu, 08 Dec 2022 06:07:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=F8QlZecSCaezfrpgPYe188P94YtXK+fGwqVdd3IBYUs=; b=MUxMT6cofVLeGmUmyHGm4oInNwFQEpuEfEVE1MeBmbLJ5dfzelW4HfyK+Y+bj6G7YL E6t876Wfy/YPlTeuOy03gqDuoK7cGEeKrKjTry/nWW0wz5kD6Qd05uj6Mlu+0D230KrQ R4cgICxQHYeRZ1cprQH29MY6XFrV+z59LpJFCOyxZafHQVbJAxlet/+F01C8akJ4OJm2 T35T64D4xSgh+EH3Gj+KAIrfPhgnGzuBSeufnkO6PJ7+pDX6w7eXnbGJ+pe41YrZUIvK pvNWR4QZ/XeaNIy0kiXxBbDbfjomMXb/oy/KF6H9y0lIC5gIm6MGeIzUHlsulFe8WgMF u8LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F8QlZecSCaezfrpgPYe188P94YtXK+fGwqVdd3IBYUs=; b=t4XNZaZZtexyaOaMbk4XKV3N00L58Wt4Esj2XJitBd4bsXBoax5w144lLjkzzHJ3jZ zdfopDvIO47YLFvC5QfZB+7P3fzW3uvu6YwOFqSqjEZd3Tjf9/ECnReYuo/M3nkUunBp Vzm2CG4qtasTffSitB7JVurLM0EqMJo8U/iJBCu0Hddo2IsrZd8GO2UUIIZVDcZzhENM 21mddzszwvcDQPkXFJKVQA4HckGxvMQN9gtnIrYek17qFouB9J0K7Iua1XKhchKvbscQ +zuf3mVdne5tqmxsfJgjUMMUJVuFHq4mbLLqRKPYi8uJMrFE834Ki+bFSFLrDVkHqps/ itoA== X-Gm-Message-State: ANoB5plFQQAZIZPL7whMQble+eXWm5CniWCguo52UkGm+IkZ5XpXbv9C 03Hc3Iy3ywNzbiVHpqXZ9yS0zQjCpgE= X-Received: by 2002:aca:180f:0:b0:35b:e6e7:8dd with SMTP id h15-20020aca180f000000b0035be6e708ddmr921880oih.24.1670508444019; Thu, 08 Dec 2022 06:07:24 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e29-20020a544f1d000000b0035aa617156bsm10672553oiy.17.2022.12.08.06.07.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 06:07:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Dec 2022 11:07:04 -0300 Message-Id: <20221208140706.3086-3-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208140706.3086-1-jamrial@gmail.com> References: <20221208140706.3086-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/libdav1d: don't use AVCodecInternal.in_pkt 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 53QjZl6RYrxy Allocate an AVPacket instead, which will be used in the following commit. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 028929404e..f98f351e49 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -41,9 +41,6 @@ typedef struct Libdav1dContext { AVClass *class; Dav1dContext *c; - /* This packet coincides with AVCodecInternal.in_pkt - * and is not owned by us. */ - AVPacket *pkt; AVBufferPool *pool; int pool_size; @@ -219,8 +216,6 @@ static av_cold int libdav1d_init(AVCodecContext *c) #endif int res; - dav1d->pkt = c->internal->in_pkt; - av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version()); dav1d_default_settings(&s); @@ -306,17 +301,22 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) int res; if (!data->sz) { - AVPacket *const pkt = dav1d->pkt; + AVPacket *pkt = av_packet_alloc(); + + if (!pkt) + return AVERROR(ENOMEM); res = ff_decode_get_packet(c, pkt); - if (res < 0 && res != AVERROR_EOF) + if (res < 0 && res != AVERROR_EOF) { + av_packet_free(&pkt); return res; + } if (pkt->size) { res = dav1d_data_wrap(data, pkt->data, pkt->size, libdav1d_data_free, pkt->buf); if (res < 0) { - av_packet_unref(pkt); + av_packet_free(&pkt); return res; } @@ -325,7 +325,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) data->m.duration = pkt->duration; pkt->buf = NULL; - av_packet_unref(pkt); + av_packet_free(&pkt); if (c->reordered_opaque != AV_NOPTS_VALUE) { uint8_t *reordered_opaque = av_memdup(&c->reordered_opaque, @@ -343,8 +343,9 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) return res; } } - } else if (res >= 0) { - av_packet_unref(pkt); + } else { + av_packet_free(&pkt); + if (res >= 0) return AVERROR(EAGAIN); } }