From patchwork Mon Mar 11 16:14:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 46959 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1323263pzb; Mon, 11 Mar 2024 09:15:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPmELz7UA/+QqLkqYQx51sfXDlyoAgmVkItkpf7y4YhgdvSccFA/5w/waDsO+BkSezbQzy8b6ztnL92NI+3Tda8NwfuVOWwfuueg== X-Google-Smtp-Source: AGHT+IEpIr5+BaqKV7j33jFZsEmWK5mnDwgT/+mCV3yvEB6FFL+x3MimBTpwaqA8n4c3mh5G20pe X-Received: by 2002:a17:907:7644:b0:a43:eb29:a293 with SMTP id kj4-20020a170907764400b00a43eb29a293mr3851027ejc.5.1710173711718; Mon, 11 Mar 2024 09:15:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710173711; cv=none; d=google.com; s=arc-20160816; b=qgo4EzlND1+hO+ukLNFd8HFiEAnvOfo+hOFgvym6cML8CScMLtbkSBMuIzyrwo64Ye mxR2N4upvhgZzve90id+LcF4huQq/KELmO50LAW7WvF6P+KqlrM9ewrGLdsgMZZ075G0 cQoB5/XJ/aAHn7jI7qFVc4fUMDy6sQbkyj6cjs/fK+UHDKvl0s/HP+qTcI3JQwWflrJF 6ILDQ+1eaqeY3FulF2MCxF/NIrV4HC//XW2dIb3mpcisSaV5/UooqUx+3ihY1jxi1g1v 8PyXj3mlCvxJiQrcOVOTrpAHghr4BvCq9WAy0cIqjZ2WlzWkpFCKg+k8zX1dO3YDvVtR MKnw== 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=MRc4RrNjBJF3WL/CVShmBrXK/U1Vm3Rgzc0u38qDcqo=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=QMod73ZnbQs7SpU5qdS6Dxfhm9q9MV5RckWyFO/h+w1ZyDpbs5QGeQ16rkD3kyB/2t d1BjSy0P2oXtt0fbWiYS13Jtee2TqjfjszOlplSdjwPV01OwW6eFBqVdm/DeGY0/xNru mSUDpZx2Qi6TsDKq6iwUl5pz3sN1QBa4vzaYVkuEHa48Jqy4ItEgTtqcghdciXT3zNm/ aOmVOioYbhdNx2Z3dWC5cPAHTORy1p+jL36+EZbTTVA79Mohd9Q/P49okpkzgh63i3yA btUo0Vg5BbbVvz1cXxKwbPxFAc23/Vw87Td1tQz/9IP2xUF/Kas1AyI24JOyx1EH3Fxg qu5g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=EBOsfrGq; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l13-20020a170906230d00b00a461f917062si1486090eja.212.2024.03.11.09.15.11; Mon, 11 Mar 2024 09:15:11 -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=@gmail.com header.s=20230601 header.b=EBOsfrGq; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5CF6D68D0BD; Mon, 11 Mar 2024 18:14:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71B9F68D0AA for ; Mon, 11 Mar 2024 18:14:45 +0200 (EET) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a461d0c90c1so174240366b.2 for ; Mon, 11 Mar 2024 09:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710173684; x=1710778484; 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=YGLXl5QvwDnmDk/t7l48wcwEyASnh69qXm5SvAclGko=; b=EBOsfrGquiYr+fD5CPRHrI6sJ3VK7pXPORL124iQm153MRbUSG8k6IHA8gpBLdUazY 2zQLgdAPXf06Moux2pU+SIyzQYEL7B1JzOTMdWnkuPeOp17qJ9LS1i0qLMe4xCjieWoW gGIR56rpx8Atf9O0BkUlG3vmRqmpthkekuim8Ewvo+KNHiYBz17eh8BNDjlP1KesL0zg AOVOQaNy0tEpAbwVa0Dfbf6XBTA4L1r+ZontPbYM6cEgW/oQ0+AC/vIaUgpLwqVv7FjS ymeCJ/MDWU8CDG3STqngTkrLc/nrCdRkFZrtDiYr6wPpQKP4QB7dOIFoosj+ZDy060Fv 9OgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710173684; x=1710778484; 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=YGLXl5QvwDnmDk/t7l48wcwEyASnh69qXm5SvAclGko=; b=fLXaUF9QMQz+BpTs1CNs2KcHgJAo1vFORUN4xVs7R7lvAJOf69O9wb247iD34KE5bg nOtp63fKhP0+3usRF7JH646Y2dyy171mwXDoHwWTKEVyUln7SOurrpG4ulNB0wztnDPd uoSmxIqglILLbFKtAHEszalM1hrpFe2r/JDE77mgEK+F6yhs2zf7424AjSKVdtWg6oBq 5EJN7vr0gwzw/Hbl1UJ7cSpTGiAN617MtBO4IySUVLwnqec97c1fYbcJ2DKzZDqtHb5P KU8j1ZF+J8iZcFXOtPWguzQp1hyyw8N7KbcLyNrQYsVb7YV/HSJ3VnAgw3nuLvxQBrVi 9EIQ== X-Gm-Message-State: AOJu0YxgHEF8mJWRJu94GFBWVALgOME4iJPPLZoBF810V4HzOuWZi8wX LcgIKHkeUjTViAXRz85CmL4gRiTfCPqKiQyYcn1EV9ctp/V1+eTbrsMPPQ3Z X-Received: by 2002:a17:906:bfe7:b0:a45:f89b:a915 with SMTP id vr7-20020a170906bfe700b00a45f89ba915mr4047456ejb.45.1710173684184; Mon, 11 Mar 2024 09:14:44 -0700 (PDT) Received: from mariano ([188.210.239.79]) by smtp.gmail.com with ESMTPSA id h19-20020a170906591300b00a449756f727sm3036595ejq.147.2024.03.11.09.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 09:14:43 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 1AE3ABFCDC; Mon, 11 Mar 2024 17:14:43 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Mon, 11 Mar 2024 17:14:41 +0100 Message-Id: <20240311161443.323282-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavf/fifo: sort options by name 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1iXA6d8yee5W --- libavformat/fifo.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 074a46485c..a3d41ba0d3 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -663,36 +663,36 @@ static void fifo_deinit(AVFormatContext *avf) #define OFFSET(x) offsetof(FifoContext, x) static const AVOption options[] = { - {"fifo_format", "Target muxer", OFFSET(format), - AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM}, - - {"queue_size", "Size of fifo queue", OFFSET(queue_size), - AV_OPT_TYPE_INT, {.i64 = FIFO_DEFAULT_QUEUE_SIZE}, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, - - {"format_opts", "Options to be passed to underlying muxer", OFFSET(format_options), - AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM}, + {"attempt_recovery", "Attempt recovery in case of failure", OFFSET(attempt_recovery), + AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, {"drop_pkts_on_overflow", "Drop packets on fifo queue overflow not to block encoder", OFFSET(drop_pkts_on_overflow), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, - {"restart_with_keyframe", "Wait for keyframe when restarting output", OFFSET(restart_with_keyframe), - AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, + {"fifo_format", "Target muxer", OFFSET(format), + AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM}, - {"attempt_recovery", "Attempt recovery in case of failure", OFFSET(attempt_recovery), - AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, + {"format_opts", "Options to be passed to underlying muxer", OFFSET(format_options), + AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM}, {"max_recovery_attempts", "Maximal number of recovery attempts", OFFSET(max_recovery_attempts), AV_OPT_TYPE_INT, {.i64 = FIFO_DEFAULT_MAX_RECOVERY_ATTEMPTS}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, - {"recovery_wait_time", "Waiting time between recovery attempts", OFFSET(recovery_wait_time), - AV_OPT_TYPE_DURATION, {.i64 = FIFO_DEFAULT_RECOVERY_WAIT_TIME_USEC}, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM}, + {"queue_size", "Size of fifo queue", OFFSET(queue_size), + AV_OPT_TYPE_INT, {.i64 = FIFO_DEFAULT_QUEUE_SIZE}, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, {"recovery_wait_streamtime", "Use stream time instead of real time while waiting for recovery", OFFSET(recovery_wait_streamtime), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, + {"recovery_wait_time", "Waiting time between recovery attempts", OFFSET(recovery_wait_time), + AV_OPT_TYPE_DURATION, {.i64 = FIFO_DEFAULT_RECOVERY_WAIT_TIME_USEC}, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM}, + {"recover_any_error", "Attempt recovery regardless of type of the error", OFFSET(recover_any_error), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, + {"restart_with_keyframe", "Wait for keyframe when restarting output", OFFSET(restart_with_keyframe), + AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, + {"timeshift", "Delay fifo output", OFFSET(timeshift), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM},