From patchwork Fri May 20 13:45:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35850 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp604092pzb; Fri, 20 May 2022 06:45:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZoP1RYa8j9KMXmbW3HYQ+IXImcptqu91/wIgrCkuxezxIDqDBW0u8csahiDTTPmxN8ga6 X-Received: by 2002:a17:907:a0ca:b0:6f8:5bef:b9c with SMTP id hw10-20020a170907a0ca00b006f85bef0b9cmr8898835ejc.630.1653054323042; Fri, 20 May 2022 06:45:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653054323; cv=none; d=google.com; s=arc-20160816; b=0pnWuuXFcOxNddWqfA5aO1kZ+QkNYM4JXem7deXeZ011UAFYOh8SfzL3ye4fELOngV WvMooZ17c6SRU+7OKBU6Tud6dqV0q3XkKzkj58qUu2D5Arc8TRw+AcHaqSXeoMDPo98Y D5m/31jEAl4W0M4yagPHuYErx+JWBAqJWc8CGFT0opOAZIf9pJkdYGGjlbqZVHFjwgDf NeJPdfv0a7383Kav+99gQNAcQl8W4Ciw3xNsERPA3mrhvOff5xmeEVYanfHXqyXjK7k6 BtUJ8wEAUZ0VyJsdP/hg1tGnnEu07bqAwGNmkrLnlsP+jVyfV0lSK+vkbItGUWEz9ZPS 4thw== 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=C33TmIewhdxR1r9CH6aJzMoL8pETvvy3GGEQkf1f7LU=; b=ZgHMvZJTO8Y3fTUTrtV4atWa7vVklBG3xTFszGscTaeJfz9/souT/k4OX5cFIAXcl+ wMc+rI7Aic/LhrUL+MaiLLjtJFAFLhp8szQ4/cVNdkhbfkmhCWZPjNROWW5fwJ8e1kgF oa+C7q/YXOFn/ANXDKcw+OetmthyoZs37QNSlxerPVkQ/y3GGrIJnHa6m081bszNnL6Q 20pHULWH+Kq9y0f+vl+nNl7gvTQfvZnKGUGNu5bLdSErwTDIRQHkeM4N4ct+ihbCq64f i8TTjjupdfmZWOnPMborqKYjWj5wAjWsY0xa57VJC322BgEjtzumdwsvlUJ3VubOgfWM gymQ== 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 dn15-20020a17090794cf00b006f395d509d0si8890921ejc.498.2022.05.20.06.45.22; Fri, 20 May 2022 06:45: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 D5C7F68B49E; Fri, 20 May 2022 16:45:19 +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 9540168B2EA for ; Fri, 20 May 2022 16:45:13 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5F625240179 for ; Fri, 20 May 2022 15:45:13 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id yb4LeEgtKhpt for ; Fri, 20 May 2022 15:45:11 +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 BC1B42400F5 for ; Fri, 20 May 2022 15:45:11 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 6B1753A06CD; Fri, 20 May 2022 15:45:11 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 May 2022 15:45:03 +0200 Message-Id: <20220520134503.7620-1-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220511185328.GM396728@pb2> References: <20220511185328.GM396728@pb2> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: reuse the encoding code for flushing encoders 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: En+wB9HEAjqi --- Fixed 2pass breakage. Sent a separate patchset adding tests for 2pass --- fftools/ffmpeg.c | 84 ++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 63 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0e62c39522..9b69a5a2c9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -836,12 +836,12 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) AVCodecContext *enc = ost->enc_ctx; AVPacket *pkt = ost->pkt; const char *type_desc = av_get_media_type_string(enc->codec_type); + const char *action = frame ? "encode" : "flush"; int ret; + if (frame) { ost->frames_encoded++; - update_benchmark(NULL); - if (debug_ts) { av_log(NULL, AV_LOG_INFO, "encoder <- type:%s " "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n", @@ -849,9 +849,12 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) av_ts2str(frame->pts), av_ts2timestr(frame->pts, &enc->time_base), enc->time_base.num, enc->time_base.den); } + } + + update_benchmark(NULL); ret = avcodec_send_frame(enc, frame); - if (ret < 0) { + if (ret < 0 && !(ret == AVERROR_EOF && !frame)) { av_log(NULL, AV_LOG_ERROR, "Error submitting %s frame to the encoder\n", type_desc); return ret; @@ -859,11 +862,20 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) while (1) { ret = avcodec_receive_packet(enc, pkt); - update_benchmark("encode_%s %d.%d", type_desc, + update_benchmark("%s_%s %d.%d", action, type_desc, ost->file_index, ost->index); - if (ret == AVERROR(EAGAIN)) + + /* if two pass, output log on success and EOF */ + if ((ret >= 0 || ret == AVERROR_EOF) && ost->logfile && enc->stats_out) + fprintf(ost->logfile, "%s", enc->stats_out); + + if (ret == AVERROR(EAGAIN)) { + av_assert0(frame); // should never happen during flushing return 0; - else if (ret < 0) { + } else if (ret == AVERROR_EOF) { + output_packet(of, pkt, ost, 1); + return ret; + } else if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "%s encoding failed\n", type_desc); return ret; } @@ -894,10 +906,6 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) do_video_stats(ost, pkt->size); output_packet(of, pkt, ost, 0); - - /* if two pass, output log */ - if (ost->logfile && enc->stats_out) - fprintf(ost->logfile, "%s", enc->stats_out); } av_assert0(0); @@ -1762,59 +1770,9 @@ static void flush_encoders(void) if (enc->codec_type != AVMEDIA_TYPE_VIDEO && enc->codec_type != AVMEDIA_TYPE_AUDIO) continue; - for (;;) { - const char *desc = NULL; - AVPacket *pkt = ost->pkt; - int pkt_size; - - switch (enc->codec_type) { - case AVMEDIA_TYPE_AUDIO: - desc = "audio"; - break; - case AVMEDIA_TYPE_VIDEO: - desc = "video"; - break; - default: - av_assert0(0); - } - - update_benchmark(NULL); - - while ((ret = avcodec_receive_packet(enc, pkt)) == AVERROR(EAGAIN)) { - ret = avcodec_send_frame(enc, NULL); - if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "%s encoding failed: %s\n", - desc, - av_err2str(ret)); - exit_program(1); - } - } - - update_benchmark("flush_%s %d.%d", desc, ost->file_index, ost->index); - if (ret < 0 && ret != AVERROR_EOF) { - av_log(NULL, AV_LOG_FATAL, "%s encoding failed: %s\n", - desc, - av_err2str(ret)); - exit_program(1); - } - if (ost->logfile && enc->stats_out) { - fprintf(ost->logfile, "%s", enc->stats_out); - } - if (ret == AVERROR_EOF) { - output_packet(of, pkt, ost, 1); - break; - } - if (ost->finished & MUXER_FINISHED) { - av_packet_unref(pkt); - continue; - } - av_packet_rescale_ts(pkt, enc->time_base, ost->mux_timebase); - pkt_size = pkt->size; - output_packet(of, pkt, ost, 0); - if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) { - do_video_stats(ost, pkt_size); - } - } + ret = encode_frame(of, ost, NULL); + if (ret != AVERROR_EOF) + exit_program(1); } }