From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id C13B3484FC
for <ffmpegdev@gitmailbox.com>; Sun, 4 Feb 2024 18:36:21 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9877E68D0B4;
Sun, 4 Feb 2024 20:36:19 +0200 (EET)
Received: from mail-ot1-f99.google.com (mail-ot1-f99.google.com
[209.85.210.99])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58BA168C8CA
for <ffmpeg-devel@ffmpeg.org>; Sun, 4 Feb 2024 20:36:13 +0200 (EET)
Received: by mail-ot1-f99.google.com with SMTP id
46e09a7af769-6e125818649so2085090a34.1
for <ffmpeg-devel@ffmpeg.org>; Sun, 04 Feb 2024 10:36:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=proxyid.net; s=google; t=1707071771; x=1707676571; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=EquwG+KTfDu73AE4V/S/05gMmAQ1wMUyjynS/eYQXUM=;
b=W1vTwtOlIZjuxiELT+8yMTGoA7hrCFbR5hvg3VY2U+JmRjS6U897ZsGW9jWufPpo4z
DqJviy1rw9DiMiT6zFbhCJnLrZsgNduXa6WzineZ+SuBKCGr5uficCKHvmR+BQNkdq3t
KTBd0P/xkoarsh4PB+LpwRxItJ81LxzrIWivMoaL6f8ObrbZVgUuoV4c14xGQTIrQLNH
ySDjmK9awP6/xmeRBVglYr2ioz4M65Ti2vU6hW3Sjj8A1X8PgvR73n2SJx9aCYWrtDHq
Pb88mlDhC5yaZ+3/IMn0gF7zM8/UiNFB94WbHdi4/MP7MgD89QvW6DNqRiGY7U8c+jaF
dYtQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1707071771; x=1707676571;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=EquwG+KTfDu73AE4V/S/05gMmAQ1wMUyjynS/eYQXUM=;
b=f4mbDcVaXJH0RsFT0rD45prvULmhtjCdtaKBSxBdMyeZuVoXYRzIqbWPwqE1s9U10F
+BXzxzpFxE7CwoYdDKdihzwybPvaJteG/GCX5TyaFddrqV0pDAMpyOwLIsF7ogI4JOcH
2LqITfEM4PsqA3DBYeINsL49DwnZUVdD+zhXCSkV4zITnzkI11xSOVuJoitzBIdo0L1o
egfBaViKDhGkDd/Te1rul27EUzl2kg46vp9JpApG65bQC6hIyW2yA24BhfslPpqUuj+f
Xj8panYbJy6EwfSey1sdXWYow6Wf1DJ2n1+rggUVlsRpyouqvvpN3OMSoqY668F5R+66
doHQ==
X-Gm-Message-State: AOJu0Yy19IxPdDfp77ODneRKt5iQClngkODQyBWvNIT1q4TssAnQCOlE
3seJcOBYdzjHL0TCmNUduk0SMEvRfIi8b2Bpva2eXcSrsyHiNB7GWJmuBGb3fBRBes9KGrCACNX
X15oaNmRZCSnAmOwlMENLwAtV4NFViR2YpSa2LDZR
X-Google-Smtp-Source: AGHT+IHlbJQkwzT5C3kCkjw0lmndbogRD6N1txBXoDP3mfXBOW/cddlXb4FZ7MYB5/6kx7ZmjhwJCRAu7+W2
X-Received: by 2002:a05:6830:12c4:b0:6e1:5dd:72af with SMTP id
a4-20020a05683012c400b006e105dd72afmr9053084otq.17.1707071771394;
Sun, 04 Feb 2024 10:36:11 -0800 (PST)
Received: from wsx-cc1-001.. (c-76-141-249-38.hsd1.il.comcast.net.
[76.141.249.38]) by smtp-relay.gmail.com with ESMTPS id
az6-20020a056830458600b006e13a19489fsm246707otb.7.2024.02.04.10.36.11
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 04 Feb 2024 10:36:11 -0800 (PST)
X-Relaying-Domain: proxyid.net
From: Marth64 <marth64@proxyid.net>
To: ffmpeg-devel@ffmpeg.org
Date: Sun, 4 Feb 2024 12:30:01 -0600
Message-Id: <20240204183000.726766-1-marth64@proxyid.net>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] libavformat/matroskaenc: reformat options
table indentation and descriptions
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Marth64 <marth64@proxyid.net>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20240204183000.726766-1-marth64@proxyid.net/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
matroskaenc options table has grown packed over time, and is now challenging
to read. The purpose of this patch is to reformat the table, indentation-wise,
and to make the capitalization/endings of each description at least consistent.
I intend to sort the options in a follow-up patch, but wanted to phase
this out to be easier to validate.
Signed-off-by: Marth64 <marth64@proxyid.net>
---
libavformat/matroskaenc.c | 42 ++++++++++++++++++++++++++-------------
1 file changed, 28 insertions(+), 14 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 1457a6890c..2668d1e009 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -3497,20 +3497,34 @@ static const AVCodecTag additional_subtitle_tags[] = {
#define OFFSET(x) offsetof(MatroskaMuxContext, x)
#define FLAGS AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
- { "reserve_index_space", "Reserve a given amount of space (in bytes) at the beginning of the file for the index (cues).", OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
- { "cues_to_front", "Move Cues (the index) to the front by shifting data if necessary", OFFSET(move_cues_to_front), AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, FLAGS },
- { "cluster_size_limit", "Store at most the provided amount of bytes in a cluster. ", OFFSET(cluster_size_limit), AV_OPT_TYPE_INT , { .i64 = -1 }, -1, INT_MAX, FLAGS },
- { "cluster_time_limit", "Store at most the provided number of milliseconds in a cluster.", OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS },
- { "dash", "Create a WebM file conforming to WebM DASH specification", OFFSET(is_dash), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
- { "dash_track_number", "Track number for the DASH stream", OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, FLAGS },
- { "live", "Write files assuming it is a live stream.", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
- { "allow_raw_vfw", "allow RAW VFW mode", OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
- { "flipped_raw_rgb", "Raw RGB bitmaps in VFW mode are stored bottom-up", OFFSET(flipped_raw_rgb), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
- { "write_crc32", "write a CRC32 element inside every Level 1 element", OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS },
- { "default_mode", "Controls how a track's FlagDefault is inferred", OFFSET(default_mode), AV_OPT_TYPE_INT, { .i64 = DEFAULT_MODE_PASSTHROUGH }, DEFAULT_MODE_INFER, DEFAULT_MODE_PASSTHROUGH, FLAGS, "default_mode" },
- { "infer", "For each track type, mark each track of disposition default as default; if none exists, mark the first track as default.", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER }, 0, 0, FLAGS, "default_mode" },
- { "infer_no_subs", "For each track type, mark each track of disposition default as default; for audio and video: if none exists, mark the first track as default.", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER_NO_SUBS }, 0, 0, FLAGS, "default_mode" },
- { "passthrough", "Use the disposition flag as-is", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_PASSTHROUGH }, 0, 0, FLAGS, "default_mode" },
+ { "reserve_index_space", "Reserve a given amount of space (in bytes) at the beginning of the file for the index (cues)",
+ OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { "cues_to_front", "Move Cues (the index) to the front by shifting data if necessary",
+ OFFSET(move_cues_to_front), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
+ { "cluster_size_limit", "Store at most the provided amount of bytes in a cluster",
+ OFFSET(cluster_size_limit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
+ { "cluster_time_limit", "Store at most the provided number of milliseconds in a cluster",
+ OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS },
+ { "dash", "Create a WebM file conforming to WebM DASH specification",
+ OFFSET(is_dash), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
+ { "dash_track_number", "Track number for the DASH stream",
+ OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, FLAGS },
+ { "live", "Write files assuming it is a live stream",
+ OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
+ { "allow_raw_vfw", "Allow RAW VFW mode",
+ OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
+ { "flipped_raw_rgb", "Raw RGB bitmaps in VFW mode are stored bottom-up",
+ OFFSET(flipped_raw_rgb), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
+ { "write_crc32", "Write a CRC32 element inside every Level 1 element",
+ OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS },
+ { "default_mode", "Controls how a track's FlagDefault is inferred",
+ OFFSET(default_mode), AV_OPT_TYPE_INT, { .i64 = DEFAULT_MODE_PASSTHROUGH }, DEFAULT_MODE_INFER, DEFAULT_MODE_PASSTHROUGH, FLAGS, "default_mode" },
+ { "infer", "For each track type, mark each track of disposition default as default; if none exists, mark the first track as default",
+ 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER }, 0, 0, FLAGS, "default_mode" },
+ { "infer_no_subs", "For each track type, mark each track of disposition default as default; for audio and video: if none exists, mark the first track as default",
+ 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER_NO_SUBS }, 0, 0, FLAGS, "default_mode" },
+ { "passthrough", "Use the disposition flag as-is",
+ 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_PASSTHROUGH }, 0, 0, FLAGS, "default_mode" },
{ NULL },
};
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".