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 BB8C54B716
for <ffmpegdev@gitmailbox.com>; Sat, 1 Mar 2025 12:55:14 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B66168E0EE;
Sat, 1 Mar 2025 14:55:11 +0200 (EET)
Received: from NAM10-BN7-obe.outbound.protection.outlook.com
(mail-bn7nam10olkn2020.outbound.protection.outlook.com [40.92.40.20])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE89768DF6F
for <ffmpeg-devel@ffmpeg.org>; Sat, 1 Mar 2025 14:55:04 +0200 (EET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=qFi90Ed1+Na1gnLjpeBAvdl7y0frkana7I5ce/PTzp8Wcu6bdQvywX+0LA13OYMLYmRnIuTp7QSUoARU8RZemDzcSq2zL/wrSF+toKq8xfJyiQqSWgtQKz72ghlWdzb4sACvKOCWGqlExw2r2WgeklCzUfRpIfHKUWH30qj1hkCH14oDs9Poyebf0nEF07zlymhL52jYDZrIsT75o0vGn3FTmb7TBnI1EFgLvB88NBV3UMXSf+DQVojpdV75nyFTS/KaaqO8k2u7jeKMbiWdiACBSELTsxKWa7kwnZ29yMRtwS601ZJFEFod/lR51kSdzIVvbso8T5pKPYeexRgdpw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=tyKXcuUd41VAcnLpoAsslTCbkZFhf735N1txWXkOjTc=;
b=EHGH1efP+5sexeEsRUbdwY05iTyAcwFX3dam84Q62KKPRMPkIUwWKGV55gFUR5Qx4i4EC7vRnksewuph4AFV+fkY27XsAEVFr1BqNONEXQMIlnJs/b6FwtTIkE9xd8LXth/gclXVIL8ufXekUujDtHqi5btrV80cRXNaEhZ/PqIyEILkAkmo9vT+LvPrzPaQIdF5MsmKe+ILtVEBMYDBYGBZKL89WgpENUoDe5nwK1r8g6ND4m2O0ZBRzzBDo3RMnjIpsJmLkFK8a7Jklljh6YCJghP5f75ztsmT8QERoQYQ7qXHt4im4H4oXiDXVwCo96UwH7FvgoQizqfZwvmFGQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
dkim=none; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com;
s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=tyKXcuUd41VAcnLpoAsslTCbkZFhf735N1txWXkOjTc=;
b=TqgMRyibAeScUWByUn1n2Y43oi/SqXzw8xM39Apwr+UwkbyTPdhZeJbMhqw1Br6pvm5Q/WSh7Jcs3cEwSJdSJ6zyE1U4vpqPpsfG67KfN6G2g6n0Ufon05Y3hzRqyv7gDz3wglE+nL1eLF8KBx4kqHXcdQhaeGf8fqkr4PqwPbTi6FuzJRQrcogpzqV+/FvegaoIAxZCwq4Z3gu2RZLzZT3BnKWokPFK5UKtUEhUpseZ7VbbR22h54V6zVE7EbphAT2VG98TDYW3ER08X1yksG7Zq3b+exU1gVHwrKe1afIo5en8HmBEyjObB+ehXBPKZO+EBkQT2XB94SVIb/wH/w==
Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by
EA2P223MB1162.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:251::15) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.8489.25; Sat, 1 Mar 2025 12:55:01 +0000
Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM
([fe80::bf09:8e9:b07f:98a7]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM
([fe80::bf09:8e9:b07f:98a7%7]) with mapi id 15.20.8489.025; Sat, 1 Mar 2025
12:55:01 +0000
From: Soft Works <softworkz-at-hotmail.com@ffmpeg.org>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Thread-Topic: [FFmpeg-devel] [PATCH] dvbsubenc: add a disable_2bpp option to
work around some decoders.
Thread-Index: AQHbip8vlyWNxQ47Ck+xPgOjhxFJHrNeO/hA
Date: Sat, 1 Mar 2025 12:55:01 +0000
Message-ID: <DM8P223MB0365D8A9EFC1BDBC9486E2A2BACF2@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM>
References: <1D1812F5-DB2A-4847-89DB-EF3A1A6C9BCF@waider.ie>
In-Reply-To: <1D1812F5-DB2A-4847-89DB-EF3A1A6C9BCF@waider.ie>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-ms-publictraffictype: Email
x-ms-traffictypediagnostic: DM8P223MB0365:EE_|EA2P223MB1162:EE_
x-ms-office365-filtering-correlation-id: 3a66c9d7-f841-4e23-192e-08dd58c047aa
x-microsoft-antispam: BCL:0;
ARA:14566002|8060799006|8062599003|19110799003|15080799006|7092599003|461199028|10035399004|102099032|4302099013|3412199025|440099028|41001999003|1602099012;
x-microsoft-antispam-message-info: =?iso-8859-1?Q?S1vC7DHatJ8AEHXL39Wj/9OJlxv3jS/2ESpOCFg82CTOLV0r4NMwn9QJxC?=
=?iso-8859-1?Q?EfqFrU0df/Z5El8yiwP6ypDC6pBRLvpsZgmXSUjv5gE4BESZMPpd6fFyPW?=
=?iso-8859-1?Q?b0NgTs7kplwcS+xKTfnVsapqwOwYubGrLqZQr2d+JS1Bu1oDzUFezScWJN?=
=?iso-8859-1?Q?48FCPrBRWEZxfe6B7G4gWNQi1X0RbH4Pcvb1egnb6spqS1AQaQGDjMIlGH?=
=?iso-8859-1?Q?0WVoUFagmbO14KVrACvTjxw4DAx9YaZ/A6KXJy1MkD9LP8Oc+byJxUthvn?=
=?iso-8859-1?Q?9J6Ylegrrzl1tJWblWOlekq2f7NHeGLHBXlAJ75/dTvotmXk9OqrHO94pH?=
=?iso-8859-1?Q?3qDtlTNy6gcVhqysZxrDU+BhhpyPSFEia+EKVdP0zrowvarrMo+BPgqbe1?=
=?iso-8859-1?Q?LhOF1l2DlsivRlWG7jDBEtrgAcLuP8Gbwv8n/jJAV7Ol52ntuWuRF6Ob3B?=
=?iso-8859-1?Q?9AJYiBar/xkyXm0x7ejy3pm+m+/4Sob0aYMyKks8Z80fwTNdGvJMG6P9l3?=
=?iso-8859-1?Q?g10tvQAlKV64qjk2jKt6e28F+/MejZcfJRLNmQZfXSP9oYWhZ6ygoYKmuy?=
=?iso-8859-1?Q?lUuNbCnMNSDnPG61aVBUWSZy+PeAWp+2I31GnC0qqOnR7LMPL45zb7yGC4?=
=?iso-8859-1?Q?YNi+l8BNuR+dIWjYIMsxnPd8SnS3vHupbZbkkvVwG8TdFyZtx31+yN7jkx?=
=?iso-8859-1?Q?dODpr448lFPkOhepleuoceayn5zhzHZCjwg61aVgGim6ibT5gShjBgDLFQ?=
=?iso-8859-1?Q?y22qIeliZJ/DfnroG97NXVKH+4Gz1rMbvfKMBD2qF0QZJ3iAMCfxPXfTm7?=
=?iso-8859-1?Q?74Wt8GkWj80mcLrI5/jqBvUpti6uEqETB3Pithq3BBq2d+ll9hEe1q10IC?=
=?iso-8859-1?Q?yrwVslDr4K4EejRkk1wE/cj/xHt/Yqp6tsr9KuHR2ddC1jM0RIq28qjs8s?=
=?iso-8859-1?Q?PMyhWcCUiFpmEljld1lMBObtJr3Fh8VWWmH2NOet4rMCIKATnxnmasieQN?=
=?iso-8859-1?Q?xesZquZS4qHcVGVSGfzXCz2+le5nYqkMQ8BWD/qejPUmOR5KXBlAbwKIJ6?=
=?iso-8859-1?Q?Mxfu6iwpe46hf+EGE2os/d46G0v1p2viFL5a2nEN3hPWl828uUAl4I+HXv?=
=?iso-8859-1?Q?ha6W348BDKxZbuO4o//HFZIGkFgYTfOPkjkSYqD5qXBL8JcxWDVYPiolxq?=
=?iso-8859-1?Q?SCf9VTMmq8Ioi8j5eJBMThORkApBsJI5vwCxz8MjvH3qbJRDl9Hr3w9M6z?=
=?iso-8859-1?Q?GhM7Q7wRHtIf1gzsXa+YQR+dHfcEt3BdIOscyIe0w=3D?=
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?BkPaWbwqp2trqkQOf3FOfcPePI0r9XaEO1tuu1hC3POm/l2eI1R6EHt6eg?=
=?iso-8859-1?Q?IhzZ8mjcg8zEkA2CBPANt1jUtLeu/4i3wjzSxOu4VAxZP5PnU0fJ+xjeJp?=
=?iso-8859-1?Q?LtFUXhnkJ9KsE/zB51jSlGHB71QsuwB3xMEX+R08OnM96uULpiL2wZh4Ln?=
=?iso-8859-1?Q?nPtsEqk1EBIQwzBisl/o7OtUK87Dy1+cBFJfwzxa9JN1quCVpu9ZziTb/4?=
=?iso-8859-1?Q?ALYQS/3bEIQQgMUfdMnjkj9ethAQDoakppSM6QJnkWdS1bpL5TfNNik5x3?=
=?iso-8859-1?Q?8HEa939fkZAep9Z3R+uHUp3vkzpcZ7tbBsH5POjRq9ikpi34yfug+1Q75j?=
=?iso-8859-1?Q?15pNS89zo+4bnJdjUmDpQL92VIzzibtxdRMWlp+QYB0vOswCcTT5T0AeTZ?=
=?iso-8859-1?Q?oiJ0y9qyuiZwnafN//EeJsDtM4t2JZVQEzNGk3Ot3SgjLHIwkZWwH/QEIm?=
=?iso-8859-1?Q?nPfXLSbDrPz9bP9szQyNaTltc5/rrIImOOHxxyM/tdafY1/hV80ZkkjoE1?=
=?iso-8859-1?Q?+k/xMMmls9cS9mVkQTNxE5qIaFIewcodkh/Gt0cLAZrDOlY1b1ac0VfQ/C?=
=?iso-8859-1?Q?jfHjq4aUJk3GuVPwn/TT9dSPkx7Btzu4MN3hjafyMNFpOq9K+In6aahjqR?=
=?iso-8859-1?Q?DmGbGxZCoPKE87D57DJ0jYZuDS64BJuWsPXdRB/JxXKbP8GvcJIhVfD1HC?=
=?iso-8859-1?Q?XYyhKhfPlCv9V7L3hBvFoc8o8Yf9c4BGixA0ML8ZxIVMCQzJXLkkvBcqZs?=
=?iso-8859-1?Q?AvQpaoGpmNqUAyraa9VllugAnH11CtNVk8Kjz8uyPWGOyeAVE+xNeRSUTd?=
=?iso-8859-1?Q?O6EmzwdNX6xFexmn6Xc5ugjHRiKy45iFtV3qkBc9+45I2YRogjiGKBxRxI?=
=?iso-8859-1?Q?sd8dP0LqINtMylqzzfO7HCUbtwioleqOfYtxqF3qw1Sj5HBiX4elmJbY32?=
=?iso-8859-1?Q?kgB1M+HYS/V0q5PVivfVg5hIbpngbt/bCUyWXzzycEsuWf9Y6AcHu8iROz?=
=?iso-8859-1?Q?4esQzT5oNDeHA8jmPdkGDfne9tOeUNKtIOLA+Q/wei3cu0Nyv4EyKG8zfa?=
=?iso-8859-1?Q?3nha70OPgYMn0r1ahoO9vXn2vZiXIp5BuuzCxpPuQJYULj5QzMpGbC22sj?=
=?iso-8859-1?Q?BLakqdAvMiYDRCKynbmk2JvbMFJqePXAPZ5208nxrIWSdWL+bbQ7HPRZbr?=
=?iso-8859-1?Q?ejmgKHndlD3iq8kSLOs1BzOAn1n9w8w/zgPEnq1+rNig1UTPtz4vaBB89u?=
=?iso-8859-1?Q?SBoiDE6ozlDuss/25vYoG+LxPs1hQCRqbSdH+nm4k=3D?=
MIME-Version: 1.0
X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-92255.templateTenant
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-Network-Message-Id: 3a66c9d7-f841-4e23-192e-08dd58c047aa
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2025 12:55:01.5421 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: EA2P223MB1162
Subject: Re: [FFmpeg-devel] [PATCH] dvbsubenc: add a disable_2bpp option to
work around some decoders.
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: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/DM8P223MB0365D8A9EFC1BDBC9486E2A2BACF2@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Waider
> Sent: Samstag, 1. M=E4rz 2025 12:43
> To: ffmpeg-devel@ffmpeg.org
> Subject: [FFmpeg-devel] [PATCH] dvbsubenc: add a disable_2bpp option to
> work around some decoders.
> =
> As noted in the code in several places, some DVB subtitle decoders
> don't handle 2bpp color. This patch adds a disable_2bpp option which
> disables the 2bpp format; subtitles which would use 2bpp will be bumped
> up to 4bpp.
> =
> Signed-off-by: Ronan Waide <waider@waider.ie>
> ---
> doc/encoders.texi | 24 ++++++++++++
> libavcodec/dvbsubenc.c | 85 +++++++++++++++++++++++++++++++++---------
> 2 files changed, 92 insertions(+), 17 deletions(-)
> =
> diff --git a/doc/encoders.texi b/doc/encoders.texi
> index f3fcc1aa60..d6dc92a047 100644
> --- a/doc/encoders.texi
> +++ b/doc/encoders.texi
> @@ -4484,6 +4484,30 @@ Reduces detail but attempts to preserve color at
> extremely low bitrates.
> @chapter Subtitles Encoders
> @c man begin SUBTITLES ENCODERS
> =
> +@section dvbsub
> +
> +This codec encodes the bitmap subtitle format that is used in DVB
> +broadcasts and recordings. The bitmaps are typically embedded in a
> +container such as MPEG-TS as a separate stream.
> +
> +@subsection Options
> +
> +@table @option
> +@item disable_2bpp @var{boolean}
> +Disable the 2 bits-per-pixel encoding format.
> +
> +DVB supports 2, 4, and 8 bits-per-pixel color lookup tables. However,
> +not all players support or properly support 2 bits-per-pixel,
> +resulting in unusable subtitles.
> +@table @option
> +@item 0
> +The 2 bits-per-pixel encoding format will be used for subtitles with 4
> +colors or less. (default)
> +@item 1
> +The 2 bits-per-pixel encoding format will be disabled, and subtitles
> +with 4 colors or less will use a 4 bits-per-pixel format.
> +@end table
> +
> @section dvdsub
> =
> This codec encodes the bitmap subtitle format that is used in DVDs.
> diff --git a/libavcodec/dvbsubenc.c b/libavcodec/dvbsubenc.c
> index 822e3a5309..727a75e901 100644
> --- a/libavcodec/dvbsubenc.c
> +++ b/libavcodec/dvbsubenc.c
> @@ -22,9 +22,13 @@
> #include "bytestream.h"
> #include "codec_internal.h"
> #include "libavutil/colorspace.h"
> +#include "libavutil/opt.h"
> =
> typedef struct DVBSubtitleContext {
> + AVClass * class;
> int object_version;
> + int disable_2bpp;
> + int min_colors;
> } DVBSubtitleContext;
> =
> #define PUTBITS2(val)\
> @@ -38,6 +42,18 @@ typedef struct DVBSubtitleContext {
> }\
> }
> =
> +static int dvbsub_init(AVCodecContext *avctx)
> +{
> + DVBSubtitleContext *s =3D avctx->priv_data;
> + if (s->disable_2bpp) {
> + av_log(avctx, AV_LOG_DEBUG, "Disabling 2bpp subtitles.\n");
> + s->min_colors =3D 16;
> + } else {
> + s->min_colors =3D 0;
> + }
> + return 0;
> +}
> +
> static int dvb_encode_rle2(uint8_t **pq, int buf_size,
> const uint8_t *bitmap, int linesize,
> int w, int h)
> @@ -326,18 +342,22 @@ static int dvbsub_encode(AVCodecContext *avctx,
> uint8_t *outbuf, int buf_size,
> =
> if (h->num_rects) {
> for (clut_id =3D 0; clut_id < h->num_rects; clut_id++) {
> - if (buf_size < 6 + h->rects[clut_id]->nb_colors * 6)
> + int nb_colors =3D s->min_colors > h->rects[clut_id]-
> >nb_colors
> + ? s->min_colors
> + : h->rects[clut_id]->nb_colors;
> +
> + if (buf_size < 6 + nb_colors * 6)
> return AVERROR_BUFFER_TOO_SMALL;
> =
> /* CLUT segment */
> =
> - if (h->rects[clut_id]->nb_colors <=3D 4) {
> + if (nb_colors <=3D 4) {
> /* 2 bpp, some decoders do not support it correctly */
> bpp_index =3D 0;
> - } else if (h->rects[clut_id]->nb_colors <=3D 16) {
> + } else if (nb_colors <=3D 16) {
> /* 4 bpp, standard encoding */
> bpp_index =3D 1;
> - } else if (h->rects[clut_id]->nb_colors <=3D 256) {
> + } else if (nb_colors <=3D 256) {
> /* 8 bpp, standard encoding */
> bpp_index =3D 2;
> } else {
> @@ -354,16 +374,24 @@ static int dvbsub_encode(AVCodecContext *avctx,
> uint8_t *outbuf, int buf_size,
> *q++ =3D clut_id;
> *q++ =3D (0 << 4) | 0xf; /* version =3D 0 */
> =
> - for(i =3D 0; i < h->rects[clut_id]->nb_colors; i++) {
> + for(i =3D 0; i < nb_colors; i++) {
> *q++ =3D i; /* clut_entry_id */
> *q++ =3D (1 << (7 - bpp_index)) | (0xf << 1) | 1; /* 2
> bits/pixel full range */
> {
> int a, r, g, b;
> - uint32_t x=3D ((uint32_t*)h->rects[clut_id]-
> >data[1])[i];
> - a =3D (x >> 24) & 0xff;
> - r =3D (x >> 16) & 0xff;
> - g =3D (x >> 8) & 0xff;
> - b =3D (x >> 0) & 0xff;
> + if (i < h->rects[clut_id]->nb_colors) {
> + uint32_t x=3D ((uint32_t*)h->rects[clut_id]-
> >data[1])[i];
> + a =3D (x >> 24) & 0xff;
> + r =3D (x >> 16) & 0xff;
> + g =3D (x >> 8) & 0xff;
> + b =3D (x >> 0) & 0xff;
> + } else {
> + /* pad out the CLUT */
> + a =3D 0;
> + r =3D 0;
> + g =3D 0;
> + b =3D 0;
> + }
> =
> *q++ =3D RGB_TO_Y_CCIR(r, g, b);
> *q++ =3D RGB_TO_V_CCIR(r, g, b, 0);
> @@ -373,7 +401,7 @@ static int dvbsub_encode(AVCodecContext *avctx,
> uint8_t *outbuf, int buf_size,
> }
> =
> bytestream_put_be16(&pseg_len, q - pseg_len - 2);
> - buf_size -=3D 6 + h->rects[clut_id]->nb_colors * 6;
> + buf_size -=3D 6 + nb_colors * 6;
> }
> =
> if (buf_size < h->num_rects * 22)
> @@ -381,14 +409,17 @@ static int dvbsub_encode(AVCodecContext *avctx,
> uint8_t *outbuf, int buf_size,
> for (region_id =3D 0; region_id < h->num_rects; region_id++) {
> =
> /* region composition segment */
> + int nb_colors =3D s->min_colors > h->rects[region_id]-
> >nb_colors
> + ? s->min_colors
> + : h->rects[region_id]->nb_colors;
> =
> - if (h->rects[region_id]->nb_colors <=3D 4) {
> + if (nb_colors <=3D 4) {
> /* 2 bpp, some decoders do not support it correctly */
> bpp_index =3D 0;
> - } else if (h->rects[region_id]->nb_colors <=3D 16) {
> + } else if (nb_colors <=3D 16) {
> /* 4 bpp, standard encoding */
> bpp_index =3D 1;
> - } else if (h->rects[region_id]->nb_colors <=3D 256) {
> + } else if (nb_colors <=3D 256) {
> /* 8 bpp, standard encoding */
> bpp_index =3D 2;
> } else {
> @@ -424,17 +455,21 @@ static int dvbsub_encode(AVCodecContext *avctx,
> uint8_t *outbuf, int buf_size,
> const uint8_t *bitmap, int linesize,
> int w, int h);
> =
> + int nb_colors =3D s->min_colors > h->rects[object_id]-
> >nb_colors
> + ? s->min_colors
> + : h->rects[object_id]->nb_colors;
> +
> if (buf_size < 13)
> return AVERROR_BUFFER_TOO_SMALL;
> =
> /* bpp_index maths */
> - if (h->rects[object_id]->nb_colors <=3D 4) {
> + if (nb_colors <=3D 4) {
> /* 2 bpp, some decoders do not support it correctly */
> dvb_encode_rle =3D dvb_encode_rle2;
> - } else if (h->rects[object_id]->nb_colors <=3D 16) {
> + } else if (nb_colors <=3D 16) {
> /* 4 bpp, standard encoding */
> dvb_encode_rle =3D dvb_encode_rle4;
> - } else if (h->rects[object_id]->nb_colors <=3D 256) {
> + } else if (nb_colors <=3D 256) {
> /* 8 bpp, standard encoding */
> dvb_encode_rle =3D dvb_encode_rle8;
> } else {
> @@ -506,6 +541,20 @@ static int dvbsub_encode(AVCodecContext *avctx,
> uint8_t *outbuf, int buf_size,
> return q - outbuf;
> }
> =
> +#define OFFSET(x) offsetof(DVBSubtitleContext, x)
> +#define SE AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_ENCODING_PARAM
> +static const AVOption options[] =3D {
> + {"disable_2bpp", "disable the 2bpp subtitle encoder",
> OFFSET(disable_2bpp), AV_OPT_TYPE_BOOL, {.i64 =3D 0}, 0, 1, SE},
> + { NULL },
> +};
> +
> +static const AVClass dvbsubenc_class =3D {
> + .class_name =3D "DVBSUB subtitle encoder",
> + .item_name =3D av_default_item_name,
> + .option =3D options,
> + .version =3D LIBAVUTIL_VERSION_INT,
> +};
> +
> const FFCodec ff_dvbsub_encoder =3D {
> .p.name =3D "dvbsub",
> CODEC_LONG_NAME("DVB subtitles"),
> @@ -513,4 +562,6 @@ const FFCodec ff_dvbsub_encoder =3D {
> .p.id =3D AV_CODEC_ID_DVB_SUBTITLE,
> .priv_data_size =3D sizeof(DVBSubtitleContext),
> FF_CODEC_ENCODE_SUB_CB(dvbsub_encode),
> + .init =3D dvbsub_init,
> + .p.priv_class =3D &dvbsubenc_class,
> };
> --
Hi,
thanks for your contribution.
Your patch fails to apply:
https://patchwork.ffmpeg.org/project/ffmpeg/patch/1D1812F5-DB2A-4847-89DB-E=
F3A1A6C9BCF@waider.ie/
It appears to be created against an older version of the code. Patches need=
to be made with the current HEAD of the master branch as the base.
Best,
sw
_______________________________________________
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".