From patchwork Thu Jun 16 19:55:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36281 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1129242pzb; Thu, 16 Jun 2022 13:07:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vCV+vzhb3H5ikgBj5aarDe5I2+Zl4VAdg6dyAkPddcwROfpZjKtJQDkYWArPs27lAX1PAU X-Received: by 2002:a17:906:eb54:b0:708:99d6:83e with SMTP id mc20-20020a170906eb5400b0070899d6083emr5804977ejb.745.1655410050387; Thu, 16 Jun 2022 13:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655410050; cv=none; d=google.com; s=arc-20160816; b=c5JVl6LP8y6AINfUy70q1hNglFWl7pkcbcXONDNZ9sWlxAS72mPJOaz+EYsWQzO+ia 4owm/tnftMRPcbIkBTF2c6A8c3CtiR2qY9h7hdBDUSNe6YRofiwHBKfER0+fCk2Mu3Hm 5ohg7tnwHkmeT2LbLZkou6fIfLmyf8NA0yUX4w8r9zb9pvw6Kq9wLE3pe9HPEO0u/hQv G5BRlajo3UCIscEtDYAYgoh7VTpthFsAoaMIRlmwqNEtTFSQ6CsiT/9W/KD/a66TvVek 7f4+QhU4V6ISEPENI1Wt/y7lRegyLgZ1LWqHzWNS3YHU6kguIaWSL2wGIjLb4HeavZIV 9oCA== 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=hlM7HI9wU46r0aKQNfVi459JMwGnznoEv5fNyd4aoag=; b=EF0U0nJV7rRFN8m+tcIfZnX+Lmlb5JayNy5RBTFr6TZ76YaPLO0umy9+WNRMr4B9Mr /GB0kX992HJcLaswyFQSVY4OI5Zuv/aNuG99IgUPNkpfymVLrKHrMIPXF2/Z7gSF3pXU KqCKN7gX3t9tvJ6+PyeJKHVx2f5KDVT6N51p9rR8CKsu2+44zpt4jle25A/7nMiTGO1B EryLU71EYOKUzXIlpaYt+RxMr84QKjb/joteFLn0gghNXbUqeOxFNAGPU67j4PwhuVhm OocdLVzd822BaC/SYReXLPLEJHcLqB1lHWEmIkuCKLnOsYRuDi4cp/xkEPzwdo+WoTYb 1l1g== 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 d25-20020a1709067a1900b006feb7f30ef7si2412243ejo.58.2022.06.16.13.07.30; Thu, 16 Jun 2022 13:07:30 -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 56A6F68B8CF; Thu, 16 Jun 2022 23:04:04 +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 31BC968B865 for ; Thu, 16 Jun 2022 23:03:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D58B5240175 for ; Thu, 16 Jun 2022 22:03:46 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id uXoBHYS5jh_Q for ; Thu, 16 Jun 2022 22:03:46 +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 91E97240699 for ; Thu, 16 Jun 2022 22:03:34 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id DF8753A20F3; Thu, 16 Jun 2022 22:03:30 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Jun 2022 21:55:22 +0200 Message-Id: <20220616195534.5278-23-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220616195534.5278-1-anton@khirnov.net> References: <20220616195534.5278-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 23/35] fftools/ffmpeg_mux: reindent 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: yKZVNroiTT6b --- fftools/ffmpeg_mux.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 453ccac912..641bdb98b0 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -98,16 +98,16 @@ static int queue_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) } if (pkt) { - ret = av_packet_make_refcounted(pkt); - if (ret < 0) - return ret; + ret = av_packet_make_refcounted(pkt); + if (ret < 0) + return ret; - tmp_pkt = av_packet_alloc(); - if (!tmp_pkt) - return AVERROR(ENOMEM); + tmp_pkt = av_packet_alloc(); + if (!tmp_pkt) + return AVERROR(ENOMEM); - av_packet_move_ref(tmp_pkt, pkt); - ms->muxing_queue_data_size += tmp_pkt->size; + av_packet_move_ref(tmp_pkt, pkt); + ms->muxing_queue_data_size += tmp_pkt->size; } av_fifo_write(ms->muxing_queue, &tmp_pkt, 1); @@ -236,20 +236,20 @@ void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) int ret; if (pkt) { - /* - * Audio encoders may split the packets -- #frames in != #packets out. - * But there is no reordering, so we can limit the number of output packets - * by simply dropping them here. - * Counting encoded video frames needs to be done separately because of - * reordering, see do_video_out(). - */ - if (!(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ost->encoding_needed)) { - if (ost->frame_number >= ost->max_frames) { - av_packet_unref(pkt); - return; + /* + * Audio encoders may split the packets -- #frames in != #packets out. + * But there is no reordering, so we can limit the number of output packets + * by simply dropping them here. + * Counting encoded video frames needs to be done separately because of + * reordering, see do_video_out(). + */ + if (!(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ost->encoding_needed)) { + if (ost->frame_number >= ost->max_frames) { + av_packet_unref(pkt); + return; + } + ost->frame_number++; } - ost->frame_number++; - } } if (of->mux->header_written) {