From patchwork Tue Oct 24 00:04:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5664 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp31021jah; Mon, 23 Oct 2017 17:05:21 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TACefHvy6RuNd044PEmga8zBShfBcofHEBG1YcXNihN2vRsbyMvqsk/qA4AbGSQfZfg53R X-Received: by 10.223.185.77 with SMTP id b13mr4856215wrg.58.1508803521136; Mon, 23 Oct 2017 17:05:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508803521; cv=none; d=google.com; s=arc-20160816; b=rX4ld+J4TAEcXgieG5w7zubrbvY86qfXcAor32IX2MxkOnsvSFUuxhdfHB1AiztBKt 6WnzZUsfRnvNsI9I1My9I9MXMBL0V2UVdqLqmlhRM9/lku8PPi0eBFJXA6ZMSLg6lXc4 r2tK9GqbQ0AGukQgEBJ310CIeVkkZNhRtD97x/3UtZLyyBoHE3hOrHfHKlpLCBxM/C1z FJtrMy5WxwY5lYhJYxYHg2SFPLAb4d3sxATuAHX+k0uYLIt59AmTU8+8fWPjSU1UEv1v RWF7BHwJqMCgu8E+frqzdSLLplK37vKj2G9yJvzeliqfkLKGDAwij2qELsWC2AQvsOic WMUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=bh2749Gw0Io5mfPFMUfuWd609Ji5XvelcR12vpP+RCY=; b=ADKyw1NjvTOMMEMOui2aIid0Ax2VFS/u2AtMHbnEPZaK25JuPTjH+cBdwsTLF+ER/T uTgeicXNKnyMrj9+SIMFiEDtU0+g+5nHUGJa4kCORIW9k0XcNsFTonWdPHIaG2Iel5PN I/oXk3Fk+nAjFfvvRKDqVqMxutkKfxYm/l7SL+yExmIWUI/41n2FrVMDEcv5gy+VlnNU A4lUArPgkwQbrty0xNmEcrEwPdH9zAvuecpZqHifyxLtDL/Qc0BVwZW7JcHH4fJ76cUe 4quihhr7ruiU33n0XGsoguRPgCdvCT+TeyWpMoq+fWUIEOlxKSArtkN1Y8307o/CfFUk Lvvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B4DBiZjk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 20si97904wmu.258.2017.10.23.17.04.57; Mon, 23 Oct 2017 17:05:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B4DBiZjk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A43DD68A18B; Tue, 24 Oct 2017 03:04:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f47.google.com (mail-it0-f47.google.com [209.85.214.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45647689E60 for ; Tue, 24 Oct 2017 03:04:43 +0300 (EEST) Received: by mail-it0-f47.google.com with SMTP id l196so8015066itl.4 for ; Mon, 23 Oct 2017 17:04:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=+sHBOAOh+QkpKsVLYgw0XAtrCS/jgb+xxJvjcPKGl6U=; b=B4DBiZjkZPISb01ZiAVE0BtDOuXahBfieX8V5kPuiYalfPH2QLkTix7I5ZLRxCVDnS IiWwqQBR5YbP+B9j8/IJf6AGR0+kklftELX6nBhs5JMrokRR08ADr/RkUxjlNwqkoI2t aIl0ZZRrLV+ec7CBC2VLUOWM6JL52BmOn8Sq3PLLYFxiPNuVIskqYLkljkXFLQmIbdci mWuyqsWQFbqqpWPtbUtf7o+f4JSl6wc5iW5zxtZIbUEizz7Wor0w9v3M2ywLLEJG/dU1 mt1lZrDWBb2HKbdmJ/TmKKitLPIiMpZErBa4H9EQWXbtFLXMnSE1ZVLUVBe8nJDPF/V5 t7gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=+sHBOAOh+QkpKsVLYgw0XAtrCS/jgb+xxJvjcPKGl6U=; b=cmzgny2JOksL7Gi+J2LpHzEIHvlns2rKMTJb2iBQIavWkiY3V5/Ln4+th6floDEIpp jCityiwF50/NcXmPedBB7UBlINAwMCDInX0I2Kah2EcjOQcJ8LuBpX3q+cyxKJnN+ZPD Vd0KNBQ8JBfWDucovl/jtgq3e2WrmK0wzUFsU5UylLo2xc9ZPZIC3gvhZTB/UBTfIzWH Otiv3LZvbIhOh8A/iNTwZ4E//wv0cTMop79niLu3/TShhlU7gCk//PgIchAPgDE7Mo31 Qg8qLjO2bSEnaJZb3o2kiw4tB3huDk+h1rhvqTm/fna5duYUTBqD6I6hyR3NaewOnw+p kJlA== X-Gm-Message-State: AMCzsaWzlkKMQoMDvEN8CTcsDfeOQJc4uG07RXF0lX2G6pkVla5TYUL6 0osF+rSdm2UilUr0LZVJf9WTD3wLXQVlYG6ARxM= X-Received: by 10.36.118.210 with SMTP id z201mr11993143itb.78.1508803488802; Mon, 23 Oct 2017 17:04:48 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.63.101 with HTTP; Mon, 23 Oct 2017 17:04:28 -0700 (PDT) From: Carl Eugen Hoyos Date: Tue, 24 Oct 2017 02:04:28 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/dvbsub: Allow 256 colour encoding 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Trying to encode 256-colour subtitles to dvbsub currently fails in the "region" section, a hunk of Joolz' patch was not committed six years ago. Attached patch has two hunks: The forgotten hunk from the original patch and further up a fix that I created now (to be committed separately): The line separator from the ETSI DVB blue book was missing for rle8 encodings. Please comment, Carl Eugen From 06fd4904b6aa04c3ab8e056ef4f6be4a89093a1c Mon Sep 17 00:00:00 2001 From: JULIAN GARDNER Date: Tue, 24 Oct 2017 01:59:51 +0200 Subject: [PATCH] lavc/dvbsub: Allow 256 colour encoding. Fixes ticket #6769. --- libavcodec/dvbsub.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index 3cdbade..8cce702 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -239,9 +239,9 @@ static void dvb_encode_rle8(uint8_t **pq, x += len; } /* end of line */ - // 00000000 00000000 end of 8-bit/pixel_code_string - *q++ = 0x00; + // 00000000 end of 8-bit/pixel_code_string *q++ = 0x00; + *q++ = 0xf0; bitmap += linesize; } *pq = q; @@ -342,6 +342,9 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s, } else if (h->rects[region_id]->nb_colors <= 16) { /* 4 bpp, standard encoding */ bpp_index = 1; + } else if (h->rects[region_id]->nb_colors <= 256) { + /* 8 bpp, standard encoding */ + bpp_index = 2; } else { return -1; } -- 1.7.10.4