From patchwork Sun Feb 4 18:30:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 46022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp355719pzh; Sun, 4 Feb 2024 10:36:24 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCX08H5qneLoBYu8PsYhobKxOVVqsvmW+Vsi6UkkVt25dDvRBdLG66Hy1crXRYDrG9CpnuJuSaSeEeN8lkoP3I7WboDU+eCMJBADGg== X-Google-Smtp-Source: AGHT+IEEnjXoX4Ze/9uODeVFyn0A8tNgM1fz+U9wgVkXXRauozDhij1/r5sKGSZ+zh0fodQMya9a X-Received: by 2002:a17:907:da0:b0:a36:f5ba:adfe with SMTP id go32-20020a1709070da000b00a36f5baadfemr6426195ejc.3.1707071783847; Sun, 04 Feb 2024 10:36:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707071783; cv=none; d=google.com; s=arc-20160816; b=tOBP7R8VH81uCyxdLVECChbksRk/3b+tzpI/FZ8appuLAczMemGFDGP6ToiXK2fvXD 6JcrAqcQfBoRy79q7hHGg9kS1zSyaHVsv5uPJGJotYhlkSUhxcC/hbZ1TTkdjNVxnCLn QmsLOavVwDAbC/tVY7bssGxqgOkt3BcNYcnMfb/UdC+3kswyRrxhFVMMNCfyZvnf+50Y /glArTUTFkbEiri2bLBPCnDULhPr7hok242F5GsB9H4uc1JgwBAv9vSll+9mYX1kmJOU Uft1LRzOgklERBuB29aX5/f9ppYLCWaLKiJLnLwCXeZ55lW2zpePLJ0u3GIOMmncBohD kX+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=NthHw62xRBYFz3hC9bxo4YBcvM7RyHjLWTBMLDqPf2s=; fh=moJZ3GTocUkPxOQ2owLENrHdiDM7XmNZ/f9/1L+c5qc=; b=FuPeQgX4wekG5dFdieIqPKOsanGLk9vS2ne8HbvmDDZmuB0Hn0/kn4WyggW4eR5U/P AufwzAOkXWa5M6AB2TDYlgU0YX129MBcjurJDmIYKLM28+qufYQjlrRqYQUll7YW6BAM 70hPcHp8Q61mtEbaYOczqF0jm2AHx0UqNKO2U6xg7xrY83WmQxXMmFQ7WFOby9BOuTgQ NS4HPoQjqDgwhVGhOu4WAOGUbzXSQrIN8aHLYJ/3c+Xz7l6PzBXg+BTTeiNkwZ57RiuV 3LOKkbX2l9O1CG+GBrdYUk0hO8QIFR7vu1AwhP8oS2jHe/Z+VIylyd3GrK5QyX5FTGvG uO5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=W1vTwtOl; 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 X-Forwarded-Encrypted: i=0; AJvYcCWr/WM911iMBWWTuSwE2l8xfmhaff+ysyEDb5TFk9LbDgZXcAOzNI5CB13bSJZLfWE09xk6dKW1qanhP9dcabI7CsM7XNOJP1h+MfmhzpVU1IKrU2VYMW74tDYfZXHISkCZ8bpQq43+3AxlZwUV8Lgj5CXJApLLnbAbf6rbnsGXhH/TW/sgfEwDob/vZWnaZn9dSTh5ysXFglsZuqlT3SRbTzPLTlrXa69wr03OPnhRXRcTP0w2yRd/xa4KCdIjwK4bFQ8qlMbYT0/yY29n05F18nsEM4Lv3cdr7AYrXQ1+oKrdcyNgaCIcOoEL9jl+nhiP/KJSV2zioHxyJPfmsqw2gl5gy6exKFjcoM9SAvFoW+GAxt5hON83Y8CkZAtekL1OkWy6CaUIXmOFiieCb6Z5pz3HSf1qsAl91EnTDM0wYtYKGMxRpKJ85lTuW3jlmRb8bV0xMeivb2KeyTymQ34XgngZWn4cX8Ep0nOLyFu4uoXbs4LJazGtTmSMG2wDmcXgIAciyfA++04JzbSkHOuSH12orsORhvB6so9ZkU16lGpXft6WqWepNUfanCx7idt/B2CSMt5ONUpAghGIGSReNJGFsUoz3xWVXBv6GOehbLbKVbaTcKXfOZwNMLHQY5zc5Yqexbub7YCfdoDar95lhpwGj5tDaNeuZaBMKUN9G/D/pMvKJLJ5N5AM46mIMTkshm1rR+IkEIjXmKjWT44611UVhKi/5mmnlqjFLhAf1Wpkj5K2zKvKSY4kjJ38XaXM8IJJG2cuMI9zNggS/XYu3Z9QazayyBNx4VdEXJpgVcc/2x0Q3sL8B5puGkLZxdi3aKBMTpiWyQ7JKrYSHHKavcM4j/sJNejH0erKI2bL5WUkgDrE60ZCXlX0OyZLNUR7Emm7eE8o7gn+0dH44PA2zpTkfPC6xHu+oLGU65eFfw7tS5X7m+D3fJbDvSpZOh5kgO g6ivGiVhUW9cGHO4EX+5JbTksdVasgNN+FArQvCsU185SM9bLTXifr9zDupCJTALMI2/Ghyh3bqC0QnAXVnnknXjeGnxsq2XmIqeZEZpVBlSju6RnKTap8xHDWil8G6o/qEhws2ns91R14seotOLxjOiEXV9s1BSn/4gW7S/CTngqpY2lw3C6uMtPzznOJFdNe4yJ1qAlo2KOIrybrekaOSXELNXzYUje37zOKfHiK7hObGO/EbF/b9nbX/ICyMHctupflid3icCEiU6QTejNfeu3BCTShtR83GxxXSlSySmnX9o48aVhOhXieSl+V+y7KQtglOPcbQswvGIBYjP2GZwpoRE5aH89IFkJu9L7M6ZuHpJodfbAEOgakTcbKYShgW37jt4f4JFcDHBiUeV5og/jSriue2GmTRfbYzJBvpYtIVZE/bPFCXWatjmoBABIm/+HknKgvwYFlARPIq7C70ylgYHXp6OAOj8ALaoK3X+BRvgbTtlk4xMtNQjSGowXkJt827DjbRxMhRlazSyZrrIDTX2Q1GZN7RNgUc1axg8II6AIjrbtwYIdHXidPFTZXLyrTIcxRJak/kWCyon66UNTLvixtP79qKwhP Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d8-20020a170906344800b00a37b64e6080si281117ejb.306.2024.02.04.10.36.23; Sun, 04 Feb 2024 10:36:23 -0800 (PST) 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=@proxyid.net header.s=google header.b=W1vTwtOl; 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 D3F4868D10E; Sun, 4 Feb 2024 20:36:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 ; Sun, 4 Feb 2024 20:36:13 +0200 (EET) Received: by mail-ot1-f99.google.com with SMTP id 46e09a7af769-6e125818649so2085090a34.1 for ; 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-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 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8baWHEJ1bCWj 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 --- 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 }, };