From patchwork Sat Jan 25 14:32:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Kuron X-Patchwork-Id: 17543 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 322E144B749 for ; Sat, 25 Jan 2020 16:41:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15652688183; Sat, 25 Jan 2020 16:41:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E137A688118 for ; Sat, 25 Jan 2020 16:40:55 +0200 (EET) Received: by mail-wm1-f41.google.com with SMTP id p17so2354859wma.1 for ; Sat, 25 Jan 2020 06:40:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9fM6i7mS+3bOeCc8eGm6Uhj7wiLEkmM+SGfaFtXpq84=; b=u1kAa+tseLDDO7WDBUyc5i2Z6dRKfrXUz/6TAopf9MJycxSrzFBToiufqO6f+bZ8uN 3dONthA322Gj6inZxc7KoPSChBCIFA3RQr60HWEo0tItMKUCRI0ES0K5UrgNcswX6leA UY4LsNAk8gTMR52UlXAcL2ez83YM+++/ZB3ZXAt7K7U0W3STOrsmGackCGNt6yRob+fJ daZoUOvuC7+A4NNxMG8TYhR6YaLTm8R3EqdR1/g370TtZwWuM1nMCkCAASNkRAlytNUq bnVmVqxP/hvGqrWAd0YJW7rufWDASw8TYFf2R4rTcWgKyGM91eUQ+kZt3N56iCWoJPcs JRnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9fM6i7mS+3bOeCc8eGm6Uhj7wiLEkmM+SGfaFtXpq84=; b=IefMAjL8V5+CIYp6QR/KVJZyEL4eL3oT32SOY0SH9mwju580jV585jcV/n5ekC/kTl 22TZl67f8cyhE3I3oDUs8rR0VFWABmn8taU85fDVD/yZqV+xfPyhxPZW0WdFvm2rXx1x pV/gqaNgKo3qCaeU6eRsfTBAsQAz2xCvfGhX5DH+hyM7ywr2q+f0TDZmxU0vKnZqXlBj N9ewPgYdY5jw6xM2t04VvyfP+HSww6JrTP6YU9v+wAr0nCPovL/MKeHZjSI18yCkeslr mg+j5W0SSN35+deJtDxLcLE1ZREIomat7PHC20ahbQmBRhDPz6MxC7SkDIGaX09kz8ML jLZA== X-Gm-Message-State: APjAAAVLmRtwG64BBhh5PCdNCVI30VmdClhAgUQAU+WUdRv14mF5ZmEs S0zvcu9zzxJWh9LjcDpGA45/PABn X-Google-Smtp-Source: APXvYqwa5RV+eA9zaOSf2OJW/0PTF4Ik7LPGtFti3wHA7fVWBcyKiZBScp6rLphDdTUdgtG+Gjlnyg== X-Received: by 2002:a7b:c85a:: with SMTP id c26mr4604735wml.107.1579962785753; Sat, 25 Jan 2020 06:33:05 -0800 (PST) Received: from mkuron-mbp-icp.home.kuron-germany.de (i5DB53AED.pool.tripleplugandplay.com. [93.181.58.237]) by smtp.gmail.com with ESMTPSA id m7sm10855800wma.39.2020.01.25.06.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2020 06:33:05 -0800 (PST) From: Michael Kuron To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Jan 2020 15:32:52 +0100 Message-Id: <20200125143252.28298-1-michael.kuron@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/dvdsubenc: accept palette from options X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Michael Kuron Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Previously, the default palette would always be used. Now, we can accept a custom palette, just like dvdsubdec does. Signed-off-by: Michael Kuron --- doc/decoders.texi | 2 +- doc/encoders.texi | 8 ++++++++ libavcodec/Makefile | 2 ++ libavcodec/dvdsub.c | 33 +++++++++++++++++++++++++++++++++ libavcodec/dvdsubdec.c | 22 ++++++---------------- libavcodec/dvdsubenc.c | 8 +++++++- libavcodec/internal.h | 2 ++ 7 files changed, 59 insertions(+), 18 deletions(-) create mode 100644 libavcodec/dvdsub.c diff --git a/doc/decoders.texi b/doc/decoders.texi index 0582b018b0..83515ae363 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -280,7 +280,7 @@ palette is stored in the IFO file, and therefore not available when reading from dumped VOB files. The format for this option is a string containing 16 24-bits hexadecimal -numbers (without 0x prefix) separated by comas, for example @code{0d00ee, +numbers (without 0x prefix) separated by commas, for example @code{0d00ee, ee450d, 101010, eaeaea, 0ce60b, ec14ed, ebff0b, 0d617a, 7b7b7b, d1d1d1, 7b2a0e, 0d950c, 0f007b, cf0dec, cfa80c, 7c127b}. diff --git a/doc/encoders.texi b/doc/encoders.texi index eefd124751..a04f9f1b62 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3116,6 +3116,14 @@ and they can also be used in Matroska files. @subsection Options @table @option +@item palette +Specify the global palette used by the bitmaps. + +The format for this option is a string containing 16 24-bits hexadecimal +numbers (without 0x prefix) separated by commas, for example @code{0d00ee, +ee450d, 101010, eaeaea, 0ce60b, ec14ed, ebff0b, 0d617a, 7b7b7b, d1d1d1, +7b2a0e, 0d950c, 0f007b, cf0dec, cfa80c, 7c127b}. + @item even_rows_fix When set to 1, enable a work-around that makes the number of pixel rows even in all subtitles. This fixes a problem with some players that diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3cd73fbcc6..71ee8caeb3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -282,7 +282,9 @@ OBJS-$(CONFIG_DST_DECODER) += dstdec.o dsd.o OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o +OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsub.o OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o +OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsub.o OBJS-$(CONFIG_DVAUDIO_DECODER) += dvaudiodec.o OBJS-$(CONFIG_DVVIDEO_DECODER) += dvdec.o dv.o dvdata.o OBJS-$(CONFIG_DVVIDEO_ENCODER) += dvenc.o dv.o dvdata.o diff --git a/libavcodec/dvdsub.c b/libavcodec/dvdsub.c new file mode 100644 index 0000000000..a03ff27754 --- /dev/null +++ b/libavcodec/dvdsub.c @@ -0,0 +1,33 @@ +/* + * DVD subtitle decoding/encoding + * Copyright (c) 2005 Fabrice Bellard + * + * 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-1301 USA + */ + +#include "internal.h" +#include "libavutil/avstring.h" +#include + +void ff_dvdsub_parse_palette(uint32_t *palette, const char *p) +{ + for (int i = 0; i < 16; i++) { + palette[i] = strtoul(p, &p, 16); + while (*p == ',' || av_isspace(*p)) + p++; + } +} diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 741ea9fd1e..bf49788e1b 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -27,7 +27,6 @@ #include "libavutil/colorspace.h" #include "libavutil/opt.h" #include "libavutil/imgutils.h" -#include "libavutil/avstring.h" #include "libavutil/bswap.h" typedef struct DVDSubContext @@ -626,18 +625,6 @@ static int dvdsub_decode(AVCodecContext *avctx, return buf_size; } -static void parse_palette(DVDSubContext *ctx, char *p) -{ - int i; - - ctx->has_palette = 1; - for(i=0;i<16;i++) { - ctx->palette[i] = strtoul(p, &p, 16); - while(*p == ',' || av_isspace(*p)) - p++; - } -} - static int parse_ifo_palette(DVDSubContext *ctx, char *p) { FILE *ifo; @@ -719,7 +706,8 @@ static int dvdsub_parse_extradata(AVCodecContext *avctx) break; if (strncmp("palette:", data, 8) == 0) { - parse_palette(ctx, data + 8); + ctx->has_palette = 1; + ff_dvdsub_parse_palette(ctx->palette, data + 8); } else if (strncmp("size:", data, 5) == 0) { int w, h; if (sscanf(data + 5, "%dx%d", &w, &h) == 2) { @@ -748,8 +736,10 @@ static av_cold int dvdsub_init(AVCodecContext *avctx) if (ctx->ifo_str) parse_ifo_palette(ctx, ctx->ifo_str); - if (ctx->palette_str) - parse_palette(ctx, ctx->palette_str); + if (ctx->palette_str) { + ctx->has_palette = 1; + ff_dvdsub_parse_palette(ctx->palette, ctx->palette_str); + } if (ctx->has_palette) { int i; av_log(avctx, AV_LOG_DEBUG, "palette:"); diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index ff95ed2002..e54b5f0d7b 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -29,6 +29,7 @@ typedef struct { AVClass *class; uint32_t global_palette[16]; + char *palette_str; int even_rows_fix; } DVDSubtitleContext; @@ -436,7 +437,11 @@ static int dvdsub_init(AVCodecContext *avctx) int i, ret; av_assert0(sizeof(dvdc->global_palette) == sizeof(default_palette)); - memcpy(dvdc->global_palette, default_palette, sizeof(dvdc->global_palette)); + if (dvdc->palette_str) { + ff_dvdsub_parse_palette(dvdc->global_palette, dvdc->palette_str); + } else { + memcpy(dvdc->global_palette, default_palette, sizeof(dvdc->global_palette)); + } av_bprint_init(&extradata, 0, AV_BPRINT_SIZE_AUTOMATIC); if (avctx->width && avctx->height) @@ -467,6 +472,7 @@ static int dvdsub_encode(AVCodecContext *avctx, #define OFFSET(x) offsetof(DVDSubtitleContext, x) #define SE AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { + {"palette", "set the global palette", OFFSET(palette_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, SE }, {"even_rows_fix", "Make number of rows even (workaround for some players)", OFFSET(even_rows_fix), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SE}, { NULL }, }; diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 5096ffa1d9..41281b1140 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -424,6 +424,8 @@ int64_t ff_guess_coded_bitrate(AVCodecContext *avctx); int ff_int_from_list_or_default(void *ctx, const char * val_name, int val, const int * array_valid_values, int default_value); +void ff_dvdsub_parse_palette(uint32_t *palette, const char *p); + #if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avcodec) # define av_export_avcodec __declspec(dllimport) #else