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 ESMTPS id 337D14D78F
for <ffmpegdev@gitmailbox.com>; Mon, 21 Apr 2025 00:54:58 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46966688146;
Mon, 21 Apr 2025 03:54:55 +0300 (EEST)
Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net
[217.70.183.201])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73877687DF1
for <ffmpeg-devel@ffmpeg.org>; Mon, 21 Apr 2025 03:54:49 +0300 (EEST)
Received: by mail.gandi.net (Postfix) with ESMTPSA id C4BF74341A
for <ffmpeg-devel@ffmpeg.org>; Mon, 21 Apr 2025 00:54:48 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc;
s=gm1; t=1745196888;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=BjT1xKmmeUE4xOfGzACGcHmUsZ1exr9TVBoRxwwZWIw=;
b=WceXILpmgn7q7E2RtlBolK1x85q6Y17kurKUtAjwfQRAislp3/GPWCupzEhzUHLlc/nllF
zzW8gwhRlCRYKtvwNCrs0kLyTOhOBACfUFLgW55ZBXH6PecxdHbmvUWg3nM/vM30z3OXlx
HRJH3BSWE+tcbjfP06NByyWjUNcUjIxYwNwKlIJQrR/8+XKYhC77EqmaC43PMGOXqry19r
xYo5JPNvoHuhz5fpm1mlYZ7YHtSC4siwsrbRsVHaS6CPFnpkYSV7G3pA34jquTXWvQLqJs
7qEAz75iKLafs63/dDtqtc3P8VMmMl0IsJKLrVFHeaIsdQOQqaHk9J3i7iJDtw==
Date: Mon, 21 Apr 2025 02:54:48 +0200
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Message-ID: <20250421005448.GL4991@pb2>
References: <20250419190712.1265201-1-sw@jkqxz.net>
<20250419190712.1265201-3-sw@jkqxz.net>
MIME-Version: 1.0
In-Reply-To: <20250419190712.1265201-3-sw@jkqxz.net>
X-GND-State: clean
X-GND-Score: -70
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfeelgeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg
X-GND-Sasl: michael@niedermayer.cc
Subject: Re: [FFmpeg-devel] [PATCH 2/6] lavf: APV demuxer
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>
Content-Type: multipart/mixed; boundary="===============2890259357959638075=="
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250421005448.GL4991@pb2/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
--===============2890259357959638075==
Content-Type: multipart/signed; micalg=pgp-sha512;
protocol="application/pgp-signature"; boundary="TnhCK6PpBieOpFhs"
Content-Disposition: inline
--TnhCK6PpBieOpFhs
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sat, Apr 19, 2025 at 08:07:00PM +0100, Mark Thompson wrote:
> Demuxes raw streams as defined in draft spec section 10.2.
> ---
> libavformat/Makefile | 1 +
> libavformat/allformats.c | 1 +
> libavformat/apvdec.c | 245 +++++++++++++++++++++++++++++++++++++++
> 3 files changed, 247 insertions(+)
> create mode 100644 libavformat/apvdec.c
>=20
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index a94ac66e7e..ef96c2762e 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -119,6 +119,7 @@ OBJS-$(CONFIG_APTX_DEMUXER) +=3D aptxdec=
=2Eo
> OBJS-$(CONFIG_APTX_MUXER) +=3D rawenc.o
> OBJS-$(CONFIG_APTX_HD_DEMUXER) +=3D aptxdec.o
> OBJS-$(CONFIG_APTX_HD_MUXER) +=3D rawenc.o
> +OBJS-$(CONFIG_APV_DEMUXER) +=3D apvdec.o
> OBJS-$(CONFIG_AQTITLE_DEMUXER) +=3D aqtitledec.o subtitles.o
> OBJS-$(CONFIG_ARGO_ASF_DEMUXER) +=3D argo_asf.o
> OBJS-$(CONFIG_ARGO_ASF_MUXER) +=3D argo_asf.o
> diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> index 445f13f42a..90a4fe64ec 100644
> --- a/libavformat/allformats.c
> +++ b/libavformat/allformats.c
> @@ -72,6 +72,7 @@ extern const FFInputFormat ff_aptx_demuxer;
> extern const FFOutputFormat ff_aptx_muxer;
> extern const FFInputFormat ff_aptx_hd_demuxer;
> extern const FFOutputFormat ff_aptx_hd_muxer;
> +extern const FFInputFormat ff_apv_demuxer;
> extern const FFInputFormat ff_aqtitle_demuxer;
> extern const FFInputFormat ff_argo_asf_demuxer;
> extern const FFOutputFormat ff_argo_asf_muxer;
> diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c
> new file mode 100644
> index 0000000000..008cbef708
> --- /dev/null
> +++ b/libavformat/apvdec.c
> @@ -0,0 +1,245 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1=
301 USA
> + */
> +
> +#include "libavcodec/apv.h"
missing file
> +#include "libavcodec/get_bits.h"
> +#include "avformat.h"
> +#include "avio_internal.h"
> +#include "demux.h"
> +#include "internal.h"
> +
> +
> +#define APV_TAG MKBETAG('a', 'P', 'v', '1')
> +
> +typedef struct APVHeaderInfo {
> + uint8_t pbu_type;
> + uint16_t group_id;
> +
> + uint8_t profile_idc;
> + uint8_t level_idc;
> + uint8_t band_idc;
> +
> + uint32_t frame_width;
> + uint32_t frame_height;
> +
> + uint8_t chroma_format_idc;
> + uint8_t bit_depth_minus8;
> +
> + enum AVPixelFormat pixel_format;
> +} APVHeaderInfo;
> +
> +static const enum AVPixelFormat apv_format_table[5][5] =3D {
> + { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, =
AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16 },
> + { 0 }, // 4:2:0 is not valid.
> + { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12, =
AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV422P16 },
> + { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12, =
AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV444P16 },
> + { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12,=
AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUVA444P16 },
> +};
> +
> +static int apv_extract_header_info(APVHeaderInfo *info,
> + GetBitContext *gbc)
> +{
> + int zero, bit_depth_index;
> +
> + info->pbu_type =3D get_bits(gbc, 8);
> + info->group_id =3D get_bits(gbc, 16);
> +
> + zero =3D get_bits(gbc, 8);
> + if (zero !=3D 0)
> + return 0;
this should use negative AVERROR* for errors for consistency
> +
> + if (info->pbu_type !=3D APV_PBU_PRIMARY_FRAME)
> + return 0;
> +
> + info->profile_idc =3D get_bits(gbc, 8);
> + info->level_idc =3D get_bits(gbc, 8);
> + info->band_idc =3D get_bits(gbc, 3);
> +
> + zero =3D get_bits(gbc, 5);
> + if (zero !=3D 0)
> + return 0;
> +
> + info->frame_width =3D get_bits(gbc, 24);
> + info->frame_height =3D get_bits(gbc, 24);
frame_width and frame_height would be better as int instead of uint32_t
given its only 24bit
its also more consistent
git grep 'int *width' | wc
1935 15372 180444
git grep 'uint32_t *width' | wc
15 62 740
[...]
> +static int apv_probe(const AVProbeData *p)
> +{
> + GetBitContext gbc;
> + APVHeaderInfo header;
> + uint32_t au_size, tag, pbu_size;
> + int score =3D AVPROBE_SCORE_EXTENSION + 1;
> + int ret;
> +
> + init_get_bits8(&gbc, p->buf, p->buf_size);
> +
> + au_size =3D get_bits_long(&gbc, 32);
> + if (au_size < 16) {
> + // Too small.
> + return 0;
> + }
> + // The spec doesn't have this tag, but the reference software and
> + // all current files do. Treat it as optional and skip if present,
> + // but if it is there then this is definitely an APV file.
> + tag =3D get_bits_long(&gbc, 32);
> + if (tag =3D=3D APV_TAG) {
> + pbu_size =3D get_bits_long(&gbc, 32);
> + score =3D AVPROBE_SCORE_MAX;
> + } else {
> + pbu_size =3D tag;
> + }
> + if (pbu_size < 16) {
> + // Too small.
> + return 0;
> + }
> +
> + ret =3D apv_extract_header_info(&header, &gbc);
something somewhere should check buf_size or size in gbc
otherwise a truncated header would be accepted
thx
[...]
--=20
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The worst form of inequality is to try to make unequal things equal.
-- Aristotle
--TnhCK6PpBieOpFhs
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaAWXVAAKCRBhHseHBAsP
qyiVAJ9/9um7wIPRAnpoFVekEEXioaqNmACfVszm+7SoazJRhAZVh8iFU+qe5Ks=
=eGgl
-----END PGP SIGNATURE-----
--TnhCK6PpBieOpFhs--
--===============2890259357959638075==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
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".
--===============2890259357959638075==--