From patchwork Fri Jan 24 22:49:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Kuron X-Patchwork-Id: 17527 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 8FABA449B97 for ; Sat, 25 Jan 2020 00:49:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 74A6868AF15; Sat, 25 Jan 2020 00:49:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D8746881A4 for ; Sat, 25 Jan 2020 00:49:48 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id d16so3901462wre.10 for ; Fri, 24 Jan 2020 14:49:48 -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=C+WGkhlqd3fo9a6L/Kvgkg/BbGSUasBNGNfWnCY34Nk=; b=k8QUw9/YXmTXNkLskbXf4sedSP65k+TwvPttfmbbnSHRp9aUmjSnu3LgC3OrZU3pQ4 Lxm75x9BFZCAbeclE+uCv1A6346SvqoWkijg3no6G+EQMehDmG9ShDByPt1XgLD7p7Io GlwnBbkTq33aRilNpS8uBhGcKi8E94eK51r+cIK6r0xCgJXZN6EheDbANnvWQtQMVApF U/a904N9ijUSabjlOA9EhQ8qJ2YZpNAawM49euSk0y7y3N7k4z1JSEKyHlCHRrerVcOC ZWD71aFTKOZmxusoD9pNOXeQOXyZZvc/HaASCYd4tZiO+ElUBHmdmgCQ/Kb6zsdh2JVT 5Hyw== 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=C+WGkhlqd3fo9a6L/Kvgkg/BbGSUasBNGNfWnCY34Nk=; b=Cvs2HJEWtsMMam5ElGYPhSs2gIm0wmJXJV1EaJAAQ2ik5Qib2fC47zFpy2iDfM8fCx Jc4w5eBDHdHcf60NqfzUc7D+UKieho/itQ7EV5OqCDTXFXLZUcy9kiVL3UMLb3LQYaRl NVSDjbjzI/6YUPW5ZUNaGk3OvBXsYt68aInmmyix0xao8qUx9Pjn2ChJ7KD3ALkdfFK1 4j6Zbc5xGk27L+9jdl07qqo0KVZRB0HGrZKSmJflgC6ImIYUfBLhixZMeZ1/rcE3rLCH T12i2nwF2mc0PuZaYeoxFyUqFlP3Vzjd++0/nAslW+70L+6CGWdD4RwZI6W8nUfmrzhR JXDA== X-Gm-Message-State: APjAAAVICFzQAH8lzCRmuzSWjoLRwC42UTfvF/TiIUzwPDahsiIzdKkw foyPg6Voex7RlskO9VsSM+bbkxWx X-Google-Smtp-Source: APXvYqxURzvJRCt2HBkHzGmi0qXR6RfXqDp6Gkksuzcgv7nqU6xSK2wdGx9hu6OWpSyLDD39e5oHpg== X-Received: by 2002:a5d:4b4e:: with SMTP id w14mr6934060wrs.187.1579906187670; Fri, 24 Jan 2020 14:49:47 -0800 (PST) Received: from mkuron-mbp-icp.home.kuron-germany.de (i5DB52B2B.pool.tripleplugandplay.com. [93.181.43.43]) by smtp.gmail.com with ESMTPSA id c9sm8451006wmc.47.2020.01.24.14.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 14:49:47 -0800 (PST) From: Michael Kuron To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2020 23:49:38 +0100 Message-Id: <20200124224938.8150-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/encoders.texi | 8 ++++++++ libavcodec/dvdsubenc.c | 19 ++++++++++++++++++- 2 files changed, 26 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/dvdsubenc.c b/libavcodec/dvdsubenc.c index ff95ed2002..674d97ab9b 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; @@ -423,6 +424,17 @@ fail: return ret; } +static void parse_palette(DVDSubtitleContext *ctx, char *p) +{ + int i; + + for (i=0; i<16; i++) { + ctx->global_palette[i] = strtoul(p, &p, 16); + while (*p == ',' || av_isspace(*p)) + p++; + } +} + static int dvdsub_init(AVCodecContext *avctx) { DVDSubtitleContext *dvdc = avctx->priv_data; @@ -436,7 +448,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) { + parse_palette(dvdc, 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 +483,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 }, };