From patchwork Thu Nov 8 15:35:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10954 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 86F4644D8ED for ; Thu, 8 Nov 2018 17:35:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 040AD689FDF; Thu, 8 Nov 2018 17:35:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3C39689FC6 for ; Thu, 8 Nov 2018 17:34:59 +0200 (EET) Received: by mail-pg1-f170.google.com with SMTP id w3-v6so8992354pgs.11 for ; Thu, 08 Nov 2018 07:35:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N9GXM2dN5i1AsL4Z0K39gpfhzgOAlJrNm0c5HomEt3I=; b=ZjSpVdbSZt2tRYktB5CifLkJyKeG4qA1TUPfRzKv32bD1xBfGUWNHB1PFaoLRlY7yA Eehs0bouVYdWdn+mI271LG0ja0tZFtDSuo80TQmXOSprHrE249vl12S8zP/q7bIGMVXj 8QTze2Rb+GIEmIa0jnimi39xXFbRFD62BtHOgssb2nDlnQcY3ClBh35Zajq+qNAOghL3 rpL9R51O3DuZpES6yDQUzjL0kI8GMxP+BwRRZc18KJBp2XVzbkTfMVCxrJeFPXAzaxbi GyJWnFA1TgyYI9ttn69IqoWbJxEryiY3HBxCU3ts58jroEatUKjKzeSu3po44kuVu5GH jwow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N9GXM2dN5i1AsL4Z0K39gpfhzgOAlJrNm0c5HomEt3I=; b=FRm0XLF6TW7J3UhZzy3xFyG0qbB5mrWj59xP3RcjVRTnD1NqaiQgcjDX1dYfBUjqoe VZJy09I9P6PU8Bw+EW2zpsJKa+SpTVY39Mp04FR0GGeadLLq8Gz/yNnFa/o/o8Y65/fX dsbU5hHpgo8Po3EoQOKLsKVABSFzy/0pntH68j8/U8DHidnslalO6lyOkV3vna8ww01c C+c7OCx2iClahjRAVATIvbjQmUpo5la4uz+XvE0hJ+eU9pMLRprTdJGni3Fsmn1mXRCX RPe0xSIEbZPyuz9o4kmW4RE4hW8zeH/aIGIboaueXIvN9lMfF3aFbUMv5oewC8Te39Ff DvkQ== X-Gm-Message-State: AGRZ1gIGtNU6V+u8AtDUyRss8nDLtPNtDxm6uP8emLjIun+BAovmc44c 5x+uw/aV8T9OoVIDYBYKPAiPh3Sv X-Google-Smtp-Source: AJdET5cSYn/Ofsru/AkELDBzUSzqtw0om3zYn6dK4SXhlLdsEPCXfF1g8EVLGW151gZ4CCIr/y48rQ== X-Received: by 2002:a65:5a8e:: with SMTP id c14mr4101187pgt.137.1541691333250; Thu, 08 Nov 2018 07:35:33 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id n87-v6sm4909901pfb.62.2018.11.08.07.35.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 07:35:32 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Nov 2018 23:35:21 +0800 Message-Id: <1541691321-12543-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1541691321-12543-1-git-send-email-mypopydev@gmail.com> References: <1541691321-12543-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg: indent the code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Jun Zhao --- fftools/ffmpeg.c | 69 ++++++++++++++++++++++++++--------------------------- 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index e989e7a..dbcc9cf 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1488,7 +1488,6 @@ static int reap_filters(int flush) } //if (ost->source_index >= 0) // *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold - switch (av_buffersink_get_type(filter)) { case AVMEDIA_TYPE_VIDEO: if (!ost->frame_aspect_ratio.num) @@ -1818,7 +1817,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti } else av_log(NULL, AV_LOG_INFO, "%s %c", buf.str, end); - fflush(stderr); + fflush(stderr); } av_bprint_finalize(&buf, NULL); @@ -1925,46 +1924,46 @@ static void flush_encoders(void) av_assert0(0); } - av_init_packet(&pkt); - pkt.data = NULL; - pkt.size = 0; + av_init_packet(&pkt); + pkt.data = NULL; + pkt.size = 0; - update_benchmark(NULL); + 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) { + 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); } - 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); - } + } + + 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); + } } } }