From patchwork Wed Jul 12 02:06:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42608 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp1851678pzb; Tue, 11 Jul 2023 19:07:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlGzDfpNHv4DdNC6HAnq6SyTwyV0vx/ku86AwzLmLlIDGglLiM4BLgj6KKGRJrj/VdLvCqiB X-Received: by 2002:a17:906:9614:b0:98d:63c5:d147 with SMTP id s20-20020a170906961400b0098d63c5d147mr16532965ejx.47.1689127631002; Tue, 11 Jul 2023 19:07:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689127630; cv=none; d=google.com; s=arc-20160816; b=kTy7LmjWb8AMLmjGYQ9JEtzSFUvtj3c8ysymEx1zvgDnb0wlSkzVR9k1w9tczb4IJd GQyqBOWLVDwFlk8PnapbC877UBxxTr6PbtyikCA+BKfRNkpjT305S/YBcDw8qJ2/mHII Kh7jOD6QiX8MWhUyeWpbvSKElzqQ5H2y8iDd64VuNtu6OWFIGLuQLsv9ny/Q9h7zCDYr 9tJ4hE7GhYV+VOihj8HP34PKpnkrm38uYTlx5tvv8H9nchXpnSHVgOxwLOLn7GLtRXEy tlTqD4tLBCh75HsAu61vTqRIRyk8NpBrncLRyLsV4vz5vmlpv4sX9wkIRmyYn2XQKoJY Jgsg== 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=U7cfe+jUoem7id7xH9o4D/v0nLZXM22CXxPkCb0BXrA=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=09Y06oOqvz2B8FGzmiNFuBUUPbHFYz7fVAUl3oHXe36v7V/UDMilcaLU6gOtggJfHY zo0KYmQfk5iRQQDC8vgBwplHQd2y53Br5CQV/yWvDobn4Ab+p1Te6drckHBXF3yOQMI3 8+x/osMGvHekDCkasJHWbRQk+sBUiA1Gm5r/fjaXn1nlbcNJhgcYVHAGE744VHLbe5mH V2JvSTzGUo7qUqYtQBLMs8eTSBcnttcU5UF3sU3pz3zqq7NP/VkH8kvGm2l53huSeLWp 5P/R3pdGR3o/4lQRDVoIn4iTrCG/P0+2JVXB46rjyRh02HUko3Rzz2sV0FyF4Wlcb4rz qLng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=MtrprFFi; 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 s13-20020a170906060d00b009877bb42154si3507936ejb.465.2023.07.11.19.07.10; Tue, 11 Jul 2023 19:07:10 -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=MtrprFFi; 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 078F468C4F4; Wed, 12 Jul 2023 05:07:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15D7F68C324 for ; Wed, 12 Jul 2023 05:07:01 +0300 (EEST) Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3a1ebb79579so4839768b6e.3 for ; Tue, 11 Jul 2023 19:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689127619; x=1691719619; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ts3Rof5eQ9x5JZTIs+fqskPWu4kplFhrrdpuhTYScQg=; b=MtrprFFi6qD7P2Gb1dy7KtlxumLtSh7SCWJphMxSXu9q3dmFGyPN5YyKpgSnnq0MrL ZCam+tPl+TfYPeSgFVJ5LAzHfEHIEVdny7b/Z3uyQdzp/RsgkCtMVSP5kHAnNk53aNvY 8zWWczMFav+jxWAYyHQyiKTwA+AGUHWE8jsmMOi9U0iJlWP0JqzpLPM8AchLbRYI9SQO tDl7yiVSd2gRhK8Iu+kUyCSIFpQj0B0RROwCTYNI7GNF8SjxfF/9SuXSIwronpGI9kzZ QPpxeZoKYkEZCTyWQxALx+NQbZWQcE/B0qSiXfy3rVfg+uSPhlY8kjse8PWuchR9EbYg 96VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689127619; x=1691719619; 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=ts3Rof5eQ9x5JZTIs+fqskPWu4kplFhrrdpuhTYScQg=; b=eG8zEADTZ9E5jS0GJYSlGRiaZlOjY50EYDInXw29EltaDYur+NMOXetg+mxxUcfQdm 0aShIT54gGZeswqnEP4aR5yt/ZeS7A/UpECIQQJ/v5yU4JaXjcbsP6cUnbV7AnuEGRON oDQMP82bB5rIwnJP7p166mso9h/AMFAgHN6X26Cvo7ont36MNq6QPcGP2OwiOrGh44bY mLKTNnAdiS6/PkGLC8zo+YaRv+4ChA9TP3UxOO3OZB1D2PADmtF2PUjFIt+4WPkYr5Kk MuLZeZKU2nUlrAymrKX6oMZtXJJh7z6ZZEDpJRic3XB7D7R3nlTbLPsch+YLUrQuY/QA VkKg== X-Gm-Message-State: ABy/qLbKSVjNanoHgerhqRwqEepfEmNFIdEQrjSjTM2DISbjWm6fuZIU faxQ04aGPMacYRxhORmg95HcZkOMTcM= X-Received: by 2002:a05:6808:2181:b0:39e:c660:a5fa with SMTP id be1-20020a056808218100b0039ec660a5famr21591426oib.10.1689127618954; Tue, 11 Jul 2023 19:06:58 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o16-20020a056808125000b003941c3b9f0dsm1465063oiv.41.2023.07.11.19.06.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 19:06:58 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jul 2023 23:06:43 -0300 Message-ID: <20230712020644.22606-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/decode: don't reject flush packets when buffer_pkt is not empty 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: F0O1Jg7OgNU1 Restores the behavior pre commit a92dbeb9ae. Signed-off-by: James Almer --- libavcodec/decode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index a47abeca06..239ad70b41 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -666,10 +666,9 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke if (avpkt && !avpkt->size && avpkt->data) return AVERROR(EINVAL); - if (!AVPACKET_IS_EMPTY(avci->buffer_pkt)) - return AVERROR(EAGAIN); - if (avpkt && (avpkt->data || avpkt->side_data_elems)) { + if (!AVPACKET_IS_EMPTY(avci->buffer_pkt)) + return AVERROR(EAGAIN); ret = av_packet_ref(avci->buffer_pkt, avpkt); if (ret < 0) return ret; From patchwork Wed Jul 12 02:06:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42609 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp1851754pzb; Tue, 11 Jul 2023 19:07:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlHU/SuMu+eOWmTkFe3EtPDjGR8E3fc2rLzb78pTf6tjrygK/LHY4dmD6tK3DuxPqx8unPPs X-Received: by 2002:adf:f602:0:b0:314:34f3:10af with SMTP id t2-20020adff602000000b0031434f310afmr17320210wrp.14.1689127640162; Tue, 11 Jul 2023 19:07:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689127640; cv=none; d=google.com; s=arc-20160816; b=O+fNFsY+/fIUZMduNkwm9+fFpHFLhkGBjx1pOjXhonW2yKzXLiOPoe1faCL9X2373n 8MZxz51f1AulmbFnJkoQsvbHav9cw8YWMPEqQPfsdPJf1Pwhebj2MUEokYEZWrSo6L7j edFLBwZMa3n+Srq8vathH81fqaFDGYQYkU00qcSLggofM2VQlfgoOzeBZv7uq3zu3W43 jUcFewz6gpwQ2CinaUR9d0oorWHDZVEQEE4B+s1GVQsDe8yDlSAJapiONGndeWjGre1G j3Eq1qBRsKFquaxQVeR6/QlmT39smDByorlkoO53D3PJHGtnvnd5ueTtvBDZ8T8JRTgc LYFA== 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=33Ngl/KIhWfekiO1XAQos6CFmxn0MnxM+m6jduyafRQ=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=hgqOCZzvnFUA4/oCJyjh8PyERTnkyBUx9Kpa8HPu4ohyz6nNIoBBAVBsT2gmL8eJtz TtGn+t+feFYY9zBbqN0HyCWsm/icDm1YL7qmKyNOHJOWj11nKYtv9gox1H6mT6Dlcayy 5tlUbRNqFVkDEtAvhQ7dmq9W5QaQKOwoMdqSErNVTp0/A0Av4lYv3kbjBWhxBoRuXkhc aHfD6MaxrAda4zGdkHh7YCYKWa7rypgQ3ulHwUBD/2/ewaQQ6zYoHwIoure+5W+Z9O37 x4Xr9Y8tGMSkhRpmpTm+WAQjjIZzjIEh52c5CcJdWNDLdHSWF2i4RuwRd8ZNXg1VMUh/ rSAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Lz72DUYd; 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 f20-20020a1709067f9400b00992bfd1ffc2si2991190ejr.981.2023.07.11.19.07.19; Tue, 11 Jul 2023 19:07:20 -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=Lz72DUYd; 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 2A5D868C56B; Wed, 12 Jul 2023 05:07:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD6DE68C4F4 for ; Wed, 12 Jul 2023 05:07:01 +0300 (EEST) Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3a3e1152c23so4562560b6e.2 for ; Tue, 11 Jul 2023 19:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689127620; x=1691719620; 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=8mJeH/tUOqxZGushi6l1qpW+BnFxZgyA1JZGqg9cKQA=; b=Lz72DUYddvndmcTf41iY/5fkxWZMV+YrAMkAAIFJWOg4dKfjmkguPzMmA8OBMYlvKB vMHlwNIWOEKSNzqwjt1zA1Tt3BzoQpZlNa80pkV2qpwftdjNgA7QjtoXg99Xsjdr4GGn JkODPdNJJIbnNoL4ZTaFAlr6rBF+G/WwKdnyDVNQ1nsV54V2mHNUxl+WM2a/PSpnevey omISWm+ieisu1oJxpyFKvBKf7S81dVDwT6qqfCLomv5Y5L5xvVC0VE03rno4AXGjXDRa DjU9aqyRJTik4V4cL06eijOmxzgMVxhcAtfS//0iQXmYeEGqip/eXuvzPdYeIGSL9PZv rWAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689127620; x=1691719620; 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=8mJeH/tUOqxZGushi6l1qpW+BnFxZgyA1JZGqg9cKQA=; b=LUw9odD2iI1p2KPud4C19fhBrA86Lfw1YGYhIyY2UFSCLpNkAjeR4y0zf3xYwoZ9zg bnOoDkPe1kJ7LDzhAV5ivWrHCZpitSjyBejK+d0fz5gCXgt2TczMqFbyPq13xZE/yR4f 8vPCV6rRVXRl9h/qQ2EqdNCm72ZUdhEeiI3DdXf6m06obPlwOeZv/NbIDq63Aq3GqtFG xD9qkst4z5yBoQLQl/ow54rQVBaUaePnDvhImERaSVvqmarRW8pXRt+kBwCQm7v8ouCm rWQb/kOrzQS2akhSH0X+0g8u9cxtnf4fYeCQBUxR9e/O1SXrOxLkp+Rz/82CBaxmtxC5 sOYQ== X-Gm-Message-State: ABy/qLZymKRIjhtXS77uksmm6XUyDLJzM5FhMVQSeyIhlJmkQegHx9Ie h6Aqn67ujNSXQZjrPNAWtrq25LxTkCE= X-Received: by 2002:a05:6808:1d0:b0:3a3:660c:bdb0 with SMTP id x16-20020a05680801d000b003a3660cbdb0mr15008506oic.54.1689127620109; Tue, 11 Jul 2023 19:07:00 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o16-20020a056808125000b003941c3b9f0dsm1465063oiv.41.2023.07.11.19.06.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 19:06:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jul 2023 23:06:44 -0300 Message-ID: <20230712020644.22606-2-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712020644.22606-1-jamrial@gmail.com> References: <20230712020644.22606-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/decode: don't discard the buffered packet if the underlying bsf can't take it 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: tJyEzqOg3MM0 Signed-off-by: James Almer --- libavcodec/decode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 239ad70b41..cd49cca7c2 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -242,7 +242,8 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt) (!AVPACKET_IS_EMPTY(avci->buffer_pkt) || dc->draining_started)) { ret = av_bsf_send_packet(avci->bsf, avci->buffer_pkt); if (ret < 0) { - av_packet_unref(avci->buffer_pkt); + if (ret != AVERROR(EAGAIN)) + av_packet_unref(avci->buffer_pkt); return ret; }