From patchwork Wed Jan 10 21:37:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 45557 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1321631pzb; Wed, 10 Jan 2024 13:37:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBrVt5fgF8amZVV4BnAZBl6u3KfC0DK+UJ5DJOAEmzs92B9NKYJBILZMi62e/Hop4/KNvC X-Received: by 2002:a05:600c:1c02:b0:40e:4ac3:faba with SMTP id j2-20020a05600c1c0200b0040e4ac3fabamr24409wms.203.1704922653096; Wed, 10 Jan 2024 13:37:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704922653; cv=none; d=google.com; s=arc-20160816; b=YvYx10CMtrlolZbAMRyMMBbbsEsX5Nd8B9L1HS8qWd298+APzT3dBV8XCesGOu5/MV Zs1WXuLbe7MSevXUtQCjwjQQBGsKeOKwLBCg5/UP5hoNXkHTltUBDVUAH//geEVJ4aVc byl8PzwGu7gSp7KFmP0ABP5xrD/CwYXWlY7OiKUhHpv9hGnGbz5nzof6bc48qd8i8cL+ ELfJd7lUsTaccj72IIHjtozLjqNcLcEWHvYzt8Ov4mSfSH3rTyJQ1ELV45G0iPo5xF1z pFlpJ4esSH6bxozEUaW1Ghw5xbYqabOEIZlvcMOeC2vxMCny+470HKrv0Y2SqyKoezvT f1sA== 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=TNR9PDX2Y4lGOMRVTpn+yIAPxFk3pAn13PuZcIO7but2GXEY31KH4ZQTxH9xtBPpiy cqsS2EMsTaDbVfheA/3MQPrccfrxRNdAcmdJMCnfJiU2eXfceFrfC+EJUtE5+vPEvoHn u1HKeAvIZLrMJjTQ2Z7C2bOBT3wRlak2ElKfqF2kbFDgtNfrwyxybvbvY1Cic2BkyE/I 19Pp0JLpQnDh2P83MmVzVQwbX+AcFptrWVKJHJizYEPYHO1iZYHzjujmnuostxCre7VF 9+J3E7csDXj8V/FQlly/SRZFRcl3bqvCjKx+k0s+UbRuKt3vMKegC0hKiRlEd6rt9CW7 zv3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=MDcHmTKr; 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 z18-20020a170906271200b00a2b1db54f7bsi2121195ejc.39.2024.01.10.13.37.32; Wed, 10 Jan 2024 13:37:33 -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=MDcHmTKr; 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 45BD168CFA8; Wed, 10 Jan 2024 23:37:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCA2768CF80 for ; Wed, 10 Jan 2024 23:37:14 +0200 (EET) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-40e5451c13aso17115275e9.2 for ; Wed, 10 Jan 2024 13:37:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704922633; x=1705527433; 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=MDcHmTKr+y3R3VpjKsBagKMcjPcWHqyw7uZSXWFZ97xBp2j6hNgXf5ikin7YRmrwBn KQcAvVZBrEzVLq9KS1ReOtr5Xseqn9U4k9NAv2nzaFuL0voXJZKnefqDgVcgROkE+5Ft PxadFG+9T+ixZ57N+ehHx6HaJQyEUt8DQKCYKTeeMOpQqfcoxi/8Zp5sg1/v+KdIS1GQ hAC9uYeP74h5sQs/v0BLJax1cASo4izUGKQPPFptgPIgtRN+NWgFVCmfW7PzQKyXMIep ynISc58iVr54reKUUpmtZgPlDqZ3g4w3IdmKSjaPwsbyyVEN0KukmLdUEYYdpCaRszeG 9L4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704922633; x=1705527433; 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=ftpLeR03GIN2VC2l98/fDo63aFTjQFLSjEWneamYH2m/9u9RSq7q1Hw8dCyeB37W1X 0irDL+IsL237zm3bCaWT/gxum29RkZ77YiEjC296eo8rkR0mxECiId8YoUycvAcaR3yp gaMYZu6ZpTQegicqLZMeuV6swuOdG/ONSkzsZw8NAiWmP9U7ouILy8ms1CO6mZLlkMeC do7npFiHEv7r/GiLF4Q1RLbXxXJlIrKGqlp6DkBFCDAQF/TiVPfyLhgmd3GTmcCZnEYr lsxgQMP9/9Kz6ZTnHhZGcr882Mm20PZOUjLYQtMUxbiR/67iFAdwPT1PJXYSjp6XMYNC S4iQ== X-Gm-Message-State: AOJu0YzmA6uNrtXDQIcUJCVia3O1ysRercpz9jwpmnjAVvdTVxn1lVPl 6Q1KWtDmd8X0TeZbe4LHXBxWOmFdABE= X-Received: by 2002:a05:600c:4f87:b0:40e:59ab:b954 with SMTP id n7-20020a05600c4f8700b0040e59abb954mr22739wmq.192.1704922632549; Wed, 10 Jan 2024 13:37:12 -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 oz14-20020a170906cd0e00b00a26a0145c5esm2446197ejb.116.2024.01.10.13.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:37:11 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id E8BA2BFCDC; Wed, 10 Jan 2024 22:37:10 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 10 Jan 2024 22:37:07 +0100 Message-Id: <20240110213710.450414-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: T5qwZcFVGgJc 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:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 45556 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1321565pzb; Wed, 10 Jan 2024 13:37:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IHk28X4niwzj9xb7yx1J034DtMnBMOdrGnirQk3IPBVD9Oj3rwfWg/roEX7flWFIIK2B33e X-Received: by 2002:a17:906:2642:b0:a2b:d1be:936b with SMTP id i2-20020a170906264200b00a2bd1be936bmr694880ejc.34.1704922644022; Wed, 10 Jan 2024 13:37:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704922644; cv=none; d=google.com; s=arc-20160816; b=kTnIonjCu57UAE307PYXnKGQqzQ1rO8YKx+LDdVMRbk/uAy5vWOdSz7gtu1OHfuI92 SSIHoofY/ooBBU1GLD+dy/YEnW8Xkk9PGl+E2OY2C54L0kAcma4/+lCXpuKSyscX1bpW QanN855T5hRM96jcRluPX94w81dX4L8FmAeb+aI9HvTwB5/SBGrsWExp6Yr6iTsbGSCi oYcTe62Kzdb7mB/CjKA/G9FLRHlSQW6JtoX7XTV6qHGBmVJBsHtltVw2TSLNm2ptQWW/ bVvqOr0V6ftYuZ4lCN3ezyCjAhhwr5HGOe3FgSfZ0WIm5lPteHW8iklYZ/aCtmcyx1dW LubQ== 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=lboTcWv4/VKOYZQoPnOB30WSy0P5nY5h8kLmKL5lvxZgrjjuzEzekhSR2WGDr2jEO0 muYphMgf9cnD7peMDA1CGRB5fQVa7fQ8TIFNAFaFa8KD76hHvBGngarq6Ei+ds2QlBxM 76dKTMugNM1iMZFX0Q50bwS5IwHIsBEGh3o/dX2CLdPzTu45D2h/dSHEehK4qm0EQqe1 ts8rXELVDu1Ohl9k2FviVLw/YtSrCO/2hq+AKOV0CLaGYTZ5Apu9vM16vsC9Rh6KanNF aVRAFUeIikiaDkW9/7zSZ/JLMuafG0iCZL/6NVwevSoQx3MP4LJ1VPWL4m6L1MOX2umN /PUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=QV+eb9Zi; 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 y8-20020a1709063a8800b00a28bb1abe4csi2067536ejd.703.2024.01.10.13.37.23; Wed, 10 Jan 2024 13:37:24 -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=QV+eb9Zi; 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 246E768CF93; Wed, 10 Jan 2024 23:37:20 +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 94CAE68CD4B for ; Wed, 10 Jan 2024 23:37:13 +0200 (EET) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-557bfc7f7b4so5962808a12.0 for ; Wed, 10 Jan 2024 13:37:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704922632; x=1705527432; 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=QV+eb9ZiGdUWM9AfNdtcKMAgAxsi6PsWO/E/a71ELiXIJtS3BC8S1s/HHqJipeRDnv SA9ev4F2KW0BE0mZ02ne0hhPdz6kb1VkXoJRBi5gMi8DsH8rC6RZXY0JkTTx+dHnQyYk 3+ZLZbNUWce6Njx+yRys7NdkUwSyaBGhw0s9+bXElV+mjsy1ERE/kaoqTVj+/aAJojsz ltPqoqbZAu74ZiZM/EVSZAboA8BKVpSDv8L9t1J98XBqvli4/FR+FpneAzjejeP9Acvx 7/fhlRebr01Lp4aIzkN/feskDVFAWxLIT4qQmw14KRJ85vLkpb+P1p4ANLvTV5H4SuD4 QSEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704922632; x=1705527432; 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=AM0hy0r8Zbg4Gu1be1uity/06uDrwXz0HFLtaN7rxQjiEAMZayK5As2LWEtYTUHxpP 6rNGt1tZ7gYwp7Axzx4YXEuhaFzWCLskg0c1YOCII1C1/QCvQR8l8wSxJDyk/jXyXuKF lcbubZxzQBX6YvG5muLMEYGKlpg0ky8c1Sc81XGTibGIKzM+i+zZcIf3UuMqYkAeT8Fd G0qCw9lbMqb1lvdBsAG7DSqDeopfbTMj/gxdkGv4FOeLJruGnx8boDdWNz15U7ViDjAb 5gmkaWWzNPWMR+eU1RulZ/7RuE938V1w1wnh/RAoAaZkACw8aaDuexssV1toorujVmaD R3xA== X-Gm-Message-State: AOJu0Yy7NdcnEF3+a5Q+6EN2572hjYRirmAN0rQ8gaBPTEVzbuzyIbWa ckjky0yUPvtsVypvvDZSfTLz21g00eY= X-Received: by 2002:a17:906:46c8:b0:a28:26e9:a13d with SMTP id k8-20020a17090646c800b00a2826e9a13dmr106685ejs.55.1704922632372; Wed, 10 Jan 2024 13:37:12 -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 ha3-20020a170906a88300b00a29bd8f9edbsm2454333ejb.72.2024.01.10.13.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:37:11 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id EA750BFCDA; Wed, 10 Jan 2024 22:37:10 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 10 Jan 2024 22:37:08 +0100 Message-Id: <20240110213710.450414-2-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240110213710.450414-1-stefasab@gmail.com> References: <20240110213710.450414-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: R8Jl9K3IAbGO --- 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:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 45558 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1321703pzb; Wed, 10 Jan 2024 13:37:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IElofA/e/U9CrIm+bKv7HrSFRth24af4p4OJ9nWsoQSddxhflrIhSxP9gE7MsPwpYKsiNvB X-Received: by 2002:a17:906:7196:b0:a2c:fbb:1151 with SMTP id h22-20020a170906719600b00a2c0fbb1151mr68148ejk.80.1704922661289; Wed, 10 Jan 2024 13:37:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704922661; cv=none; d=google.com; s=arc-20160816; b=MaWjB1yCh92lKOImfIxqrQ1rhfBv76LyWyIC/3ztvNgqX1Ke96/y+JvWmCDTp/wJHM BHpajNnk1ADX6e3it8cIw5CCvx/QsDc2iwFKlG5IuqikAuSPShJwwsupt4I7via+I70B BqddjNkK1lSyyYQN9IKK1L7A52kE7yWQsei0OOtj3cZbCuZCCSLGNOH0s9Sffw81gJn5 Ob5AqipqxEG9MzWECKG+gGJuFsS3647UxxFg4Jfnz2Wzit7dDxIjTUYvWwnchlidQ+kg +u4ar5Gn3v4isH1t2suid9a4g900L6Knm/bU7jtgzSPs/ETPSmNsFK5wYnVHCkZ7cu6t yXOw== 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=wsDMic1cTVHRHVuDq6SuxciFCX85xSfzyKL67IyAdLvbLacPGyiPQVniAKnthKibK6 yhVscudeXJE6M4/Rl8hHDDIzPVcLXS0un9Dz/15LBjsI9X46Z0nrkvHIzXierZTL9Mdd 81DR42Ix1UgL7giYZa39U8wm9m8SXTt4IOLwxhB7Ne7iT40YW5a0cwvKL/8bUv9sUONh FRTim1AVRIyX9+LaqCra0DDqaTRyPkAhBXs9ph/BuZILe+z6B1uecsxH3/1sQICFA/5W 7XupTw/E3KRlTDMZopg6Zd491cUnj6GuNyGqLk29D/XEogieyHzVWH4ad0AIPhhIaZks Y4JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=AlWFvzAM; 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 f11-20020a170906494b00b00a29db1c9245si2040045ejt.478.2024.01.10.13.37.40; Wed, 10 Jan 2024 13:37:41 -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=AlWFvzAM; 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 6B49F68CF7F; Wed, 10 Jan 2024 23:37:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E49568CF80 for ; Wed, 10 Jan 2024 23:37:15 +0200 (EET) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-a2c179aa5c4so76303766b.0 for ; Wed, 10 Jan 2024 13:37:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704922633; x=1705527433; 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=AlWFvzAMCNuWRw9yQ7iAHUAm1dPUKvh+2F9ljRvP0kUfYSnVQ74C9VZ5ccVl/z5jDd D0USMB5G2fSAdtkF9iUb3itJSAlpWoMiXK15yWZK+cZ1SEyXVL48z6fwwdKwMCafXwZV wCL7A/PQ8x+PFPXmJX+QoOAd+ZdKul1mjWBw5x3g93CHKKCLtQXMnRjth/6bY7dv1iJs EJxy36uE7FIeqKWneWXd1EvybH+MPKC2ULivMHsT4SbtbScuKnfS0OokE3iyJvGcUPZO 5bIsZPURQ6OoeFfQwUE/0BPP7vQfFByAPrblzuxAJ0QYuIabA5TBJFnKK0l3gMpkqy7f 5ROQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704922633; x=1705527433; 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=WB+o5SdryadMR7IG3leoFPaLGSVvJnCTx3N5gIAitiD2EiULaQNQP0mq7eWBAElYD/ 5oh56MVQgCOanyO8Wap3/4u5Llx1AiUeukBHnxAq3R9kLw+xXHuAo7HAoCoxu34AoSE3 r6uqDn2KJAJ2yvV5VzBb4n3/0clvKlB2FZsKP2obn8zRPLlO4uXv0xjaeWBBu9aOzORk FYer24/3OWUfyMU4MMvVNIBUlu10cz5WfKxfH9KDZqkQacTp0aC/2C2MeAmbcriinnOW kFNKgD2HTQuSg9MC89CW1CWDJ8yg5tq7qqh9PwCqc8ZpfyyS4/hw89jHHcGrBZCGIFTR MJTw== X-Gm-Message-State: AOJu0YxDkdovNxnBSwzwW4mimWQENmDJbNW0qD+4LZ/VKav4zDIdfyjp gvc7PybI8wkfIn7Xf+VPBz+V7QIynrA= X-Received: by 2002:a17:906:941:b0:a29:db0c:9ff3 with SMTP id j1-20020a170906094100b00a29db0c9ff3mr67651ejd.51.1704922632802; Wed, 10 Jan 2024 13:37:12 -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 dx16-20020a170906a85000b00a2bf9b00508sm709160ejb.141.2024.01.10.13.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:37:12 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id EF113BFCE2; Wed, 10 Jan 2024 22:37:10 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 10 Jan 2024 22:37:09 +0100 Message-Id: <20240110213710.450414-3-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240110213710.450414-1-stefasab@gmail.com> References: <20240110213710.450414-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: Oy1oviwSKrTc --- 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:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 45555 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1321753pzb; Wed, 10 Jan 2024 13:37:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IGja0/R46Cmq3l8CRN+mRgJdRCMKNols/XYCDxEe9G0uVQ24dmpsLFrEGwKgf3j/wI+y7nz X-Received: by 2002:a17:907:6e86:b0:a27:4821:756d with SMTP id sh6-20020a1709076e8600b00a274821756dmr91867ejc.38.1704922670016; Wed, 10 Jan 2024 13:37:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704922670; cv=none; d=google.com; s=arc-20160816; b=Mzkat0qnWcBiIWGQjnqTQ0Wx8oEAmb++KTw8kpU8p/UcmHnr3bBa594dvFmYh+Q3NA WzAl5ypLvQKW1Ps/nb1+EOv/FBO54hGja3N5c/V8KCaYVAO2g63PYIOEF0DlvlrcBtsC OUcMbKRiogyRJUjpgTRAmp9vcFZ0njUbTQp52XXDRPZUDaifUnzagv7+hN24LJn8vBJ3 wLQdXNW3HJvttFPpFceLKOB7yk9fOLCgoY619JmmzB782owx9eaCZFCM5a5KfyisBW6F neHkMiVsX96sMsq9D68JEp6NACR/4mH2zNsUJOos+g4YprBzCAxZSg7Pcj7f5rz6+BAD wV0w== 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=hNYODXnXRaKNGUHacPAykvpCY7/qx3O+UvNezH+VMcInwFPRQEUscgcNzqXg2MH0JJ qqaJxteC+E1/aXq8BjuMXB2cfuXKY9DXD5U9YoUjyPABuR1PCiojIAnT+/J+ItdXqp3d lAvjLi/QFjmyIneAzzHD40p6PWWYgjBT1oof/UkPPbPoZuAOelk/JiHMozxKL0grz+uJ JeMfnud2ys/ZzilQiX+TZFhO9j54/1MfbdXgLFCXSe1cISNHuB5WUS2fWYtUGowASmpM 9vrVs5UUL6fCw+2qElly8fBaPln70y5/olqgNgMJWZma3sVKnBM/3ogh8pOy4rDMFbbA j20w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=SISIHf2R; 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 hk20-20020a170906c9d400b00a2a637c5f15si2050428ejb.871.2024.01.10.13.37.49; Wed, 10 Jan 2024 13:37:49 -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=SISIHf2R; 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 8C5E768CFCE; Wed, 10 Jan 2024 23:37:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8743668CF9A for ; Wed, 10 Jan 2024 23:37:15 +0200 (EET) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2cd1ca52f31so53299741fa.3 for ; Wed, 10 Jan 2024 13:37:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704922633; x=1705527433; 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=SISIHf2RUhNadHDGw8nM/LufYVOw6PKQIeld723f1DLtsXt+Wqdko33j3zWq4lrTcP 2+QMYxauXlDXTRBP4ipxPKqApxqQx4Ae9c1K3Hsac65kqSfu/ADUYh/yVLZK8EF7LBNL BxBpOkvFpb7RX38AMaJTmdPq4NjHtB8fDfN89d+qPggL0zotNKuQKx3EySE3/5G0hI+n RnBphSUXjACItA5Iptlb1Ck6JGoggNzpYTi6jiMo+r8M73OJGUBmWQXKPEtpfQcwJjrF l6zHU0VSAprwsyRFvYlPYgwEkPSMAkcyHPgwBB+oioHbHzO3KCI0dYigIOIlwXYv8YF8 01iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704922633; x=1705527433; 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=eHXBjv+n7utbFmHYCjqJ86vvMENl7J99BOrGyjO0LGglfxJxWX3T4Djyph1xf/uQfp vTlj+fcGM+GVmbp9BWwSVKAuHZ7S7QGzgNYgFcfJNTTUY0qtn7a/PKk6a+bxVjQOUHKt wM/bfLSY7vKS79IK8g/5fGxe49IaJjCo72brDPeWb4sZRLUAqw5f6i+R858THlMfPRWP kGsjJdA4Op+WiIi1CNAqkEjprESzFQVR+Q/JO1U/VxPU9RzdsXYTTUqHD1LYIIX6s1Hz 56I6v9z2vomll1RMmEAhRMrrbJB0lKLfZdVfMcCnCcSWGhWwocH6etgz3lltQ9iUPtqo L1Rg== X-Gm-Message-State: AOJu0Yx/egdz7fek7gJ8Hph31I+7rPYvbGhY7Gep1dfAIe98rgG+uQ9o UvQYnS7u3KfIAYpdwH/jJd+UUJkemsE= X-Received: by 2002:a19:6745:0:b0:50e:7a9e:4846 with SMTP id e5-20020a196745000000b0050e7a9e4846mr30567lfj.70.1704922632980; Wed, 10 Jan 2024 13:37:12 -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 g10-20020aa7c58a000000b005546ba152f4sm2364023edq.71.2024.01.10.13.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:37:12 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id F3449BFCE4; Wed, 10 Jan 2024 22:37:10 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 10 Jan 2024 22:37:10 +0100 Message-Id: <20240110213710.450414-4-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240110213710.450414-1-stefasab@gmail.com> References: <20240110213710.450414-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: gqOv+gGmUyAe 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}