From patchwork Mon Jul 10 11:37:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42583 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp656657pzb; Mon, 10 Jul 2023 04:37:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlEdTEhnWxXT1/IH7281laHCqSMSdIYEFkQ+VPprQdeU3Suc3/P9jB/+wmy54EcZ9D3T/Z8i X-Received: by 2002:a17:906:19:b0:982:82aa:86b1 with SMTP id 25-20020a170906001900b0098282aa86b1mr11970143eja.43.1688989042562; Mon, 10 Jul 2023 04:37:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688989042; cv=none; d=google.com; s=arc-20160816; b=ebZD9qwOXdCCU8pjYUaCZqxKZ+c5MyKVf3UkOlf4ymqLsJfAHi0WST4I3XTOEMwePr ivoYKJjeVkuSee8FY9GERZlDKJ/H6BZTIBbOg0sUh1GZLVOVroLYPVQU0nj/jDe+ZRx6 mvdzifV3yS2cTi1i35ZroKGRudb4g25+URxlQtextwqhq8MEG5p3txKjqGsDh2NBUwb8 n1OH+5fr8umWjEKGrlkVmDgdKPOIOu35v9M3YzuYaPNNtJHAIlC1Hjjhoq2bel/bM9R7 NU3dQcqim5k+G9tvjYBi/N4e3g1aTVI+vBB/XwZPJQBWOOaX84/PnhZ0NQ0tSdeQNbI2 l+cA== 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 :delivered-to; bh=qiD9QKeluzrOy2n2naDGK/5SJ1QU1bmptpkc+WZ3xB8=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=u2PDCXKDjveCAVhHhLkgqlrmqn2rr46AJ5TBEhta9AmaWZys9uvjtfFDatI/mtijxL pXua3dH/VtFu+iTojhUM+ksGAoEhFskW4AHotAFl5XvM/g30c92oo4LagLzVNkSGhr8W FkiGMQNZzRhAckqTbKvcfMuevN3t6cEXb6kNFTebGOmaGxHIhmh+7xeQcJRK5+xaMcnx QJ2ghlldch52iEK7HB1vyg7xx7ecPwvbF4DChOvwpVItZy0Mr6DdokB38FaBeLIBzfFu jGnMTj6jIORdAbU2jNZiOCnIOX0e9p5ZInpxlm/FBZMXXxTOoDEfQGcJBIW/cYvZXAIR ItRw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gv21-20020a170906f11500b00992af47620esi6512676ejb.509.2023.07.10.04.37.21; Mon, 10 Jul 2023 04:37:22 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 39D0368C4EF; Mon, 10 Jul 2023 14:37:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 115DF68C294 for ; Mon, 10 Jul 2023 14:37:11 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 1EDA32404EC for ; Mon, 10 Jul 2023 13:37:10 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id I3O2oFtq0RSS for ; Mon, 10 Jul 2023 13:37:09 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 43C1C2404EA for ; Mon, 10 Jul 2023 13:37:09 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id EA4ED3A022D for ; Mon, 10 Jul 2023 13:37:02 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jul 2023 13:37:00 +0200 Message-Id: <20230710113700.1848-1-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux: forward EOF from the sync queue 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: bLPC4VEbHQDW EOF from sq_receive() means no packets will ever be output by the sync queue. Since the muxing sync queue is always used by all interleaved (i.e. non-attachment) streams, this means no further packets can make it to the muxer and we can terminate muxing now. --- fftools/ffmpeg_mux.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 026796f7e6..2fb2c7ccaa 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -166,8 +166,14 @@ static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt, int while (1) { ret = sq_receive(mux->sq_mux, -1, SQPKT(mux->sq_pkt)); - if (ret < 0) - return (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) ? 0 : ret; + if (ret < 0) { + /* N.B.: We forward EOF from the sync queue, terminating muxing; + * This assumes that if a muxing sync queue is present, then all + * the streams use it. That is true currently, but may change in + * the future, then this code needs to be revisited. + */ + return ret == AVERROR(EAGAIN) ? 0 : ret; + } ret = write_packet(mux, of->streams[ret], mux->sq_pkt);