From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id D3C614DCB9 for ; Sun, 2 Mar 2025 13:14:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68A4A68CF62; Sun, 2 Mar 2025 15:14:05 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2016.outbound.protection.outlook.com [40.92.89.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AD1968BD47 for ; Sun, 2 Mar 2025 15:13:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=v8s8wd5v65h0PxwBxdpg1c4egqCnTnrokla5kKxOfX9VigxccooNmzLFi35NxH1JDy2eoScfUsaKyygc+CwTZtQclaRlU4FKRsvirnfEL3YEngOG4Ij81F5w1+2OS7v+ubL2O2aNZVYp9oSVd935VUc3WjylctR1i8hevXXWgZr8/RE73me+sBOL5OQUjqBxOYx/KRBAOdHczM/q9KeCZKoPg046OTXL75dcfWNCuyNa8zMr5uV+SAPiJl3kxGxrBtXXcfPM3tnnZXGF859ZDqDjlKP5O6khoMPxvQyLwq1GX4JMLmvOyFGOa7zQvtzGxIY/bFiHPFfgGd717S7tUw== 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=zXWFdufG9D6wrj+I4YoY8JnY1CB41DDUJoPR0d7dWy0=; b=SnW+7EyUAnuyGFZltoupknccnrHHYQ75v9MD5Em9ZFGBB/uGkFyl5tJ7fQ/5pp5KBaoLxoDoKOeei5zJ47BIC2j+5ZrC1WzQN8Ln2Y/iwVyVqpQSEroA+fAlNkqD6Dpc1BRcVJU+OkSLPB6eCunH1TlhV/2ZxN/sydckk0eWz8Ky+GqBArCXiR2wpSdRZ8Qh2barp7kmtdHGgWFZxSrLcBcEiZ9EurhdNlpRHvADF5oKgRpsKBWWCL4ctWXSY0gkOsT0B/gNa29QoKM82A02t9H1Ws0ak6tONB9M9zOLwjvHxpyjUwwJ3t1OHCjvRGvj++Ufphw3D5MIjuflP2QPmA== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zXWFdufG9D6wrj+I4YoY8JnY1CB41DDUJoPR0d7dWy0=; b=OC4zcNcZ5TDwQpmvyHobm5+a9+2ucY+qYWj2a6suAwcl6zpTzy4wRA7eDJ29EV/aTfM7J76evI6MuQ5giJElfLudfTQA7jwcSZ82R1hs942B8ian4wuxnIaD3uvruR+MMIzTDJQCR+/TfwvE3ZGUY6JJnN7jA51BpUqwx8g5+RLBUjt+A9KeSg4uMASUUHXzXnWj8SCan+5NBf4ijMain2xcfE7fw+v0Bb76nkoGfXwC1YOK+MQtwB6CiXhxgJ24euKAhccDIshWkcMzZXW7HmUYYcAh6pwXl9HGphNMJPqsemJrKWeciP673KnbNuL6yxLdB++Saq0Z7NQmuhpLeQ== Received: from GV1SPRMB0036.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::16) by DU2P250MB0111.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.25; Sun, 2 Mar 2025 13:13:57 +0000 Received: from GV1SPRMB0036.EURP250.PROD.OUTLOOK.COM ([fe80::2e14:af18:9569:bc54]) by GV1SPRMB0036.EURP250.PROD.OUTLOOK.COM ([fe80::2e14:af18:9569:bc54%5]) with mapi id 15.20.8489.025; Sun, 2 Mar 2025 13:13:57 +0000 Message-ID: Date: Sun, 2 Mar 2025 14:13:55 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <78DB821E-BD88-4C49-A825-DF44E458066D@waider.ie> <20250301153208.3852-1-waider@waider.ie> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20250301153208.3852-1-waider@waider.ie> X-ClientProxiedBy: ZR2P278CA0067.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::14) To GV1SPRMB0036.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::16) X-Microsoft-Original-Message-ID: <0e15b943-cae7-430f-8d9e-c4f184b4f7b5@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0036:EE_|DU2P250MB0111:EE_ X-MS-Office365-Filtering-Correlation-Id: c9d33ed5-4fff-46d2-4171-08dd598c16c3 X-Microsoft-Antispam: BCL:0; ARA:14566002|15080799006|19110799003|6090799003|461199028|7092599003|8060799006|5072599009|41001999003|3412199025|440099028; X-Microsoft-Antispam-Message-Info: =?utf-8?B?MC8yQ0VWVlA4YlF0MDhUMUlBWlZralk1cjZXcnBLcldGRk15NkhwWWRLTEtJ?= =?utf-8?B?NXdBQkVwMkRBajcveXJtZWUyYkJCUkVqZ21mRTVVeGZYeEoxMFZRWk91aUtO?= =?utf-8?B?bVBjSE9jTW1ka2FKUDBnMFA1YVR3bTZqaGdGNWpJbytnMEZPbC84VXY1Q3JB?= =?utf-8?B?dnlhY2t3eW15U2YzckhWbXE0QlEwK3EvbmpXdSs5enJOSS9JQit4V0ZkNWVm?= =?utf-8?B?SSsyUGFORTlsNktMQnNRUFUvRmQ1R080MHpRanR3dkF2T1c1ZksvYUI0aU5s?= =?utf-8?B?cFpsRDZRN2NOandkR1lpU1FLcGloY0ZxWWRXenlmQ3JiK0M3ZzNnanVWY1Zk?= =?utf-8?B?MGp5SExLaWVtTVI5NGo1NTl1dWxBWmc0V3NSSytXNVhyRFZFajBSRlo2OC9I?= =?utf-8?B?RUhMRTM1KzcxSURNVDVRQmlMWUVrbFBmTkZRVzdFQ1l5dWhqOEFQdmxLLzEz?= =?utf-8?B?dWpHY29SZmJTWWdGRkV1WVhWUmJpeDkrR2p5N0FabElNdWU0ZUF4RnQ4Z3RI?= =?utf-8?B?Yk9pako5YmpPV3h5eEhhOGdJcm5EQW5mdjI0eXVUNDRKSys3OEhQcUpYS3pQ?= =?utf-8?B?QXMvUjJPNkExQ3pxNTgweUszakFSNHQ4c3NQb0RDbGxXaFJ1M2cxM2ExMlNM?= =?utf-8?B?Q3ZQREE1VzBxZ0tJQndaQS9RY29ndiszL2ZJWkhNM1hsazRXcEowb1g0aFlE?= =?utf-8?B?YjU3bEVLanl5VWhjMnNqbkJTZDJieHE0ZnVGaWwyUXN4U0NKVGN6SmxveVVX?= =?utf-8?B?aUVyWVlzb3ZkUmREbmprdEZVaGR2bGVKTmc3akxWWmFhSXB2aGh4aEhCc3VU?= =?utf-8?B?MEpIUll4K3RtTXlCK0kxV1hYaHZ1UGhDRTE5a1FWVms4L0ZpaFptRUkzdG1j?= =?utf-8?B?YWZkcWdreGh6dUs1aFhEQjRENTVmTllyczh1dE5wT1JXODQxemJxUldWS3Zq?= =?utf-8?B?NUIzZmNEemltVnZaME9ES3IwdFJwTmJwbWQwdm9PaG11UUc2NHEwMGFUZjNz?= =?utf-8?B?S2JpQStpWmZ0cnc2cU50djB0SGFndEZsWUx3YnVWYXhIRjl2VEpuNU9iMXkz?= =?utf-8?B?a1VMTW1qVU4xM2doMm1wdVN0cUI4NlErQmVrQUV2M1c1RXpibVRVcHh5c0ph?= =?utf-8?B?VnlLRWx5aDJLV28zbk52SzNuYjBjeFlIZ0pZWnhMbmlXakZZS0tFWHhUdVRI?= =?utf-8?B?dXNGRUx2bXNiRHk5VXd6VHhMMEN3b2gyRGxDYUxyblhHM1pqWkJPZWlTY1dM?= =?utf-8?B?OXBlWjg4N0xEL1RJR2FhTHRVakRlTkNQMWFjSXJBWXh2eGNORlkvSHZIYXRp?= =?utf-8?B?U3Y2WjBURkc3MTl1MkxCNVdlZFVEZGVmVk5tdlJLRitUUUhWQnVzYWFpUFpH?= =?utf-8?B?eXJ0NzR4NWtwWFM0alNEMDI5d2ZSTElodXVJemhwaWorOGRlSFNuZ210YXA2?= =?utf-8?B?SEtaMm5TaldiRERjUkdGZmNzeTdzRHcyaWVxRGhDazk5c1pZcE55RlVnTXQ0?= =?utf-8?B?YUJhN2xodFU1Y0taQVF6T2Z4QU9kTU5lQmFQUTJ1QzI5ZWphQkZpTFA5OGx1?= =?utf-8?B?dHg5QT09?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SG1QY0k5N21jRHdoNE91emtHWGtzbmF2VnhlQnZnSlVtR1l0SHZMQStWTGFM?= =?utf-8?B?aTJRa0ZoNC9pMmcvYXZBODFvdVdDWW5GMkQvaUx6QmxaS2p3RWorbUdPOVMw?= =?utf-8?B?eHBDc0pibUxQUlM0YVlxYzIxMytwVVFETlNRM2RVbkxvTkJsUFlRcXM0NDJP?= =?utf-8?B?NUpxUmpqU2k4bi9CUkU4OXVjOTZJSWtPR2twN3RrekRkMVR6MkxTMEN1OTRp?= =?utf-8?B?VkhBZzA4RStyS2JWZnhudlUrT1kwRFpxazEvTzRsSWZNQlhYYkJlbCtkMmp2?= =?utf-8?B?T3JoR1pIT3FxSWtWYUc5UkErd3lUK0FGN1BWVW4rb0E3bkswWkJQKzVRaUY4?= =?utf-8?B?K1JXQndSUktoOU9ZTWF4ZGQwTCsvd2tsZlhMS01RM0t5REtJOEk5TG1lb3hF?= =?utf-8?B?eXQ5cEFidHhUVWhORzdvem5VNEZOTGtjeFhPQlRMMlFDQmpRMHRJaUlZMkJF?= =?utf-8?B?U3hQRGNFLzNGVG5oSURzbmhpUDdqQys4RlAxZlBldkMwSUVDK2g2ZGdIYkF5?= =?utf-8?B?MWh1Yis3VTJ0anRkWkJodnM3UXhyc1pnK3FWVFJVcWlsbU1VdjFtaThVN2sw?= =?utf-8?B?WERza2ZjK2I5OFhSSi9KTWRQbTAyanVlcWVGRDRTeVBLdHVzcjVNeXcrRWU1?= =?utf-8?B?REV0SFhNM1o5WkpEWGRoR05sQWw5d3dCcVRkK1VQZ0t5bnJzSTlBZnJNRHFx?= =?utf-8?B?RlZ2SjZlL00rR082NjZZTFkvL2JBZUsyemlKN3RXNXhMdXZsZ1Z0VHI0Vks0?= =?utf-8?B?Sm9TbHl5OWNvekFCTXlzYXU1Slh3M1dDQVFOZWI1RTA3SjRUcSs0M1pSQlEr?= =?utf-8?B?M29rQUFzUGNFc1dONXM2Tk1rMlM4NE5QZmdYQjI0WFlldFNqWHZ4TGM3SVBE?= =?utf-8?B?OGhqOWVJVWRGbW0wYVptRUJFbWtodDJ1bFJxUkhac25YeStFL250ZFA3R0hw?= =?utf-8?B?dmF5a3BCcWVoTDNQZWRIS2hGVThHNE96ZERydXEzZVdmblVTb1pqNzFSbUM1?= =?utf-8?B?N1dHbW14WTVnakpzNGltQlQrb3ZpZEYxaFdtTGJsYkE2N3hBNWpnUG5wTkhO?= =?utf-8?B?VkRxRnBKcXFralYwbW1mYmZBVUFHWE5SREtwSk9idU9TWWxSczdacmg3ZzdP?= =?utf-8?B?d3h6RHRramlqOCtZTng5eVVqcXZMK1h1dUljQjdRaWl2cDJwaU5UelZtR3Vm?= =?utf-8?B?ZDc0RmxkYkIxM2Y5MHVhQmJsUzJGbkw3MldPTDkyRjIrdUdLWkFqRmdEV0Ro?= =?utf-8?B?TkRiYTdicENiUmpCNUpaRFEwSTRwUi83WEdtT2NkM0pRQVd3SkpFSWhhdmU0?= =?utf-8?B?TUZHaVg4SXdDVHVBREQ2WVF5a1dpaGhsa2k0clorTzJ6NzJTaTJzRFE2VVlO?= =?utf-8?B?Y0loYkQwVVdMRmFxcEh5ZDhDcXNEM2s3Q3JWYmNHUVlGQ3FzRmM5R1FURnhv?= =?utf-8?B?SVFyRGZlRDV4bVVYbjNkUlhFRGszYkJSVi9veFdLMFlpZVNFV2l5T25uOGFl?= =?utf-8?B?Y3JhVkN5TzY0NnAxakttdE5xeHFvUEVlMDJCZmZJaUowZ1R1ekhXOTV3T2hz?= =?utf-8?B?aUtRVDVPNmlkQUpKSWdNTjZmbENPSmxQdmYzeXBCd0gyQTdEVEpmcTNBWWdp?= =?utf-8?B?eTI4enhoWXZDYXJFU1BWQWgrOGhxdkxWWEdEMlFKTHFLU0psMmRuTURtNVZw?= =?utf-8?B?SFBCYTFna2JvVTNKeEtDWUZCWlJjZ0ZMd0RJUjlValdyeldjTE9UR3FnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9d33ed5-4fff-46d2-4171-08dd598c16c3 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0036.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2025 13:13:57.2540 (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: DU2P250MB0111 Subject: Re: [FFmpeg-devel] [PATCH v4] libavcodec/dvbsubenc.c: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Ronan Waide: > 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 > --- > doc/encoders.texi | 27 ++++++++++++++ > libavcodec/dvbsubenc.c | 85 +++++++++++++++++++++++++++++++++--------- > 2 files changed, 95 insertions(+), 17 deletions(-) > > diff --git a/doc/encoders.texi b/doc/encoders.texi > index f3fcc1aa60..07984b6b54 100644 > --- a/doc/encoders.texi > +++ b/doc/encoders.texi > @@ -4484,6 +4484,33 @@ 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 > + > +@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 = avctx->priv_data; > + if (s->disable_2bpp) { > + av_log(avctx, AV_LOG_DEBUG, "Disabling 2bpp subtitles.\n"); Pointless log message. In fact this whole function could be eliminated by simply adding const int min_colors = s->disable_2bpp ? 16 : 0; to dvbsub_encode(). > + s->min_colors = 16; > + } else { > + s->min_colors = 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 = 0; clut_id < h->num_rects; clut_id++) { > - if (buf_size < 6 + h->rects[clut_id]->nb_colors * 6) > + int nb_colors = 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 <= 4) { > + if (nb_colors <= 4) { > /* 2 bpp, some decoders do not support it correctly */ > bpp_index = 0; > - } else if (h->rects[clut_id]->nb_colors <= 16) { > + } else if (nb_colors <= 16) { > /* 4 bpp, standard encoding */ > bpp_index = 1; > - } else if (h->rects[clut_id]->nb_colors <= 256) { > + } else if (nb_colors <= 256) { > /* 8 bpp, standard encoding */ > bpp_index = 2; > } else { > @@ -354,16 +374,24 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, > *q++ = clut_id; > *q++ = (0 << 4) | 0xf; /* version = 0 */ > > - for(i = 0; i < h->rects[clut_id]->nb_colors; i++) { > + for(i = 0; i < nb_colors; i++) { > *q++ = i; /* clut_entry_id */ > *q++ = (1 << (7 - bpp_index)) | (0xf << 1) | 1; /* 2 bits/pixel full range */ > { > int a, r, g, b; > - uint32_t x= ((uint32_t*)h->rects[clut_id]->data[1])[i]; > - a = (x >> 24) & 0xff; > - r = (x >> 16) & 0xff; > - g = (x >> 8) & 0xff; > - b = (x >> 0) & 0xff; > + if (i < h->rects[clut_id]->nb_colors) { > + uint32_t x= ((uint32_t*)h->rects[clut_id]->data[1])[i]; > + a = (x >> 24) & 0xff; > + r = (x >> 16) & 0xff; > + g = (x >> 8) & 0xff; > + b = (x >> 0) & 0xff; > + } else { > + /* pad out the CLUT */ > + a = 0; > + r = 0; > + g = 0; > + b = 0; > + } > > *q++ = RGB_TO_Y_CCIR(r, g, b); > *q++ = 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 -= 6 + h->rects[clut_id]->nb_colors * 6; > + buf_size -= 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 = 0; region_id < h->num_rects; region_id++) { > > /* region composition segment */ > + int nb_colors = 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 <= 4) { > + if (nb_colors <= 4) { > /* 2 bpp, some decoders do not support it correctly */ > bpp_index = 0; > - } else if (h->rects[region_id]->nb_colors <= 16) { > + } else if (nb_colors <= 16) { > /* 4 bpp, standard encoding */ > bpp_index = 1; > - } else if (h->rects[region_id]->nb_colors <= 256) { > + } else if (nb_colors <= 256) { > /* 8 bpp, standard encoding */ > bpp_index = 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 = 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 <= 4) { > + if (nb_colors <= 4) { > /* 2 bpp, some decoders do not support it correctly */ > dvb_encode_rle = dvb_encode_rle2; > - } else if (h->rects[object_id]->nb_colors <= 16) { > + } else if (nb_colors <= 16) { > /* 4 bpp, standard encoding */ > dvb_encode_rle = dvb_encode_rle4; > - } else if (h->rects[object_id]->nb_colors <= 256) { > + } else if (nb_colors <= 256) { > /* 8 bpp, standard encoding */ > dvb_encode_rle = 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[] = { > + {"disable_2bpp", "disable the 2bpp subtitle encoder", OFFSET(disable_2bpp), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SE}, > + { NULL }, > +}; > + > +static const AVClass dvbsubenc_class = { > + .class_name = "DVBSUB subtitle encoder", > + .item_name = av_default_item_name, > + .option = options, > + .version = LIBAVUTIL_VERSION_INT, > +}; > + > const FFCodec ff_dvbsub_encoder = { > .p.name = "dvbsub", > CODEC_LONG_NAME("DVB subtitles"), > @@ -513,4 +562,6 @@ const FFCodec ff_dvbsub_encoder = { > .p.id = AV_CODEC_ID_DVB_SUBTITLE, > .priv_data_size = sizeof(DVBSubtitleContext), > FF_CODEC_ENCODE_SUB_CB(dvbsub_encode), > + .init = dvbsub_init, > + .p.priv_class = &dvbsubenc_class, > }; _______________________________________________ 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".