From patchwork Mon Dec 26 11:33:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2612094pzb; Mon, 26 Dec 2022 03:33:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5LmAySb/uxlQCgz3TkTKxmHCk12oVXsrh/TWyAVk2I+rg8dFQJ5vgRNnRbQFMl8UdnB7w X-Received: by 2002:a17:906:2813:b0:7c0:f9ef:23a2 with SMTP id r19-20020a170906281300b007c0f9ef23a2mr18547579ejc.30.1672054433876; Mon, 26 Dec 2022 03:33:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672054433; cv=none; d=google.com; s=arc-20160816; b=spPW4Vmq/742Iy/19R5+pmrFczp+EJBhEYNIGVuD3sejLUs4qrqddeNtwmrSDE1Cgf 00wLbYlzctXTkVRUrQzE2um9v0N3J686r1aaAG1gbBh1wG4JFSzQP6fmuhLpyt6cCWeO 1G1hM4O/uPzj91LKPWqMU9wJOziXVwqvRT071a+5pdWoMwQTdOOs8fJI7Sr6ceTX+dax cdijVtUCr4ZEp6bjn7V7ShocTyRucM932jIBlhnDgLgHTI9X3bUhJlJ0nCTgm6w3tZ7r XlN086IVQzhcIVhmukFNvlkQaBw+DhCY1m14fTBuzpilplIP9NyxmcNF1moutTlA6h6x 9TXA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=oVFIEc0KtPz2B6BV0+656uvO2/rxmAZiIl9uWZAO6sM=; b=Ky6uWAao3pM/4qMQh6H5u6zAHtbBUfXZ/9F/Tdvsclyk9/ZNkS7w9XCOSgTWD7bOEt YFL9lrQvnkjHW6IfwIBVEdbgbrwVwXF/bFUMWTAY22F2SeUdBbwGSzOQfiOChlGy7b4r YOLVOxwjexHK0uup4CqrAOemWCQ1m/WuqBXp3XuwG+dIbLQrSYcBPP3LowH2bFtuMzGm N49gwUkHpWjRhCgc4HzgJdaHEeIG/dfe1SUJPJUszObODLbFIicntPlfmAr4OcO+4L4Q 7P9z4YIJrf2DcNuUtHZndPt2TR8pJCY+U0WivDX3tjdVOADtyFDvrNO9QEzGstp/bZR5 mcWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TseNSjUh; 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 nb31-20020a1709071c9f00b0082b07d48ce3si9399118ejc.495.2022.12.26.03.33.53; Mon, 26 Dec 2022 03:33:53 -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=TseNSjUh; 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 7E4CD68ACF0; Mon, 26 Dec 2022 13:33:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D31268AD79 for ; Mon, 26 Dec 2022 13:33:43 +0200 (EET) Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-1443a16b71cso12323616fac.13 for ; Mon, 26 Dec 2022 03:33:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=cTjxYNatcGDlzsCad+PGUahuBGWg0Tno4GQg+iVwJkA=; b=TseNSjUhSmPWXuVfGvvgwxVPY8Dr2tEf/PltKstTCNCPuW4IsCvJNvb5EZJdFtXraq GtW+OK1sdaNQxFpW07G0BlIdZyF7lOvWh+Eiveyk+44kgknarxvtCnDPnH2Cxsq93JTb yzI02aB4FmjecLl//2CbCzlmhBNHCa/06gQCfOfgPkerqXoMy6Z52qImpF695f3+0whB Rjv33HHca5TIhnyoyao8LeNO70dIAt24Mv4dH65a3n6TnkHxtYcdtbVGirjnBXH4aYqL njxjffTjkOSeegErTBEpqsdCnNgetCRjcoqr/KKrSDLtCglO22HJh6/8EdXjsbVvxLIx 9EHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=cTjxYNatcGDlzsCad+PGUahuBGWg0Tno4GQg+iVwJkA=; b=HK3e24tr3w+jZ+7TV+g0yR/64VJfCP0TCYbLTS6G+YtXmN/WZtW9c6LzVq3XeJnDac 9wxMMu3JKAvcVytTztAZ1s7T811J8IWjqEnx7x+2gmW4WvhF7Kl9x5Cd9+p0mglq28Z3 O7hK5dCOO5h4422c04Hvzt5U/Thtrkd5KQzd/wvVitkZveQ+LlBlEakB214xMI2IsRWN bHynjn+OEhbluJBklwa4xTuFwGvkXqwpHXjl7yDFUUBjL+CXNttSwLfMsJHBfxhWc5Z1 k6Fu16j+hgU16eYvAMtPRWUdnkynYMFKyyOZytArTPOC5VLCYgTIRVXbPiV0w12S1AEc GB+w== X-Gm-Message-State: AFqh2kpJ37vlvLwiqux6iRCUtSwM4THLWSqrGOKTblUKr28ehdG7ZSZN IlS5hEFSICYj0hm1SzinmUpsx774CAw= X-Received: by 2002:a05:6870:46ac:b0:144:c5e3:643a with SMTP id a44-20020a05687046ac00b00144c5e3643amr12650206oap.4.1672054421649; Mon, 26 Dec 2022 03:33:41 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id w36-20020a4a97a7000000b0049f5ce88583sm4262068ooi.7.2022.12.26.03.33.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 03:33:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Dec 2022 08:33:52 -0300 Message-Id: <20221226113352.180-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegbdec: return the amount of bytes consumed when discarding frames 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: eO3nTwjLarmL EAGAIN is not correct in this scenario. FFCodec.cb.decode() callback decoders always return the amount of bytes consumed from the input packet (if any), and report if a frame was generated by setting got_frame. Signed-off-by: James Almer --- libavcodec/mjpegbdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index a82a95d70a..6d422e7a29 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -144,7 +144,7 @@ read_header: av_frame_move_ref(rframe, s->picture_ptr); s->got_picture = 0; if (avctx->skip_frame == AVDISCARD_ALL) - return AVERROR(EAGAIN); + return buf_size; *got_frame = 1; if (!s->lossless && avctx->debug & FF_DEBUG_QP) {