From patchwork Sat May 20 17:23:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41748 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp666953pzb; Sat, 20 May 2023 10:23:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7LZPQoRV7ruETUQb0Wd2C3DZBwo6ixhNU3zUxss/GkZoAwAI4UYSC7IBDdkCODZsVqRX+9 X-Received: by 2002:a17:907:3fa8:b0:96f:6c70:c012 with SMTP id hr40-20020a1709073fa800b0096f6c70c012mr6563453ejc.45.1684603406202; Sat, 20 May 2023 10:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684603406; cv=none; d=google.com; s=arc-20160816; b=qMyfQU7JMZD+Lq8W0QQJNfxJKyZwulMk/6sKQ1KKzAafGAb2hl+jNIkg9PjtavjboN Y9kGNSJXezU812yXgg75doytr80WCcjXyW7ah3EFTRknfHLjR0wHSlLyMv5cG2j4j4jd u/xRsUdcYnoaTGxvoRE364jle7a0y53xOp7EjUiVlC9YXWgrCPGOsgqD1oQKIsG7uZTu 4Y3+HffkRDNs/8aqfvVVQ/cICMS3oPfjd354UdHSc9ekLl1siH4H0ON9SmUQJIcyTCXk HOg1ugrxW8NeoQumYW+bCD7tYpBlJB8uXsSL1YbeKSpE4hjJvWO4YXL2ZSRPoDSs7LTN WAag== 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=dt+s8efVvkGRXcJfKsTu11ND/RQhko4H0bYtVM4Y7Bw=; b=hZKHe1enQ1lhiRMY33nvtPdC63W6BAnywlkPOw82N4K5IylFdC/ad8xmWjAbSAKhvW K6NTuOSbraymH7JZFr73BbkfoBDaZyzyfQz1sVJ3Nr5XhGZDKUD5h2Jhwg0vfLhM20lS N3o6FzCEa143ZAqv9wlZ03kDN5ktuJJoLzmro/d7NX/T7aZY4aQsA0KLRaFFrnyHrKC2 ZQ5C1iTg5VL2CNq/2MEehJRIQMfprTMr4P1zZSk07c0/g+ajUCkacDdL+ElYjgToKFRl tfQ1VrjAmNeA/KEsq0mfZSy5O/ykVvkPeSrEnxISv82XNIECHFTK87rsfZ3RErAzJgSJ MZeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Hc47cSkv; 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 hz12-20020a1709072cec00b009660febfbd9si1466757ejc.433.2023.05.20.10.23.25; Sat, 20 May 2023 10:23:26 -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=20221208 header.b=Hc47cSkv; 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 D7A1768C177; Sat, 20 May 2023 20:23:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5966B68C084 for ; Sat, 20 May 2023 20:23:16 +0300 (EEST) Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-3944816b579so2480672b6e.1 for ; Sat, 20 May 2023 10:23:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684603394; x=1687195394; 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=ItFsqA+oDwoeXAVZB/PfdBYjzvcJXC/nA2XSR4TtwBo=; b=Hc47cSkvzd93YilspJGTIG/IxCkHtqp0NMh/Ct6XdK1ypI1WvkNVKezfbN6eK7wsLG uQFJxwewKRzmcAxO9N2Inc78+oSonGHiLZIaYZT7KN3Z6gqdsGtUgWk8z8U3fsdI5i6L ybdCj9r6qP7YCoGvsZX28NIDZW3qASUKhtBFlGHGRq9XSb3aqXVgnSuJFOWh4CXlGzHm wf3GBrwRiQMH8IuSVbxqccubvzrQ6jGHzI4mcvjwx/9sadrKdsZM1ijS85GTVrGmnn4L HUiTnI4U/3GUdg2B7PsoeyDYG/6avQZEzsm7hXOwrhWv/NX2D2rqs+fYXfu1uTu54Tmq HULA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684603394; x=1687195394; 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=ItFsqA+oDwoeXAVZB/PfdBYjzvcJXC/nA2XSR4TtwBo=; b=CH8LsyJ9FcAR0FJ2g6e1Zbtp8Sde9TAoSDyStOpAQPqvwnmn//kzAhN+YkjFXtRAqb QiQxGMrg0Ir0PIhMiZjGvDFHboPfF3Pdpt0JWJEq6femBLxdYYr12u+lNHG1Gg11sive HLXf6UVxSRMlsjETmvczkcaNWo/58MUs/Cqy6R6BLxwgzecoWUxyzk3oSJkXQy8+HV5p h5ubRpiLRUFvQZfaHFXEQaidG3flQ3OVoDpsG0e3uhAxbYbvHb7ta3NyFYkdu9eT3d5r /D7Am4CLzobNqcO4jtoK/5P0a1FtDA6E4Rpe5loP1Jh97IZYoEhuYI9IehVyas0GnN+y qR+g== X-Gm-Message-State: AC+VfDxyK0XMBrS4O/SF2O167ZJ/oaApaA8n609H1ollB6bdoqtfL4un 6Of7Bg5PWVfaKc1S8OVwvu1xt4AcLfc= X-Received: by 2002:a05:6808:30d:b0:395:dc46:fe06 with SMTP id i13-20020a056808030d00b00395dc46fe06mr2770458oie.7.1684603394671; Sat, 20 May 2023 10:23:14 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id dn4-20020a056808618400b0039638fc47f9sm762600oib.32.2023.05.20.10.23.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 10:23:14 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 May 2023 14:23:12 -0300 Message-Id: <20230520172312.2384-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <168460113505.3843.12020239738668177718@lain.khirnov.net> References: <168460113505.3843.12020239738668177718@lain.khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: only return EAGAIN when there are no buffered packets 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: DZAtL/sCL/gf Fixes decoding packets containing split temporal units, as generated for example by the av1_frame_split bsf. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index c15e98cbd1..f72ecf3d8a 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -316,20 +316,14 @@ static void libdav1d_user_data_free(const uint8_t *data, void *opaque) { av_packet_free(&pkt); } -static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) +static int libdav1d_receive_frame_internal(AVCodecContext *c, Dav1dPicture *p) { Libdav1dContext *dav1d = c->priv_data; Dav1dData *data = &dav1d->data; - Dav1dPicture pic = { 0 }, *p = &pic; - AVPacket *pkt; - OpaqueData *od = NULL; -#if FF_DAV1D_VERSION_AT_LEAST(5,1) - enum Dav1dEventFlags event_flags = 0; -#endif int res; if (!data->sz) { - pkt = av_packet_alloc(); + AVPacket *pkt = av_packet_alloc(); if (!pkt) return AVERROR(ENOMEM); @@ -341,6 +335,8 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) } if (pkt->size) { + OpaqueData *od = NULL; + res = dav1d_data_wrap(data, pkt->data, pkt->size, libdav1d_data_free, pkt->buf); if (res < 0) { @@ -400,12 +396,33 @@ FF_ENABLE_DEPRECATION_WARNINGS if (res < 0) { if (res == AVERROR(EINVAL)) res = AVERROR_INVALIDDATA; - else if (res == AVERROR(EAGAIN) && c->internal->draining) + else if (res == AVERROR(EAGAIN)) { + if (!c->internal->draining) + return 1; res = AVERROR_EOF; - - return res; + } } + return res; +} + +static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) +{ + Libdav1dContext *dav1d = c->priv_data; + Dav1dPicture pic = { 0 }, *p = &pic; + AVPacket *pkt; + OpaqueData *od = NULL; +#if FF_DAV1D_VERSION_AT_LEAST(5,1) + enum Dav1dEventFlags event_flags = 0; +#endif + int res; + + do { + res = libdav1d_receive_frame_internal(c, p); + if (res < 0) + return res; + } while (res); + av_assert0(p->data[0] && p->allocator_data); // This requires the custom allocator above