From patchwork Mon Mar 25 01:53:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp930516pzb; Sun, 24 Mar 2024 18:53:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1Yl76Bhky5/y/LLph2FFCOBPwE+Oa+3baT3fHyJUEGzcQETNdFiatISrqg466Q8C2oIkcd3oEphFXEBy+euH0P8rruvc6FzV8pQ== X-Google-Smtp-Source: AGHT+IGatJyMrUaxeCaCxeF61+idhfBkLxhaaJncdjfIHOjgMZH5o/x7oLLlxiLDMIkUIndZFCoc X-Received: by 2002:a2e:8806:0:b0:2d4:7f17:185d with SMTP id x6-20020a2e8806000000b002d47f17185dmr2949138ljh.0.1711331632691; Sun, 24 Mar 2024 18:53:52 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dz12-20020a0564021d4c00b0056bfc459b6csi1615756edb.640.2024.03.24.18.53.52; Sun, 24 Mar 2024 18:53:52 -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=@outlook.com header.s=selector1 header.b=WV83wNDH; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4ABF568D221; Mon, 25 Mar 2024 03:53:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2109.outbound.protection.outlook.com [40.92.75.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0368068D221 for ; Mon, 25 Mar 2024 03:53:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cW0yU1oolKPiOl7+apHsUCoNHw6f1PQuydrR62CflJp/skrYRnw5b8pUHqYzNmvd/iXOguIg1yU2q5o8RWgmj88lWqeatqpOnknW4WX8/sE0Ar80GoXlAmMUzn+CmJGRWQ3P5Ag0tBInjyhZsUwysT0euStmOcuiF5uyVpMMVeR5k3XQ9aS41cJiRsyd3pI/KbK090M4db5z+ekKC5bF1ceEI+olrNgAbJTSyOWgUEwx9CTCEfvonmVeht3XRfdXpVfwI6WkNbZcnfdmMgXXgkhr5srLEtT6EzM8MnSdGC5Hbx/PdH4LwpA2oJzCijS00gl7WIGY18UQurZzlTNlmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9wTddq2zATDAoUltB1IjFx3YuDR7hxkm+qaQeZe7xvI=; b=d0T1oJ59NqiDh+0JkQ+0xiQcRdH88KDr9rUS+9FZWZ25c5xT0l4s5DzD4H6ci6BPk+Rk2oxnLCYHiRiVa+AET/tHm+NalpflGbQXkFlTJ2PrbjJnANcd0fPkMD9oWAEVVFvIzwyetA6NrBQNrAVrCuJGinDFFVCB7tWNuTMUa4qYj8oOYldi3gcFCTdxha+bJ5MbJs+q+9AeNFrKYIyCBMTEsZdv0KvozSFxz3eGal7mejjhman/VY6WrnkLRdNjmkvZPg4rNli0xEVAuImYxyHs4l8uuRE3xXN5I2AAn3/zJNY0GJQWNNV757mfBtmXX1gJ6byrc+GO7jh3A2PgxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9wTddq2zATDAoUltB1IjFx3YuDR7hxkm+qaQeZe7xvI=; b=WV83wNDH5IM3MAVjzcdMF5lb+vne/OzVOdbW5ikv2O+09AYqrR0l7duzaPS7QP8Wx9jVlT1daPRAIBftyKX4PyknMBqCQKPo/oBpPtPh80M5yUMp5DooRtqpTDhD9LPknfwmI4M2Xkiqd5ANl1BDvZ7B3LxeMVfqZzmnKpM/5aXP5iSIYkbWETxWLzHdvg5Gch2wplzTOA2AdN6cGZNA7zCLC5p6/pqJT+hSoXv2gmUPASbObavWYXD0RoliRmPi5ou7yvv2VjRBbc6LGnb/uFWwUXYkY5OUaoBbDPsG/EZrhno3Dn6HIy6eBx9MixK+d2UNZfGnoQFGSCDPwFGubw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0118.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:371::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Mon, 25 Mar 2024 01:53:38 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.028; Mon, 25 Mar 2024 01:53:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Mar 2024 02:53:18 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [EALx3VTbkzi+PEfDE9LMLx7FNNgPsurBfenpQLUwMBY=] X-ClientProxiedBy: FR3P281CA0202.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240325015324.2348789-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0118:EE_ X-MS-Office365-Filtering-Correlation-Id: 2cdc3ce4-0867-4a76-363a-08dc4c6e6394 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3A6UL4Jgc7ybq5j7OVA4JxFvWiePVdaPUVsgeq8yb780odidI5CKtRITzij3ZMRVUgTA7CJLKn51InRnR+iG3Ce2LeUf960ge5SqH7txKWokeVUbrofO+wUETRMGUj+jM801xY0mFNThBRoTpCkkJOK4j4vz1RL6yGlmePIBw6G9TiGMy33ALbDhfwNEM9XyVUuSf/pA822ukWFK1qLIlbYzgHW80A+eAWPi8r8JNhZ6FrClMr9RsXwg74I8smI+BJOtg/CbqJxfihd1/u/n/uK3u8DHAYmi7NLO5eQuMkyOuueFZzo/nvVgggvHkR9NcvaQ8HMGuUgHKcwIREbsl3LRvQpJN7MnSiFsCbsKrSaaePiMVrvLb2g8tcCs+sJGNUb49eWbaic3OVZilA337xUa0wg6MHtQpOG40B/Idsu43Rltn1ZglXobbWxqSjfZrzyWGtrGzyCA4x0JjHTor802pazaOQMyrbDU6wyb5DTXm7+JsSeFEAw/chJJqOFGsqKiYqxe8hcO63kePfuMa/LhUVBRHHyzNf0oT8LvurDgTv0G2qFx8VlKLCDC6Qu0kK7CLdngXjiILO+ZQ7xswEhZEkhoQBlTfFUMTlyymoje/STVzjBtpyxRu9chyZaiFg8IizdlAtHvMvfm0nhWuLjU+HNpA7oPRK3FrBOtD5yfeHa10ulsfOlFeLgFhvBPbftKNQeXcBgUEwCdmg5H4+S/6gKPGkArxMtSjJniPqUEM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Nomgi1DGZYK7jNwELaZTuTuUs6GGWf+cBrRtZe8p2hqQE3cOdwMs/GT+Iv3TSYh5KkKBpy1dnMJmbtTWORbXyw2ax8f9uIzaPGREByVn8HgwYDS6kaXPjDhv6saFENVeolxo33A5/20L/ZEXCLidj0ApylcyEp+PPpSOmkekYChHbt5nRi33gGSZkPmXHQgYNnUSf/gnqnwae+psmHSj5pQ2f8zuUzHfgg/73J2xnvD7HUp19mPzfOOs0QWrVCVzpDAMZS/6F37jAdKrK3GfGtPamRDVrew6LnxkyaZEBTm7SOYxmwARYy2Fx8/wXtPzB999FOKb1F1N4F7dswjM3en56U3J4Hlx6P6fqF58mfHeIbq1g12ZzO8a6DFc7HPJx2FeA9Y4MtO33ZfHCta1q+U3CaB4FEjI07gP2aAdN+ofCvKIG9Vpsl4ijq5x0dQBmSA+hhPid72vE1nm4tE+MGJmqco3GvMTCEIgzB7B5C9XgSU9GdfBH/M81rZbk8EbjLUuvNBPi6YpdO94jMUFMX9Tof8QUgPAFXjfTs/LJl7NU4ps+WhEaIHipiMJ38HDvrOmqwzoti62X5/7qmqIfC0rakKgxqGWJv/wzRyn4+rle2RL4OQ8rJTOTza1PmD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4zeC86Bzz9A0StGPOFXjGvEEEsUtyLQbJ6AD7jWFb5StBu6ZDYvDS4YYl/PREVsmvs11QFe+ouzTemR6arLu0uVeWd7cUvgWZVS2UICsb+M9WoGVUoPdQhosbDDIV37HyTNJVlzpfTc31T9xYJdJC5Pf+h5/4PKGkjNbq/3CNdBdyJ9kr6EiqID8FxS3n9UAcvov1+8z9bkDXi5kBtN98Cg7p7s/l7azsPHf2eYgj2K1ZkBLGYRpJLDEhzskJBB5NXH7WXLN+rivcYmRmkhJVN798MZqcuWfCSfQ0N3dY1r5/ZZadF8Ui1tKUKEVNkdKU7ZH43pS8QnP2re+3kkTz/xL8i1/HyD4PDCI9eOKRFx6vq5FNy3bEfXqmiIsW1gZLV6KlV2B4DrwOprfKAVBbG89VLvJtwoMAoM5sjY5SpzajpXkI2zYGmffsRoOePYqolMWijrbOcztRgjPrPBkDRbD4GKsIAg+x980ivJ21w3jd2ElwaLugxbG/I7uL3aqPnt5sNeRlRAipeDhhM6PEM12I7KPEQk/jWlz5D+t6WwR8cLKbgO4rwEkhtA2FUarmzMCWXabjQD9Xic6Wt+jolBEIyLK42gPXSSU130R1YEJOEFraRXei+rXwefx8zbLnSzaYVW+4CyDUMMxP1xh1ZkJsgphLvPXADhPdGlhv7k+rG4vOJI2YML0Sm6ToyBK5YHsKAS+2fdggHXmfPwiEZ6Vh6LLpV7XPHHnBaRBPe+8oz74rupmC7bvLVUNJraaonuwaeaf4T8rj4OPiGu6M1Y3/i1HeCnyz5PJUA8czzXKtvMe4T0MmAmWUcueerEAPCIcVrAeHzQSF/NCsWfNWUtcPSoJpQaLhqwwGbK7p+sQl149c4SpLKGlamw3mUrXwWF/5Vz8Cu02RkqZS4cpuAxKJlN0tqUgL0QepSXgSXGsxgavGUkfLgqqWqFMjquPxPsQ+R0TriskmXJRFHqiWoM21u/WZUmnEieyR/4mcGTJhEc93Qdwd0FqlKaOZq/0i7+2mnvsgR4KCQ/2omp7QhouQI/d1UfIv5b1Hjf1nKdLpeOb/1gcVO9i4Tw51QpvavXIpAx9jc4IZTqdMsRFnjdyTjjp63X6x1ksbJln66utKrQGmyYq6nXmVxeXcjc24loCmxkc61+L7lvVg8bg9tz+a3wqV/BTPCOjwYD852L55LjhVH2pnbXoODynxOiLwwUDrMSCZ9mgxFoBwxhCbyET0FADZmth6hqrIBXA6J1UrjbDS95HbKZzi/ql3UNKAnKu0NR9E87B2Dm9h0GzXw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cdc3ce4-0867-4a76-363a-08dc4c6e6394 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2024 01:53:38.2401 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0118 Subject: [FFmpeg-devel] [PATCH 04/10] fftools/ffmpeg_sched: Explicitly return 0 on sch_enc_send() success 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3LTnTtQdAL61 Do not return the return value of the last enc_send_to_dst() call, as this would treat the last call differently from the earlier calls; furthermore, sch_enc_send() explicitly documents to always return 0 on success. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_sched.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_sched.c b/fftools/ffmpeg_sched.c index ec88017e21..30b2355eb6 100644 --- a/fftools/ffmpeg_sched.c +++ b/fftools/ffmpeg_sched.c @@ -2344,15 +2344,13 @@ int sch_enc_send(Scheduler *sch, unsigned enc_idx, AVPacket *pkt) ret = enc_send_to_dst(sch, enc->dst[i], finished, to_send); if (ret < 0) { av_packet_unref(to_send); - if (ret == AVERROR_EOF) { - ret = 0; + if (ret == AVERROR_EOF) continue; - } return ret; } } - return ret; + return 0; } static int enc_done(Scheduler *sch, unsigned enc_idx)