From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 601E947BF7 for ; Sat, 4 Nov 2023 13:39:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B43A68CE5D; Sat, 4 Nov 2023 15:39:45 +0200 (EET) Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 046B768CE08 for ; Sat, 4 Nov 2023 15:39:38 +0200 (EET) Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-5a7eef0b931so35419847b3.0 for ; Sat, 04 Nov 2023 06:39:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699105176; x=1699709976; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=qBvGtKpxQ9KEJ0+LVl2FHfzWWe85nn0ifQdgXzIArZ0=; b=SnzjVTdSDNpP1ISy3LBexzQyF3WrGoktDk5gxSoRginKG5awy5PlhsMKLWfPX4CMWU AnmyM+7DGDXxnpmiR5/OBTaAlRF2KysqveVvrxtzCR6BPDq7TrlZlfAGvXi1L7POyAGs OSrSKIE8971TR05LwlOWI4xj2+G7nasXEwhcpMySjI8mH6XSeNU157LHYk2349S8Fpgr fISXNpPFXQroVDTaZAiVL3MmWapi3suTtlblnP9l0Ly1bNFO1tUBClGW0Ey7VrpgmPit zcSX+cxfeb3ZghINcPzLsytBXapHtETgdlo6Qk770Aazd41ajhNZCImQ6uXt4kz/I1XH aAOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699105176; x=1699709976; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qBvGtKpxQ9KEJ0+LVl2FHfzWWe85nn0ifQdgXzIArZ0=; b=EA819cxFHBSEG/RpjQYOD+3NQxnnHk/0ow55RS2gH/az8EwSK0Mb4GX12u2hWOXKEO Ca611fyK2cpWlOqxAyj55sZKA8GCoMScCzeosSprtSqMaELVmHxsXdTaMeLoprVRIf8L dM742QMWBsXehw7+b4rhmZIrSyDZ4ruc2n6s0qPKEE8XkCcSvIucRUVzN3zju4CwXoPb ffL4/3m+b1MuHdHXnzVVwXCLQ5KMim4vw/dVKaANhfdNqdTBUScAfRUQwSZGVzX0B8Dq dKXQJc5ItqiQYGIOIPQus/UoWr+jWFpOlKEwdGMledQs0fkTN/ZOYFaCWCcvR2AEQLBb zXzQ== X-Gm-Message-State: AOJu0Yx4QbTCfEidf9GphmAesVx96P0QvZ7tJSPZkP86m54SMzV5sYkV 00Ig5/G2kzQfVM3C46A+KwjRpvYnd4A= X-Google-Smtp-Source: AGHT+IE1oCKC8REyWWMekF6GRUpKFCnTwJUhGRAo1eOXejdVjnwxnKN6KXBw2N0GWGotF5rExaVVUA== X-Received: by 2002:a81:99c9:0:b0:5a7:be29:19ac with SMTP id q192-20020a8199c9000000b005a7be2919acmr5052884ywg.12.1699105176410; Sat, 04 Nov 2023 06:39:36 -0700 (PDT) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id h83-20020a816c56000000b005af9da2225bsm2051231ywc.20.2023.11.04.06.39.35 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Nov 2023 06:39:35 -0700 (PDT) Message-ID: Date: Sat, 4 Nov 2023 10:39:44 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20231104092125.10213-1-anton@khirnov.net> <20231104092125.10213-15-anton@khirnov.net> Content-Language: en-US From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: <20231104092125.10213-15-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 14/24] fftools/ffmpeg_mux: move bitstream filtering to the muxer thread 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 11/4/2023 4:56 AM, Anton Khirnov wrote: > This will be the appropriate place for it after the rest of transcoding > is switched to a threaded architecture. > --- > fftools/ffmpeg_mux.c | 112 ++++++++++++++++++++++++++----------------- > 1 file changed, 67 insertions(+), 45 deletions(-) > > diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c > index 82352b7981..57fb8a8413 100644 > --- a/fftools/ffmpeg_mux.c > +++ b/fftools/ffmpeg_mux.c > @@ -207,6 +207,67 @@ static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt, int > return 0; > } > > +/* apply the output bitstream filters */ > +static int mux_packet_filter(Muxer *mux, OutputStream *ost, > + AVPacket *pkt, int *stream_eof) > +{ > + MuxStream *ms = ms_from_ost(ost); > + const char *err_msg; > + int ret = 0; > + > + if (ms->bsf_ctx) { > + int bsf_eof = 0; > + > + if (pkt) > + av_packet_rescale_ts(pkt, pkt->time_base, ms->bsf_ctx->time_base_in); > + > + ret = av_bsf_send_packet(ms->bsf_ctx, pkt); > + if (ret < 0) { Unrelated to this patch, but this should probably include a comment about the reason we're not checking for EAGAIN, like we do for avcodec_send_packet(). I'll send a patch for that after this is pushed, so you don't have to solve conflicts after a rebase. > + err_msg = "submitting a packet for bitstream filtering"; > + goto fail; > + } > + > + while (!bsf_eof) { > + ret = av_bsf_receive_packet(ms->bsf_ctx, ms->bsf_pkt); > + if (ret == AVERROR(EAGAIN)) > + return 0; > + else if (ret == AVERROR_EOF) > + bsf_eof = 1; > + else if (ret < 0) { > + av_log(ost, AV_LOG_ERROR, > + "Error applying bitstream filters to a packet: %s", > + av_err2str(ret)); > + if (exit_on_error) > + return ret; > + continue; > + } > + > + if (!bsf_eof) > + ms->bsf_pkt->time_base = ms->bsf_ctx->time_base_out; > + > + ret = sync_queue_process(mux, ost, bsf_eof ? NULL : ms->bsf_pkt, stream_eof); > + if (ret < 0) > + goto mux_fail; > + } > + *stream_eof = 1; > + return AVERROR_EOF; > + } else { > + ret = sync_queue_process(mux, ost, pkt, stream_eof); > + if (ret < 0) > + goto mux_fail; > + } > + > + return 0; > + > +mux_fail: > + err_msg = "submitting a packet to the muxer"; > + > +fail: > + if (ret != AVERROR_EOF) > + av_log(ost, AV_LOG_ERROR, "Error %s: %s\n", err_msg, av_err2str(ret)); > + return ret; > +} > + > static void thread_set_name(OutputFile *of) > { > char name[16]; > @@ -263,7 +324,7 @@ static void *muxer_thread(void *arg) > } > > ost = of->streams[stream_idx]; > - ret = sync_queue_process(mux, ost, ret < 0 ? NULL : mt.pkt, &stream_eof); > + ret = mux_packet_filter(mux, ost, ret < 0 ? NULL : mt.pkt, &stream_eof); > av_packet_unref(mt.pkt); > if (ret == AVERROR_EOF) { > if (stream_eof) { > @@ -376,58 +437,19 @@ static int submit_packet(Muxer *mux, AVPacket *pkt, OutputStream *ost) > int of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) > { > Muxer *mux = mux_from_of(of); > - MuxStream *ms = ms_from_ost(ost); > - const char *err_msg; > int ret = 0; > > if (pkt && pkt->dts != AV_NOPTS_VALUE) > ost->last_mux_dts = av_rescale_q(pkt->dts, pkt->time_base, AV_TIME_BASE_Q); > > - /* apply the output bitstream filters */ > - if (ms->bsf_ctx) { > - int bsf_eof = 0; > - > - if (pkt) > - av_packet_rescale_ts(pkt, pkt->time_base, ms->bsf_ctx->time_base_in); > - > - ret = av_bsf_send_packet(ms->bsf_ctx, pkt); > - if (ret < 0) { > - err_msg = "submitting a packet for bitstream filtering"; > - goto fail; > - } > - > - while (!bsf_eof) { > - ret = av_bsf_receive_packet(ms->bsf_ctx, ms->bsf_pkt); > - if (ret == AVERROR(EAGAIN)) > - return 0; > - else if (ret == AVERROR_EOF) > - bsf_eof = 1; > - else if (ret < 0) { > - err_msg = "applying bitstream filters to a packet"; > - goto fail; > - } > - > - if (!bsf_eof) > - ms->bsf_pkt->time_base = ms->bsf_ctx->time_base_out; > - > - ret = submit_packet(mux, bsf_eof ? NULL : ms->bsf_pkt, ost); > - if (ret < 0) > - goto mux_fail; > - } > - } else { > - ret = submit_packet(mux, pkt, ost); > - if (ret < 0) > - goto mux_fail; > + ret = submit_packet(mux, pkt, ost); > + if (ret < 0) { > + av_log(ost, AV_LOG_ERROR, "Error submitting a packet to the muxer: %s", > + av_err2str(ret)); > + return ret; > } > > return 0; > - > -mux_fail: > - err_msg = "submitting a packet to the muxer"; > - > -fail: > - av_log(ost, AV_LOG_ERROR, "Error %s\n", err_msg); > - return exit_on_error ? ret : 0; > } > > int of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".