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 3E180464C9 for ; Sat, 20 May 2023 13:21:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF29768C141; Sat, 20 May 2023 16:21:15 +0300 (EEST) Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E7B268BF9B for ; Sat, 20 May 2023 16:21:10 +0300 (EEST) Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6ab1a20aa12so2929026a34.1 for ; Sat, 20 May 2023 06:21:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684588868; x=1687180868; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=1LkU0cqNRXjNL2Tw0+zGJqjGLOnbZhK5bxvwz3scO8I=; b=Gr1Sq0naVKK0RlRU1O4d5U2ukwl/ZakotQu9z0zVsZonEGCz7KEE4S8MfBxbU9msOv oJiqFokHsyvl1YiQBTBfXJ8rWclN25R5C3svZ62nSOx28rY8I1sYXiH5ksv8c5N2BPAY GSiVE+grW9aCI6kvhXCebOoDeQNNpX3P9bPyflj5+cScMZ9zdCIsifj3Y9ocqEsWF+D9 GsH0Ev1iJWfkba2WJIMxd3C3GmDUfhS+y7/etaYoXrxinrbj1bI4awirq6h3jizGw2rG QU0AbegGmp27c1Dc2eC5iI0ZLSwsSL5qaQpH1ZXqV5gpSaTs9ST9nlqRFvefvPmyzbrz 5JVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684588868; x=1687180868; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1LkU0cqNRXjNL2Tw0+zGJqjGLOnbZhK5bxvwz3scO8I=; b=DdVpLsmBPPcX7SAqUkK04sFMwYi12Vz8Jt1LB9jZgNhj7E4PXydUvqI26d4WMP2HwX cCvSC6pNPwNsGxOdfVa7b1aIFPP3iSEu1EJl2DI3duB4wpYMGDNlmNxCDMHSgcMvnU6e NzedLUM7Ty64mQussb+wEb9TQv6SvBNaojM5+17zLhLSAZb5BwldTyfUDUzLCfaEfwp6 U1eGajDwfeIej6v8BJLhVrc/AlrEl1SlRIdaDSqwjYJrWAYfilC1iQGBKCV7IaKxN8mG l3UrS+lXMqUv+sqjeHEn9Jcy067fXPKoOTGJg/E6VEYYt85eaUqjzAw0mcp85B4rmFHY yWiQ== X-Gm-Message-State: AC+VfDzDKma6I6JJZ/xyqWr95TbabCvV4MFRNv2tlFEcm7cMplOE1pMO IXSZ7fY0T5FnebWXjk1I9yEHtbjyZB4= X-Google-Smtp-Source: ACHHUZ4Wo/o1U1Hof2wmZUGmnE4szwnuml0QHa4qBpaWCg7xxj0P0HMwnTrQqolzXdv1RrPBPPQ15w== X-Received: by 2002:a05:6830:1256:b0:6a6:5716:c6b9 with SMTP id s22-20020a056830125600b006a65716c6b9mr3130910otp.24.1684588867980; Sat, 20 May 2023 06:21:07 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e26-20020a05683013da00b006ac75cff491sm589653otq.3.2023.05.20.06.21.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 06:21:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 May 2023 10:21:13 -0300 Message-Id: <20230520132113.1855-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 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 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: 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index c15e98cbd1..55ea9166b6 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -328,6 +328,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) #endif int res; +again: if (!data->sz) { pkt = av_packet_alloc(); @@ -398,10 +399,12 @@ FF_ENABLE_DEPRECATION_WARNINGS res = dav1d_get_picture(dav1d->c, p); if (res < 0) { - if (res == AVERROR(EINVAL)) - res = AVERROR_INVALIDDATA; - else if (res == AVERROR(EAGAIN) && c->internal->draining) + if (res == AVERROR(EAGAIN)) { + if (!c->internal->draining) + goto again; res = AVERROR_EOF; + } else if (res == AVERROR(EINVAL)) + res = AVERROR_INVALIDDATA; return res; } -- 2.40.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".