From patchwork Thu Oct 13 13:48:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38722 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp349056pzb; Thu, 13 Oct 2022 06:50:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5BxkGrTrlnc/mcVCJHcd+1BCqzD5/WoENAkq+EznEE45iWeDIHLouZQhxd8MGKM5T5b7Ra X-Received: by 2002:a17:907:e89:b0:78d:cdd7:5a28 with SMTP id ho9-20020a1709070e8900b0078dcdd75a28mr12969263ejc.167.1665669023706; Thu, 13 Oct 2022 06:50:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665669023; cv=none; d=google.com; s=arc-20160816; b=axtgNg9ASJzMgW7pl1ZlvuXscFr4fygLTiYVUQX7tne8baBHHFsjAwdFEupSckTBzj XV8PWErRXR1EU1bQ5tzuw/+Vyd8my1UtCOn9/0aiBoOXOvmzQPSzCxuOivBEB5m9e+Q/ GiS55I4QDwQJ2vokIyO7F3eNCtkUongXEIBFeyn+YtAVDmDjXxE2iwirvknB4lGEl76x nM2UAxOOdUTQukMiMOonKStLoj3rsikvg/8VSckFE0jQEew1RJ7RS4290tAqKUaVDJPm nRavCsvVgxJU1X/Lzcmy2dKUbpk/JzlpplpriBo9oo2HWvI/dLDOedvtgnB3wEaHGDtd qG7A== 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:delivered-to; bh=v6Xvz234apXgz4WNYJu3K5xkTpDEYReFLp3gC9d6TXM=; b=ledPFhO1KFbgbhTOhfOj4UJrZDiix0qcrEw2fsogukdcEV883tBFFRjBdP4BnYTX65 W6cYRGatLfaQMQY4oG3aJG3w+4A9cVbfxug9n6tBKvrF5fzljtFT3YxcxKYczFcnde2F yYfFS/BK6pim1RwuVSEUqxGsvIk2c+eXirKqpQcJ2YZp4CGdDVULrl6v/iL85V39Jjoo B8fUgxyARz98lQbGI3yMZJDXG5mzyiML1m+zPYPPIQZK2v1mnoUE+z67WLrVxFZqA+MI +DgZYTmYloi9FYq2all0gjWiNm2DP0BaMgHQAoXif8ESkyqZuWZfSZuZyGE38ngFvy3R I5pA== 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 e22-20020a17090681d600b0078d38624feesi16889175ejx.133.2022.10.13.06.50.23; Thu, 13 Oct 2022 06:50:23 -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 0C5A368BD7E; Thu, 13 Oct 2022 16:49:28 +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 1E2B968BD48 for ; Thu, 13 Oct 2022 16:49:21 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id C31D02406CD for ; Thu, 13 Oct 2022 15:49:18 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id p62-Jx73x45W for ; Thu, 13 Oct 2022 15:49:18 +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 7D6312404E4 for ; Thu, 13 Oct 2022 15:49:14 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 078B53A13D9 for ; Thu, 13 Oct 2022 15:49:08 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Oct 2022 15:48:54 +0200 Message-Id: <20221013134904.10104-3-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221013134904.10104-1-anton@khirnov.net> References: <20221013134904.10104-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/13] fftools/ffmpeg_mux: rename submit_packet() to thread_submit_packet() 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: POyOCoxxVBhB This is more descriptive, and the submit_packet() name will be reused in following commits. --- fftools/ffmpeg_mux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 6e9cbb4bab..7762038b1d 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -254,7 +254,7 @@ finish: return (void*)(intptr_t)ret; } -static int submit_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) +static int thread_submit_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) { Muxer *mux = of->mux; int ret = 0; @@ -324,7 +324,7 @@ static int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) int ret; if (of->mux->tq) { - return submit_packet(of, ost, pkt); + return thread_submit_packet(of, ost, pkt); } else { /* the muxer is not initialized yet, buffer the packet */ ret = queue_packet(of, ost, pkt); @@ -447,7 +447,7 @@ static int thread_start(OutputFile *of) ost->mux_timebase = ost->st->time_base; while (av_fifo_read(ms->muxing_queue, &pkt, 1) >= 0) { - ret = submit_packet(of, ost, pkt); + ret = thread_submit_packet(of, ost, pkt); if (pkt) { ms->muxing_queue_data_size -= pkt->size; av_packet_free(&pkt);