From patchwork Mon Apr 4 11:30:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1914775pzb; Mon, 4 Apr 2022 04:38:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0ItJxngyyVyVmcCdFJxXI1xd3NGUgF2/19/wgAGvTzSJQ6KppHtlGS6iJVThHZxdqck1U X-Received: by 2002:a17:907:7d91:b0:6d7:a1e:a47a with SMTP id oz17-20020a1709077d9100b006d70a1ea47amr10914954ejc.116.1649072316837; Mon, 04 Apr 2022 04:38:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649072316; cv=none; d=google.com; s=arc-20160816; b=gEzdgNS04Cucgg+eJqsVErF5daamjcCvaCoTkVEDFvoam5OA6iiSc6/4Bg8cZN/bkd eYX8vqmEE6vNAhH12xqfU21E+IwPDRYRwRTqElIAefMyLHYE+KMFyI24rqzqiX4gOlIT jeZa4tv49Tn+8EdDkg3tVjnCsipfLvb/BWFeKk/zxMETWNV82UhnPfy62j8HowyGTGRl f+aWLk3nBdbaj/HbJw7GI42wRKNPiN2IpnbzMob/UASr5ZPGLmkuGWoy+bWVvUgvSHJY 3/x+NpiN3S6KuBa8FjBdc9TnPMAH5hk+J4sYUwB4N153ZeOx6q38GNGDujphvLWv/Q+C f4vg== 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=u8a/RGfxUeopdlKueMnS7urxJANvJJHaFaL5NHvEheo=; b=pf7DpAxBRLYwGndsD9B1n0EXCAUbSjj1cUxS7hh5iPIT1LBS96FEhoWCJlJS/b3BPs +lghkzA57JsVR+WM9VdVV8emet/u519nHtEpM4mx93E7L8KDYEI4SuxIcxe9RTL+MoTK 8ugcINZZrLIk0OZksYBDYqgNnq5MqjczBQ7iGL3yQwj/rnCqY4kqGu35rAoG99eARilb 4n9XVdLYxvqVDcRYI8K8ymlr40Sn1Vrf8NL6wiAPerrJwSF6uVBOQid2O896o6e1i4aT IZog0LcXRsSFjX8wl8i1UcD7tE1Ji4zzISnoj05MHpVqHspC+70rgcEQhy4ZRG7PU5M3 DseA== 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 bk17-20020a170906b0d100b006dff5e2d277si6189626ejb.211.2022.04.04.04.38.36; Mon, 04 Apr 2022 04:38:36 -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 B344568B300; Mon, 4 Apr 2022 14:37:47 +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 98C1768B299 for ; Mon, 4 Apr 2022 14:37:43 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3C79124017C for ; Mon, 4 Apr 2022 13:37:43 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id IgfCgzYPVGSR for ; Mon, 4 Apr 2022 13:37:42 +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 9F2C5240506 for ; Mon, 4 Apr 2022 13:37:41 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 152AD3A0D20; Mon, 4 Apr 2022 13:32:12 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 13:30:19 +0200 Message-Id: <20220404113037.13070-32-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220404113037.13070-1-anton@khirnov.net> References: <20220404113037.13070-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 31/49] 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: rsrPcswqOFDM --- fftools/ffmpeg.c | 72 ++++++++++++------------------------------------ 1 file changed, 18 insertions(+), 54 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 662a5d22b1..adf69cb43e 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -826,12 +826,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", @@ -839,9 +839,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; @@ -849,15 +852,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 (ret == AVERROR(EAGAIN)) { + av_assert0(frame); // should never happen during flushing return 0; - else if (ret < 0) { + } else if (ret < 0 && ret != AVERROR_EOF) { av_log(NULL, AV_LOG_ERROR, "%s encoding failed\n", type_desc); return ret; } + if (ret == AVERROR_EOF) { + output_packet(of, pkt, ost, 1); + return ret; + } else { if (debug_ts) { av_log(NULL, AV_LOG_INFO, "encoder -> type:%s " "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " @@ -881,6 +889,7 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) } output_packet(of, pkt, ost, 0); + } /* if two pass, output log */ if (ost->logfile && enc->stats_out) @@ -1696,54 +1705,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; - - 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); - output_packet(of, pkt, ost, 0); - } + ret = encode_frame(of, ost, NULL); + if (ret != AVERROR_EOF) + exit_program(1); } }