From patchwork Sat Feb 1 22:43:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Kuron X-Patchwork-Id: 17651 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 7D2B344ADD0 for ; Sun, 2 Feb 2020 00:52:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 686836891FF; Sun, 2 Feb 2020 00:52:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61F316880BB for ; Sun, 2 Feb 2020 00:52:31 +0200 (EET) Received: by mail-wm1-f43.google.com with SMTP id t23so11895999wmi.1 for ; Sat, 01 Feb 2020 14:52:31 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=MCJtWrcN/XpnVQNxCc+Oeou2HCPS089M6WmtqqptUoM=; b=GFbTTgwkEiBI5YzkkrujDdJ+aVHTM7Sbbsm36n36gkhMw3XbbnQrA0sVt4hx1MUlZe pWRGqVDBEqfLKH4LZVu3BxIXlVdA8kqgECn2P5/z0wxhjZd27b61sOdwEeZYo3Nt3Bpt ayTne0WzRErT62PsBjPFyxKDssVhzyzz0wnelF3o+W01AvjeWGG3gIdyASuSAfhxwAMs 4cZv9nOIbKXdJx0iGN9oO69aLq7zB4xkLzEb1/OnKFJQxzVj177aBLmaE8Yf+ZresrDR 6sLyazZ7xbbILSRJILIEm1msEq8tY2cpFLREP61xR/Q4HREQGTEzm729FNkYkjM5kQpR c6UA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=MCJtWrcN/XpnVQNxCc+Oeou2HCPS089M6WmtqqptUoM=; b=PnIy15Xd7Uk/XZB59nf/7iemAEs4n2FNQUZ762OwyOoybj6bmZvqVW27KqcudYf9VC NUzfkl23GEcQHfC1xKmB9xAHa3BFy09NT7nKt7R2TpX2LMSgxIsZo+rSvs0gXN5r56s5 fco2lfz3QgcXhSrzMj1+YJpKnNwWHa9Z43j/9ai7OrYbtiHo58wr/U6BGl9nl8EtE1Kl plq2zKaNeGhUxbR+tntHuAMNOYh0s3gEnRmKA66h1Oy5mImej8HQZiDmcEZEUs7Ya9s8 2AyRq3hkxOwro3VP9QdxSZhZyS6oPRUIgbssK39wxKtqvn9azs5PnjpoNbdF+imGdapF bRGg== X-Gm-Message-State: APjAAAUv0oXgvsqkNO71jSzhiYJUTTyXLpZDufaySQYmJrpQSChKkCud HiJL+zIDpv0eCO4hJCIem5mBIZs0 X-Google-Smtp-Source: APXvYqy/7Ms+7WCyOqHX3nBN/6lORLaE3UjZiuIHJGssk5Oz0fKidZt959cNLUkjhrIqmIpzOKyhDQ== X-Received: by 2002:a1c:9d07:: with SMTP id g7mr19492202wme.130.1580597203416; Sat, 01 Feb 2020 14:46:43 -0800 (PST) Received: from mkuron-mbp-icp.home.kuron-germany.de (i5DB52E3F.pool.tripleplugandplay.com. [93.181.46.63]) by smtp.gmail.com with ESMTPSA id x10sm17836353wrv.60.2020.02.01.14.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2020 14:46:43 -0800 (PST) From: Michael Kuron To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Feb 2020 23:43:09 +0100 Message-Id: <20200201224309.3016-2-michael.kuron@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200201224309.3016-1-michael.kuron@gmail.com> References: <20200201224309.3016-1-michael.kuron@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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/encoders.texi | 8 ++++++++ libavcodec/Makefile | 1 + libavcodec/dvdsubenc.c | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-) 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 ddc923304a..71ee8caeb3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -284,6 +284,7 @@ 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/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 }, };