From patchwork Wed Mar 6 11:03:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp313798pzb; Wed, 6 Mar 2024 03:07:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWXgtek9PrZhZz2pSW4dj2WNP2/7/Ega8a8lz6wyThFAJEAVVfDBqDI1kTAy3I2pBWORVKzcNBvyM2fYXXWRdX0la1VTzxvA37jEg== X-Google-Smtp-Source: AGHT+IGpZ8HTBoFACn/EAxlly9CZBgMz81EpGVvi56Ip7LPQju45LZUEtrPLtEXs3Kwtq4FcFRCs X-Received: by 2002:a17:907:8747:b0:a44:205d:bb84 with SMTP id qo7-20020a170907874700b00a44205dbb84mr2159081ejc.2.1709723231637; Wed, 06 Mar 2024 03:07:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709723231; cv=none; d=google.com; s=arc-20160816; b=gtECPwPCQvikfy9LzYjPyRdWE5XA5rceVZ5IlgQy2F+5HMqeerkzRJlIZBorOfJ6BI RjQnCTWPkg5qz0KuZRLpjuEgNyspROk6j+4y/rzSE/PkeVfkNVnZGlDvQG3i9aGSFEVV oqytEMyjA/vEHeUbOfgvqCl5lu0rUehtgQKq/+GqVo0qeWXMFntWkwRIgz472uh5R50c rynQice8eLlY/ftUn7uSQCGSulLGOI9f/0xMePEYqpL3E6qNODs+70+/HCHfDF6iH/oi jLE/qD3sup9h6KNm8vwDON/iNwtq6bnCjYQ9A/YEB9Ka1pzIXeHHmpUs0Rvi1Z+D0FK3 ijBw== 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=04Y5EUDUIxk5E6QmX+sw9YUsePrwaPs60Asje8FQCOM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xyHp/BXmopGVuRv19SMuuXN61s45tAQJUQ7Ggz41tuoDvCaeiPCjGxSW/2NPMGYJRh n3z9Cky3UyhzNv6P0t8h3HcneKOsqMZczK09NLms300Vy5N7JREh6tSKakUEKYV9PVnf fXj7Q7Nhm2g7xKud5qD6rnRcoeXWDlx/lPkkGWYYGHgNVPkTZfjKoT1Jel2+zmoz42Dq XQiIBq1pCpNXIdWo+uADQpkhjwRhyYoS/DneJrHARw5j1XksuQ4xHNsBGIglyHCN+AdL LJKOG5jR8W6J6pubZGFwxbTRggykVc6osS31yAxV0dt2sWpbfSdKA53hvF1XFKmOVtc2 1ZPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=VU+knBdj; 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 jz9-20020a170906bb0900b00a4556ab6bddsi2675632ejb.451.2024.03.06.03.07.11; Wed, 06 Mar 2024 03:07:11 -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=@khirnov.net header.s=mail header.b=VU+knBdj; 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 D2C0268CE24; Wed, 6 Mar 2024 13:05:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D1B268CB61 for ; Wed, 6 Mar 2024 13:05:30 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=VU+knBdj; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 5D7C24D56 for ; Wed, 6 Mar 2024 12:05:27 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id qzwAyzvdKBlw for ; Wed, 6 Mar 2024 12:05:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709723123; bh=44Yd89q/HNjVRSusuQF31vraoVqIPYT+BLQJLwOa73Y=; h=From:To:Subject:Date:In-Reply-To:References:From; b=VU+knBdjE6oeqVpWp4LsYqm7LmrUEGdLkLPb9YMCrfZmMC3rLulUa8GsB3rRWSGHp 0vul+RB/Qd7pk2cOE/YHfRhwXlmvUaWTcs/8DerjP1kWHUE5Yg5lA+fckqNEL/Wfb7 stxizeQhUtN5etrrUN7F0NBNbsCqDXyleCZniNmEA/NOzwkyb0q1CNLnWQfYDvKfLb 202meL+FUDLGM6cWU/drEyL+9IhC5+hg7BN6jRsNzPMNdnI+VrSXab3gbsukJKSUPt D0R+O82TlqkvVUj/0EnxRNBFx/YVwVZH5lrX9Ju+HEUHfmVw/iWWelI6eyEim4rhY4 cEaLataQIcRfg== 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 mail1.khirnov.net (Postfix) with ESMTPS id 30FAF4D5E for ; Wed, 6 Mar 2024 12:05:23 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 23D253A0A6B for ; Wed, 6 Mar 2024 12:05:23 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2024 12:03:15 +0100 Message-ID: <20240306110319.17339-14-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240306110319.17339-1-anton@khirnov.net> References: <20240306110319.17339-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/18] fftools/ffmpeg_sched: factor initializing nodes into separate function 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: 5F0ZNzmmbmpF Will be useful in following commits. --- fftools/ffmpeg_sched.c | 151 +++++++++++++++++++++++++---------------- 1 file changed, 91 insertions(+), 60 deletions(-) diff --git a/fftools/ffmpeg_sched.c b/fftools/ffmpeg_sched.c index e5435dd866..5f8ef04680 100644 --- a/fftools/ffmpeg_sched.c +++ b/fftools/ffmpeg_sched.c @@ -1303,11 +1303,65 @@ static void schedule_update_locked(Scheduler *sch) } -int sch_start(Scheduler *sch) +static int start_prepare(Scheduler *sch) { int ret; - sch->transcode_started = 1; + for (unsigned i = 0; i < sch->nb_demux; i++) { + SchDemux *d = &sch->demux[i]; + + for (unsigned j = 0; j < d->nb_streams; j++) { + SchDemuxStream *ds = &d->streams[j]; + + if (!ds->nb_dst) { + av_log(d, AV_LOG_ERROR, + "Demuxer stream %u not connected to any sink\n", j); + return AVERROR(EINVAL); + } + + ds->dst_finished = av_calloc(ds->nb_dst, sizeof(*ds->dst_finished)); + if (!ds->dst_finished) + return AVERROR(ENOMEM); + } + } + + for (unsigned i = 0; i < sch->nb_dec; i++) { + SchDec *dec = &sch->dec[i]; + + if (!dec->src.type) { + av_log(dec, AV_LOG_ERROR, + "Decoder not connected to a source\n"); + return AVERROR(EINVAL); + } + if (!dec->nb_dst) { + av_log(dec, AV_LOG_ERROR, + "Decoder not connected to any sink\n"); + return AVERROR(EINVAL); + } + + dec->dst_finished = av_calloc(dec->nb_dst, sizeof(*dec->dst_finished)); + if (!dec->dst_finished) + return AVERROR(ENOMEM); + } + + for (unsigned i = 0; i < sch->nb_enc; i++) { + SchEnc *enc = &sch->enc[i]; + + if (!enc->src.type) { + av_log(enc, AV_LOG_ERROR, + "Encoder not connected to a source\n"); + return AVERROR(EINVAL); + } + if (!enc->nb_dst) { + av_log(enc, AV_LOG_ERROR, + "Encoder not connected to any sink\n"); + return AVERROR(EINVAL); + } + + enc->dst_finished = av_calloc(enc->nb_dst, sizeof(*enc->dst_finished)); + if (!enc->dst_finished) + return AVERROR(ENOMEM); + } for (unsigned i = 0; i < sch->nb_mux; i++) { SchMux *mux = &sch->mux[i]; @@ -1341,35 +1395,6 @@ int sch_start(Scheduler *sch) QUEUE_PACKETS); if (ret < 0) return ret; - - if (mux->nb_streams_ready == mux->nb_streams) { - ret = mux_init(sch, mux); - if (ret < 0) - return ret; - } - } - - for (unsigned i = 0; i < sch->nb_enc; i++) { - SchEnc *enc = &sch->enc[i]; - - if (!enc->src.type) { - av_log(enc, AV_LOG_ERROR, - "Encoder not connected to a source\n"); - return AVERROR(EINVAL); - } - if (!enc->nb_dst) { - av_log(enc, AV_LOG_ERROR, - "Encoder not connected to any sink\n"); - return AVERROR(EINVAL); - } - - enc->dst_finished = av_calloc(enc->nb_dst, sizeof(*enc->dst_finished)); - if (!enc->dst_finished) - return AVERROR(ENOMEM); - - ret = task_start(&enc->task); - if (ret < 0) - return ret; } for (unsigned i = 0; i < sch->nb_filters; i++) { @@ -1396,6 +1421,41 @@ int sch_start(Scheduler *sch) return AVERROR(EINVAL); } } + } + + return 0; +} + +int sch_start(Scheduler *sch) +{ + int ret; + + ret = start_prepare(sch); + if (ret < 0) + return ret; + + sch->transcode_started = 1; + + for (unsigned i = 0; i < sch->nb_mux; i++) { + SchMux *mux = &sch->mux[i]; + + if (mux->nb_streams_ready == mux->nb_streams) { + ret = mux_init(sch, mux); + if (ret < 0) + return ret; + } + } + + for (unsigned i = 0; i < sch->nb_enc; i++) { + SchEnc *enc = &sch->enc[i]; + + ret = task_start(&enc->task); + if (ret < 0) + return ret; + } + + for (unsigned i = 0; i < sch->nb_filters; i++) { + SchFilterGraph *fg = &sch->filters[i]; ret = task_start(&fg->task); if (ret < 0) @@ -1405,21 +1465,6 @@ int sch_start(Scheduler *sch) for (unsigned i = 0; i < sch->nb_dec; i++) { SchDec *dec = &sch->dec[i]; - if (!dec->src.type) { - av_log(dec, AV_LOG_ERROR, - "Decoder not connected to a source\n"); - return AVERROR(EINVAL); - } - if (!dec->nb_dst) { - av_log(dec, AV_LOG_ERROR, - "Decoder not connected to any sink\n"); - return AVERROR(EINVAL); - } - - dec->dst_finished = av_calloc(dec->nb_dst, sizeof(*dec->dst_finished)); - if (!dec->dst_finished) - return AVERROR(ENOMEM); - ret = task_start(&dec->task); if (ret < 0) return ret; @@ -1431,20 +1476,6 @@ int sch_start(Scheduler *sch) if (!d->nb_streams) continue; - for (unsigned j = 0; j < d->nb_streams; j++) { - SchDemuxStream *ds = &d->streams[j]; - - if (!ds->nb_dst) { - av_log(d, AV_LOG_ERROR, - "Demuxer stream %u not connected to any sink\n", j); - return AVERROR(EINVAL); - } - - ds->dst_finished = av_calloc(ds->nb_dst, sizeof(*ds->dst_finished)); - if (!ds->dst_finished) - return AVERROR(ENOMEM); - } - ret = task_start(&d->task); if (ret < 0) return ret;