From patchwork Wed Jan 10 21:37:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 45562 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1321976pzb; Wed, 10 Jan 2024 13:38:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNWFSpntnK9ohgxkpkcyV5d/p4WdnSrbAh34gdY+qcqO4OGwqA8XN7EHlWUh9IR8THUA97 X-Received: by 2002:ac2:5939:0:b0:50e:76ee:452a with SMTP id v25-20020ac25939000000b0050e76ee452amr52462lfi.5.1704922703215; Wed, 10 Jan 2024 13:38:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704922703; cv=none; d=google.com; s=arc-20160816; b=SMXjzijL5ubmMNot5sCxHsBb/yLJYn1lEzaRrU2pHjudXWo+dtiVDgfEQPOWusJtfe ZrFyDKWIMRJvTDU0R5X483nRsy68VzgsGCWQQVUO5lKfXH9Z4+Rpyrib5Hz961aoIX7N aFDuB4Imfa68+2XhP0TMKZjCVlfVxmDPEkJWFCV4loAt+56NW5WFf4N6xOnLilNUaYAP vRmhaGFX0uKk4nt+IoSB/A4/3bcb2s62sKLPWlvjZxJjLZmMRpwGQsuCvgFav2UcqYDq 2O78i3DUPXdjAtDVo7yMOvPby4lVDDS6MbkP7pRsa+On/poe5XMz8PnvYjiXy9Uk5l6E f7/Q== 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=7P/K/aJh4odr/uUtqlFQPGFn96mFnTygJ9/4ygTEzlM=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=KGYHc/BBGt67FzknlYl/Y+OjeT2mAi1FmdA7ZzPzwjLABdrM4X+Ff/t56AQhdWzQmG X3bO3PVcAYJmuWF1IiOUwdaXcg6B2zx6hXyn3C9d4fPrYtwNHKf7PC0VrzbAyb0DRWSA bJ7rhkTGp6BJpi2UgQRWYTJPmN5ybxifrsuieKU62lzyKQiQ5JOkpyO2PEeeyhtoExPd bPtLhCSfW7Qh1Z4R0TiTFXJ2h3wXPqCXcZvGBG2xsGwWMyZhzTmdfxHezmbiR/z5hG6A tK4qkDOoN5BHL0DR5LRXk6oa9Hjibk++S65EzQxzX9arcxpp7NuGTf4YZNVaGurlnJ0F gu0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gHrJcJMd; 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 l9-20020a170906230900b00a293cec0a07si2058827eja.160.2024.01.10.13.38.22; Wed, 10 Jan 2024 13:38: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=@gmail.com header.s=20230601 header.b=gHrJcJMd; 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 8C1A368D013; Wed, 10 Jan 2024 23:37:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E42D68CFE4 for ; Wed, 10 Jan 2024 23:37:21 +0200 (EET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-40e43e489e4so53149965e9.1 for ; Wed, 10 Jan 2024 13:37:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704922640; x=1705527440; 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=n6Z4ELsE6SYgQJBM7Z5/mqzHFz8a+iMVct5WXZP64wA=; b=gHrJcJMd/LANVNcaFNdImGwIPDF1QVJH8XtjsApEhnjdNNLWlPEy8fN1ZKs/pkeq/a bkta664Jk59MxpKYf8fpDEQ8kQn+cpstqDLaZpEsPj75BHhITiqRcdwbhTwJKHQBBW3F SY3Jym/fSNzl8GEu7M7gAcuAr/Lgh3JxLpgfeJczDhWjLwZbuOZg7WlNHDLKgpnM58Li hOxlu/BGJBmMAtaB/TndbLLF5nbGfPDFk20WS5vx5vm4ARrr8LxjPKytmtfEEA4c5oYM mRG1sbiUxoQt6ShpWceZ3OZmurP8oJc/ghVp2EfE9nNKN6ePgtWDSNkjOvdSioq3nwyP PHLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704922640; x=1705527440; 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=n6Z4ELsE6SYgQJBM7Z5/mqzHFz8a+iMVct5WXZP64wA=; b=hx7dvlvpaWvJoJpsa1ZafjyqJmsi8hgyihYSMXUiq3Ht1I6CAnXxnW6KkXZW+20XSc KLVFMd33jdnMO+4qWbNGRG3ZJyoHhDQzCz8ZauSEYNNiJ1BCGRsnfgYCKqShRHqmWRyV eNS7lS6VHJM/ge0KMCQtbWEjB+uH+qBFEfsaE6JRu1WHOvoecDGoWcCdlsOopHTXtjc1 xfJ0gHlyUVbZFFYa8oXQOvE2mjT/gs8TK3Euka0ieKZ+2GhTeuV5RshzbNy4DFh4NFCx tXFOtpgUmlWTxtznqQG+HE+LgJd6wUZmkTrIc4cQFdXnawicB3MDWyD7ZiXvKq5X+5XM IVLA== X-Gm-Message-State: AOJu0Yy+yqb4hV4QEhzOuKVrJ48FG/S/AketHHF2dHPIqFRsm8Yp+3zS 9Hq0Jo9Zxu8J6ZBg129J53E8IX2xlFE= X-Received: by 2002:a05:600c:468c:b0:40e:5492:7153 with SMTP id p12-20020a05600c468c00b0040e54927153mr37030wmo.182.1704922640277; Wed, 10 Jan 2024 13:37:20 -0800 (PST) Received: from mariano (dynamic-adsl-84-220-189-10.clienti.tiscali.it. [84.220.189.10]) by smtp.gmail.com with ESMTPSA id g19-20020a170906349300b00a2a2426728bsm2491865ejb.178.2024.01.10.13.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:37:16 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id 99207BFCDC; Wed, 10 Jan 2024 22:37:15 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 10 Jan 2024 22:37:12 +0100 Message-Id: <20240110213715.450452-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavf/astenc: fix weird indent, use braces in else statements 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: oDEFU6qwtpS7 Braces are employed to improve readability. --- libavformat/astenc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libavformat/astenc.c b/libavformat/astenc.c index 259948b276..250a54b573 100644 --- a/libavformat/astenc.c +++ b/libavformat/astenc.c @@ -143,14 +143,16 @@ static int ast_write_trailer(AVFormatContext *s) /* Loopstart if provided */ if (ast->loopstart > 0) { - if (ast->loopstart >= samples) { - av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n"); - ast->loopstart = -1; - avio_skip(pb, 4); - } else - avio_wb32(pb, ast->loopstart); - } else + if (ast->loopstart >= samples) { + av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n"); + ast->loopstart = -1; + avio_skip(pb, 4); + } else { + avio_wb32(pb, ast->loopstart); + } + } else { avio_skip(pb, 4); + } /* Loopend if provided. Otherwise number of samples again */ if (ast->loopend && ast->loopstart >= 0) { From patchwork Wed Jan 10 21:37:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 45559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1321804pzb; Wed, 10 Jan 2024 13:37:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwwYCLia9qb0l/SvpzjxhRTtEemCdMjEXexByBcbHK5lmTMPsCLMSXIA81upo0Cif7s9oZ X-Received: by 2002:aa7:c30a:0:b0:552:391c:c8e1 with SMTP id l10-20020aa7c30a000000b00552391cc8e1mr28022edq.107.1704922678172; Wed, 10 Jan 2024 13:37:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704922678; cv=none; d=google.com; s=arc-20160816; b=T8t8H3xLRP1M1zzSktAMXESyOnM7lB1EUbQIeOsXcg4sIFne8NUTJ1e3ra6kFQFjUs uUlu4FsG6yNepao2+ppm1u2Evf4922btA8IgjhY9AJgpzkKspRBaiTP9JY3HEczdWaHr r+nKouD0XJqR73rPQeJgzpO10qR1qtnzBS8IBVkw6g7TGa7ZtQWeivVk2WshWzDloWSl +68cFTnwx5cQqK9Q71eBdPNG7F4J5f/XoLXAhjV7NdTdYePsT4AcZLi+FKPoM2R4IpUZ O96gPPYjqvystepXNr2eMrWTvPvWJmnR5mUcf1QXPzWKahuJdj/L1fwLt/nuz0QZ+xHP 6a3A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=FWsj/hoO6guITLvxaUu3Ul2GAVkzqA3wJXCPX0dv5Yg=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=FPU0i8/FtGR/vpYSLileoVp1IxNlu9JRluavwbd4GcEvUEGzBEGZsgmgwJALaA+BNJ wfzQhDSr2V1yeqPbaArr+5kr/96TMs+fAW40Ouu2Vtmw6ITED3AjXBy3ouHTp2NgPv3h p0c91VMAK0TE8wYocC0Bjo1nK10h3JPryAz3Y9kTW54W/681sD7D337vyaiwn/9fHYnx IdYm3CpsxtWazvt32EkxZkYaP27AE63Vs6shGnzf+T6uSwocExYApOmW28A4NRmwk1aw y9NM9i+KG46jRT7rlOFB9gp3BPImzReBa1MNv8r9rxz+l9Inm1P3869XbVu0yePGkPUT pDKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=PGZnft0k; 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 e28-20020a50d4dc000000b00553ab5afef0si2023643edj.662.2024.01.10.13.37.57; Wed, 10 Jan 2024 13:37:58 -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=@gmail.com header.s=20230601 header.b=PGZnft0k; 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 A3B0C68CFF8; Wed, 10 Jan 2024 23:37:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C357468CFD1 for ; Wed, 10 Jan 2024 23:37:18 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-554fe147ddeso5454911a12.3 for ; Wed, 10 Jan 2024 13:37:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704922637; x=1705527437; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EQd/bj6oMfxJd/YRvRwaDqxxYXumZ2Ba+VqnkXTLrxU=; b=PGZnft0kMJmV2sD8/N8icabA4b+fH4cWF0o01jiXK3kiy6JSpfh7XHZu7JYSdLGdsa bqPNbmtp1YNOjSaJ6brk+nXJlS2Qgm4tjrjqG0ni+/6ULsmSN6Fb92X2A7SbPZsL9R1V hl/Q33n/EHz474tu4+pfVtrPzBzIKrJA3DoemqPWe3osTTdisW6Utl38DtCr99AGBRER /ziiezqlqtPkYImKw7oUNYXHuqBhE7gt3PhiyFt6/y3VUczJ4WLS3Jds618D/GC0D3W1 iHESmbX7QTb/wdAOkxa4LjmaNNp+IdNdEFisBHc+T/lbOFXWhXlfTDN+oL2G1RUlThhM Vsiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704922637; x=1705527437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EQd/bj6oMfxJd/YRvRwaDqxxYXumZ2Ba+VqnkXTLrxU=; b=PyS7iHxewjgoHUWn25rBYd2Zo+DGP0yS8EUurm/FlXqyiLpVaqwvoT3WaKedyoI9fK edNIU3UmuBQ0Xu36CLTrg5nMcyw5ItGNYwn04IBysVnT64wO2YwWlCcvkTXDoIMT+pQ3 kp46npzTZ75YZHVUH0gJdi758CsBD19lK82Izl6TVhCNHYHVRFlp/LV/YlI6ZlgymHX9 LpRfTNEBMDpdbdpHOZH//817EqJY6jVrguk7qnoThf7Uh0/VCvFqG222fkPLH3Dq+xP2 cIcSQ4L2YRIsniQ+PCBaTjyTMt2Qj0XHMk1CufBZvtFoDMXOqKa+KDURcseGSGDHkwV/ OgbQ== X-Gm-Message-State: AOJu0YzrQ6jmv/SeAGcsflH4dGZfvivam8/28pgcYuObC4Yc/KkRQbgS sLY4GU+sWNd6yVCQyP6sp3YYk6sJtLc= X-Received: by 2002:a05:6402:b52:b0:556:b230:9e07 with SMTP id bx18-20020a0564020b5200b00556b2309e07mr27487edb.94.1704922637251; Wed, 10 Jan 2024 13:37:17 -0800 (PST) Received: from mariano (dynamic-adsl-84-220-189-10.clienti.tiscali.it. [84.220.189.10]) by smtp.gmail.com with ESMTPSA id b2-20020a056402138200b00554d6b46a3dsm2366721edv.46.2024.01.10.13.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:37:16 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id 9C649BFCE0; Wed, 10 Jan 2024 22:37:15 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 10 Jan 2024 22:37:13 +0100 Message-Id: <20240110213715.450452-2-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240110213715.450452-1-stefasab@gmail.com> References: <20240110213715.450452-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] doc/muxers: add ast 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: DmNZGrHUm5ut --- doc/muxers.texi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index c8b2bcdea6..fee8321eab 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -763,6 +763,30 @@ default is @code{false}, otherwise they are cached until the expected time event is found. @end table +@section ast +AST (Audio Stream) muxer. + +This format is used to play audio on some Nintendo Wii games. + +It accepts a single audio stream. + +The @option{loopstart} and @option{loopend} options can be used to +define a section of the file to loop for players honoring such +options. + +@subsection Options +@table @option +@item loopstart @var{start} +Specify loop start position expressesd in milliseconds, from @code{-1} +to @code{INT_MAX}, in case @code{-1} is set then no loop is specified +(default -1) and the @option{loopend} value is ignored. + +@item loopend @var{end} +Specify loop end position expressed in milliseconds, from @code{0} to +@code{INT_MAX}, default is @code{0}, in case @code{0} is set it +assumes the total stream duration. +@end table + @anchor{avi} @section avi From patchwork Wed Jan 10 21:37:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 45560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1321855pzb; Wed, 10 Jan 2024 13:38:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/4+5P/nJkMj3OBoVuUb6w1/XUEZajaohtfjJoZPt9omdx5G0pnTY4eAyJPx+TwRMmKlot X-Received: by 2002:a05:6000:1251:b0:337:24bd:3fd6 with SMTP id j17-20020a056000125100b0033724bd3fd6mr60918wrx.21.1704922687114; Wed, 10 Jan 2024 13:38:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704922687; cv=none; d=google.com; s=arc-20160816; b=stpQTULtOiV71exbnh61vaeJKu2/08Y0gB9JLYA57ZwaZGKfg9h/8ffPKSmkbkdc09 lW65vQyaojaRME5ov5QzphSD3Ru3amJaxAVNXnqI+aJHdvlXfbisoZTs+D2wd8njOZBV VzSYxmyYDW2JmdnAuMxuJUv4OSStgV1BcMDrI2L8lOrL8BBlH1YM4+tPHWgcxfpJr5Xg 1A3TdUwSzV6C65sEkKWbE0kLWn00w2w7QiUwylIfo/bXrfr6JELhIWiJhUcKzJgobK2w CvY2H4nB06Pdgr/jxFdNhb4q9uugnJAgRXNXQw0nPCkpAUyUVWMJG8w3Rb+AnkwZsoSb 5b1A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ouXmJWcIbqkNdwCt/1/aRWPqCncYdnJIkuq77ztAg6Y=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=i6nNphb8cRWejdYHmt4zOaUvfuAH6ljON+dxyBpeevmiNN+69bbetIa0W7N+us4NZf AypAnsSVCqIDrrT5daiAbBzjB3fZJLZqMP9iJMRsZVV1hzjUFneBZ0I41nJ5zn1mY0cc 7FgUWSZSDp2D9iOCtWPTMD2azSZ9xU54J3zuSrsLsVy6v4WyOmm1g/Iq+AbioZyRzFgc 0gmLWttlnXd+yDWO4iVygcriijJWlw9MkCfjvVDK9LcE5kykjukOXpJXZ39wOJdfq6Uw mrwdTmAN0BQ6CwUnDYyh+FAedeSNT9v4xxHPXqlpRxRYmKyPBlgcEQCbeaGPFqQoJtHW snMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Tnt56an6; 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 a12-20020a50c30c000000b00556c421aa85si1981620edb.420.2024.01.10.13.38.06; Wed, 10 Jan 2024 13:38:07 -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=@gmail.com header.s=20230601 header.b=Tnt56an6; 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 BE6E568CFE4; Wed, 10 Jan 2024 23:37:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 799D368CF9A for ; Wed, 10 Jan 2024 23:37:19 +0200 (EET) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-55569b59f81so5780545a12.1 for ; Wed, 10 Jan 2024 13:37:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704922637; x=1705527437; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bH7ymITMMmHrVEzWrvmmIcJHCtK2TW/q51Ypn1UilaU=; b=Tnt56an6DywuKmaPP2xja6dfARMPyFrGwYD4iyHMBYfzREy5rqM1evA9KnAuI6rnqH V1u9hJN+j9RnwZWvo9vDtI5e3jGgI8GxF37WfIdEZKaA9YSBgfYxaZybGA7kehoLzFHd 8xFgNbrHKNt1295dMKA81t/gUUcdvI39A+dEk2KGmEyru0G+hsRbuhaL2OYQoXXR2/B8 YnpI2onddqLXE6O7z2GZT2aLQPEvpHK8pJyYGN1WMTy9pZIynvzGQmlo26R+4KKYqXSr N9QwpV+esqimGqMnGJOGG5adlqTgNQtdbqOePUfPqN2lQomPbLD6y8FHjZ2LDqkAp18n D6Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704922637; x=1705527437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bH7ymITMMmHrVEzWrvmmIcJHCtK2TW/q51Ypn1UilaU=; b=LutqZxHZPAGFoEyVA8R+sJnr+387/cStLXmhYyQwT+YWRotui8u0u+KKUlaPsvOItj P/sPT/Oqf7h9HRc2l5Su9t0Wdd5GZT/wGwaGGOiycsezAVfwgtWiPqerWl/6RPzEmk2c AXTFOI8Pi0oZ5ar41VidpQH8yo1S8Ku2S8aSwewqK/xP+LHClVcb/HI/oiG/nPSRk0XO 9uRYe9qsuqWEONHp9fBI8AMfb8xfrMi1pEVuTS09tD7inZP4QpS++KaFndNGGGLBuY55 TbrPtTVlvuy5/BbaOc2NUctfXkFRKOf1bWMx782AhK89wRaV52lZEgLyD7cmg19vQg3j 20jw== X-Gm-Message-State: AOJu0YyB23n8DjJjbRs/I1G4EZrp0+tlAvPHdnQgkDqNYYeRwQD3581S XQlDCSEmiY3XbUj5gRBhPubztF/oU6g= X-Received: by 2002:a17:907:3fa8:b0:a26:8eb9:8a28 with SMTP id hr40-20020a1709073fa800b00a268eb98a28mr114896ejc.24.1704922637513; Wed, 10 Jan 2024 13:37:17 -0800 (PST) Received: from mariano (dynamic-adsl-84-220-189-10.clienti.tiscali.it. [84.220.189.10]) by smtp.gmail.com with ESMTPSA id d13-20020a170906344d00b00a26f1e3093asm2460600ejb.49.2024.01.10.13.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:37:16 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id A0566BFCE2; Wed, 10 Jan 2024 22:37:15 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 10 Jan 2024 22:37:14 +0100 Message-Id: <20240110213715.450452-3-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240110213715.450452-1-stefasab@gmail.com> References: <20240110213715.450452-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] doc/muxers: add au 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: Yy4GJ/J5KQxo --- doc/muxers.texi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index fee8321eab..7ed5ed50a5 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -787,6 +787,11 @@ Specify loop end position expressed in milliseconds, from @code{0} to assumes the total stream duration. @end table +@section au +SUN AU audio muxer. + +It accepts a single audio stream. + @anchor{avi} @section avi From patchwork Wed Jan 10 21:37:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 45561 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1321917pzb; Wed, 10 Jan 2024 13:38:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpMmfXQHr/9uRwxvitMWiOfgsLMSRg11BT7kdQxFEnohLL1OzhKVuLu1lZ+h8qN6Zg7Hyz X-Received: by 2002:a05:6402:174b:b0:558:857a:fe0 with SMTP id v11-20020a056402174b00b00558857a0fe0mr49807edx.70.1704922695378; Wed, 10 Jan 2024 13:38:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704922695; cv=none; d=google.com; s=arc-20160816; b=mwK3fo984ak1ZkpZPRtRqFY6H+ois7/+F3l2FwBt/oLR6Td6uifoO65ZpkDMnuWs13 IhlOq1cQKtc/T2xFq+UlhId6piHtn2jznFF2YHusmMCohte6tPRQeY9KvefLurtfXeZ9 Z7NK2Lit3eBxvh4AwUqwIQ1voKT+VaV40FgIZLPxoqy8a+/B6opsN7wAtcSrkgGuzBJy nlw8NnYw6IgwJODy0AZHGD8IIj7xDN83FCEEnz90L8gJ/RAc+Onk4PJV9YJR/6UghF4b Mfqwpl27g0k8AwR31vU2ddqotn6ATQQNEv7xkbUZf9hf4QItBEW4sUwi2dwGCKu3aOEE q9fA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=hHW99ZXcslvcsB9eKVqdpiJxShhtQGJ6LvdB8WR8u9Q=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=xywwS1BelIqlieFXh7bhH3KdrjRcJK/llq9SCiDl235ilKQv6P1jo6qHkLFHonu8H2 CREPJVwAqmoGMx23TWTNnAOvS8Zg5L5QeBnSN8wKi1pRDTe+ZdvPmYNKSQQGgAc0FzA2 kCVD/sy46ssLnhMw1VfZNwFlsTQEdmFO6NOnSzUtJAOBxCY1YDgltz9aQcvB2ws4BOys tc0U7PBwRU/d4Qul3Nt2uDYXZd8uk7y6egGC4Io6t7ktVMkhcYn1bZMyE6LuYVTCq9+k FVLQa8VnXsJGRjwWPTJCPmgDrQl6pYquchVmQ11/1yaJ/ttDE2k+Az34rEBsbPEOSebP S/VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=HssGw9+b; 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 c15-20020a509f8f000000b00553ffeb0bd4si2016247edf.503.2024.01.10.13.38.14; Wed, 10 Jan 2024 13:38:15 -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=@gmail.com header.s=20230601 header.b=HssGw9+b; 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 8BD9868D000; Wed, 10 Jan 2024 23:37:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B07368CFA7 for ; Wed, 10 Jan 2024 23:37:20 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5537dd673e5so3948578a12.0 for ; Wed, 10 Jan 2024 13:37:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704922638; x=1705527438; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=orC9GEuKowAJOhDzTcwgr2vP6qhXCme/MyODYNNTop0=; b=HssGw9+bxNf9JfBHixFyjqZOvvzpW/BgZw4MfNBivC2hAHGjwRbfKf1+P+Ih0VxCfI ifdGt+jkCRckwcwGlQa/RRmk0UWpswJeHPS+ibsajt0B7PuwOFda2TZPndJKrFBeNuO6 RRnjxg5F0mMXLFjuKiiTPgL/yGwS6MjTW+w7qtTy669YvI+vdg2oazBi3tDOpe2d0HCY Ar6beyDzZDaRtTBfwOplimv60YvQh2HEI+YLY2Hx7HtMiLf8maPUqzkLV/6m45QjmHQT DPE8K5WO1AM97Aidb7Q0tbZByI1h5c4YdGx6qng0GPYg+8tDn7RTW+XYVeneX3CY0VGU H6Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704922638; x=1705527438; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=orC9GEuKowAJOhDzTcwgr2vP6qhXCme/MyODYNNTop0=; b=LiZJ3JB4XL8aGhJcdvHca/dN3ofaiZxa1ZQPteNkGbmLIgzTuEPAcLDzfOQairRN+Q 1vXmkoH35gFOY1JL+QQXJQzR7UmS2QBVhlEpxe7y7c41rABzGTPVqjkQ3uhiJQzTiTjw FRXzuSVZma1pBeY5Ze6qxYtkoGCc+FvJ13XHrh0+DGdpQhZuKFgUgIviV/5dn5O1C3Hw Jydx7PDOKXdZhY55Hx6CuEKc4ufcKYwAlEupjYJG1oyjOgBxVDpwtdN4iVzw9xKKEbki jktbzEdOpinryYeahQmAWm+kLMt9djK72pKewvmvOgTEqoZls1XYIHequF88VQBd/5E4 V57Q== X-Gm-Message-State: AOJu0YyOEx78o5twab4nb05CxsqYNEQChw2bzm2xMulg12UufFuCN+4u 1Y+GLT5cKiZyZBseP9S778OGPpAwaSw= X-Received: by 2002:aa7:da58:0:b0:556:fb11:c117 with SMTP id w24-20020aa7da58000000b00556fb11c117mr60388eds.2.1704922637740; Wed, 10 Jan 2024 13:37:17 -0800 (PST) Received: from mariano (dynamic-adsl-84-220-189-10.clienti.tiscali.it. [84.220.189.10]) by smtp.gmail.com with ESMTPSA id y24-20020a056402135800b00557b0f8d906sm2372632edw.70.2024.01.10.13.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:37:16 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id A4879BFCE4; Wed, 10 Jan 2024 22:37:15 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 10 Jan 2024 22:37:15 +0100 Message-Id: <20240110213715.450452-4-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240110213715.450452-1-stefasab@gmail.com> References: <20240110213715.450452-1-stefasab@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] doc/muxers/avi: apply misc changes 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: FoN/yvqFb4E0 In particular: * sort options by name * apply misc formatting and consistency fixes * add introduction explaining the need to set some options --- doc/muxers.texi | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 7ed5ed50a5..1c88816c3c 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -794,15 +794,24 @@ It accepts a single audio stream. @anchor{avi} @section avi - Audio Video Interleaved muxer. -@subsection Options +AVI is a proprietary format developed by Microsoft, and later formally specified +through the Open DML specification. -It accepts the following options: +Because of differences in players implementations, it might be required to set +some options to make sure that the generated output can be correctly played by +the target player. +@subsection Options @table @option -@item reserve_index_space +@item flipped_raw_rgb @var{bool} +If set to @code{true}, store positive height for raw RGB bitmaps, which +indicates bitmap is stored bottom-up. Note that this option does not flip the +bitmap which has to be done manually beforehand, e.g. by using the @samp{vflip} +filter. Default is @code{false} and indicates bitmap is stored top down. + +@item reserve_index_space @var{size} Reserve the specified amount of bytes for the OpenDML master index of each stream within the file header. By default additional master indexes are embedded within the data packets if there is no space left in the first master @@ -815,20 +824,15 @@ The required index space depends on the output file size and should be about 16 bytes per gigabyte. When this option is omitted or set to zero the necessary index space is guessed. -@item write_channel_mask +Default value is @code{0}. + +@item write_channel_mask @var{bool} Write the channel layout mask into the audio stream header. This option is enabled by default. Disabling the channel mask can be useful in specific scenarios, e.g. when merging multiple audio streams into one for compatibility with software that only supports a single audio stream in AVI (see @ref{amerge,,the "amerge" section in the ffmpeg-filters manual,ffmpeg-filters}). - -@item flipped_raw_rgb -If set to true, store positive height for raw RGB bitmaps, which indicates -bitmap is stored bottom-up. Note that this option does not flip the bitmap -which has to be done manually beforehand, e.g. by using the vflip filter. -Default is @var{false} and indicates bitmap is stored top down. - @end table @anchor{chromaprint}