From patchwork Tue Aug 27 15:05:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c944:0:b0:48e:c0f8:d0de with SMTP id k4csp376568vqt; Tue, 27 Aug 2024 09:40:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU6C7JZqnXkfjCS3TfgbBkUD31pILTzXEAHpkdz+2MRvkjEgeKPQjEb5EjvOI5qEc1x+8QYaDHdE0YvtYEmoNKo@gmail.com X-Google-Smtp-Source: AGHT+IE0swnQnv4ETWZ5lFTrcdyKe012OoDEkxWIh3IKzcLvkNv/mbtKMn0yNbW/4M0L1DBUN2yP X-Received: by 2002:a2e:bea2:0:b0:2f1:5ae2:8589 with SMTP id 38308e7fff4ca-2f4f48ef4c7mr52514591fa.2.1724776821670; Tue, 27 Aug 2024 09:40:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724776821; cv=none; d=google.com; s=arc-20240605; b=LilDvBT+e6TBrMUEJPCMFIryMqo5Fqc++Qp3uGwy29KxAjoWZ84hPmbEQGCW6wC42u rGkLwQ73HM6bU86Fe2kQGbP78DE+V4yjZzXCs5SZJyxRNEvozC/LZz/WPOOIrhaCAjkq pKQ1ZuVKeuC/QL7oWjPF0PemPJO+S3i0nky4C9BcBB0YRK8L78Tfdsvm8Hcd+G7MeL9t uMNrRtyI5zQHuojvkAi1QnV6AGzlWCfh7RrlDaxgkUjftU0FenCdXIudoBF2XlmUhZ6T 4VtIfqT4Tdca0N2J3hRqedaZQUfejX6rG5RW8PMBaI8KTMfez7opWMRf2jCtRpb8I8jb gtcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:dkim-signature:delivered-to; bh=uKZpBBuELGbXBgdCOyWjBRl2wEcsu+DEkUZLIP2+4PU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=GGREOwhRmiRc7bdIDsQ0D4hGfmNlICVOft4yk2k93GuCR8+UfI5t5gJKhBwkndX+/L /VvMbMu4fGeXzyVK/X6+WxOND+DkhYKaBpSEiAaM8dPBN2RL3UYPkDtJyb2FAa0quZUK SlKGuE84CwqiPOPv10I/xSwpjca6mSi/g4BnNDBrP1o+ZRLAUUvOU7Q2aYJf5XECNGrQ HBiWHH4uo7oDsWtv3ryjZJOHJY+gvitL+YiVBJ6xa1PCX/hCVPtxJTkzi7JeN2Dm0xbu 2geNYmmeSFnOU1IWX1yBGk1ikuKNd+DekmS3eM7XYCWuv5Z5Qok/h4wehN5Zj+ZjIiyS PGUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=CZSXf8eq; 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 38308e7fff4ca-2f4047cac03si39612721fa.159.2024.08.27.09.40.21; Tue, 27 Aug 2024 09:40:21 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=CZSXf8eq; 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 1F16768DE62; Tue, 27 Aug 2024 18:43:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18B3468DDAD for ; Tue, 27 Aug 2024 18:43:00 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=CZSXf8eq; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id DE01C4DF3 for ; Tue, 27 Aug 2024 17:42:59 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id k4gkuFnD7ak4 for ; Tue, 27 Aug 2024 17:42:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1724773371; bh=3agq+d3jn3epjcH4pM+H2VeaqTaYSNpJMxsR5lHuXWA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=CZSXf8eqT2g/gi4xX/kMvKdTAXxfifRIrmHsPc1tCSOezUJj7UbrIm1FYfK+iKXg2 qnINzIPKtGJ7tTjxE6vKlKr7hdDm/p4uiFUmy8aLlY4By17aG8G4r6txg6aAkXttWV JleQsICW5vv1LR90rlgWEeOTeraaPCiKENr4DWC2mguAqDDZ8yEWjLOS89lAfhRCXo ZFbJXeRq40Kz6HsrX73E9HkQCl7sISl+uK+4nxxwF1K/1q0NYeaFejlPhIvB7U5pCI wP9ZOKdF7hn70bQkyybuY5yAQQo6OQ/J5fdyPM57lwrxMin5rs2Wjsi4yr8FSuk0ZK LstdlciOf8cnQ== 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 mail1.khirnov.net (Postfix) with ESMTPS id CFF594E2B for ; Tue, 27 Aug 2024 17:42:50 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 870C83A35D8 for ; Tue, 27 Aug 2024 17:42:43 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Aug 2024 17:05:19 +0200 Message-ID: <20240827154041.13846-41-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240827154041.13846-2-anton@khirnov.net> References: <20240827154041.13846-2-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 39/42] fftools/ffmpeg_mux_init: cosmetics 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: XwqKIRe9wOs3 Restore vertical alignment to OutputFilterOptions initializer. The flags field is kept as-is, since the corresponding lines are already long, aligning them would make them even longer, and breaking them would look worse. --- fftools/ffmpeg_mux_init.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index c874ccb113..c054765be7 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1388,23 +1388,24 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) { char name[16]; OutputFilterOptions opts = { - .enc = enc, - .name = name, - .format = (type == AVMEDIA_TYPE_VIDEO) ? - ost->enc_ctx->pix_fmt : ost->enc_ctx->sample_fmt, - .width = ost->enc_ctx->width, - .height = ost->enc_ctx->height, - .vsync_method = vsync_method, - .sample_rate = ost->enc_ctx->sample_rate, - .ch_layout = ost->enc_ctx->ch_layout, - .sws_opts = o->g->sws_dict, - .swr_opts = o->g->swr_opts, - .vs = vs, - .output_tb = enc_tb, + .enc = enc, + .name = name, + .format = (type == AVMEDIA_TYPE_VIDEO) ? + ost->enc_ctx->pix_fmt : ost->enc_ctx->sample_fmt, + .width = ost->enc_ctx->width, + .height = ost->enc_ctx->height, + .vsync_method = vsync_method, + .sample_rate = ost->enc_ctx->sample_rate, + .ch_layout = ost->enc_ctx->ch_layout, + .sws_opts = o->g->sws_dict, + .swr_opts = o->g->swr_opts, + .vs = vs, + .output_tb = enc_tb, .trim_start_us = mux->of.start_time, .trim_duration_us = mux->of.recording_time, - .ts_offset = mux->of.start_time == AV_NOPTS_VALUE ? - 0 : mux->of.start_time, + .ts_offset = mux->of.start_time == AV_NOPTS_VALUE ? + 0 : mux->of.start_time, + .flags = OFILTER_FLAG_DISABLE_CONVERT * !!keep_pix_fmt | OFILTER_FLAG_AUTOSCALE * !!autoscale | OFILTER_FLAG_AUDIO_24BIT * !!(av_get_exact_bits_per_sample(ost->enc_ctx->codec_id) == 24),