From patchwork Sun Nov 13 19:07:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 34857 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2049877pzb; Sun, 13 Nov 2022 11:07:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf61TgoZlOeHU0WZwvSj7vgbg8ctdxRqQf5BsUvSMVK/b7wJSxZ5br4X5h1tWLaOV5JOdgIO X-Received: by 2002:a17:906:a1c8:b0:78d:585e:d183 with SMTP id bx8-20020a170906a1c800b0078d585ed183mr8157016ejb.768.1668366458370; Sun, 13 Nov 2022 11:07:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668366458; cv=none; d=google.com; s=arc-20160816; b=NmmuCI4WifA3v7/xjA7Jrh6nVczWPD/zo0B2bu+1Wln8pofaFkjSKsvM/qbMIfcc3n VIKcaEtukMxyaSayPp0poCMv29PR5zsOvZUMr6iWAzGXu+EYqR+MlU/OIOw52ZvuXZ5K f87CnibDz41qluwFGJp/p4K/fBz4HqAhYG5K8tVc5g6GScfl4Ktu254cGJLlg2N9Hb88 5Agd7m5yw7sUMT25MEAiJ4+NLeCskNWV+ExWT8XbutS3HRwJHtmptYuoD8PHJr7VUBpX sYzWcBxOMiMKLeRBH4b2lX2QLS0GoH1ypJeFJvqA1J5ypxB/g9QJXJUfMRi5IrcFRIsP TfhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=uTegeSmF9hcRnll/H5raVsJuCk40454eq8hAe7CvGCc=; b=D1kjbIw9uk8/iDaFjGIXv1yAHgWT4t2IlJjG+Lnzso3vXd3h2nuseFQ+/DBIRzf5Lf 6FUsiElsVF1GGlJS0Ow+NCY6fs206Hc07wdhnJ4VLVI3hmuK5Yc8NRangucQEzUdB+tx x2MO84lrCEnaROpIAzQeako70fOFyoxTTFFzKEPnXbFbs23Tf7nWszjBYyOYAwGc3cde 1EZcIT8BNY+IjI3mrvNDlaZ+NFWQtpaaAEgu9R5ruw+s/2MhI2uAvwj0n0NVu4THcWKP lu+xw4aduUZwmDZb4GJdsEbaB/rRsRWLQlhVIjNuKSQAbZY7rWxuuzTpZmjre3f9H5Ba aaKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@oneric.de header.s=strato-dkim-0002 header.b=okoJwqEn; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ji7-20020a170907980700b007833c7cf1dcsi7400571ejc.387.2022.11.13.11.07.37; Sun, 13 Nov 2022 11:07:38 -0800 (PST) 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=@oneric.de header.s=strato-dkim-0002 header.b=okoJwqEn; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6970C68A360; Sun, 13 Nov 2022 21:07:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D021668B862 for ; Sun, 13 Nov 2022 21:07:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1668366436; s=strato-dkim-0002; d=oneric.de; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=BzgA+mkKSrNZO/2GztLbwsMjY1pdnHgnat7beNTnuts=; b=okoJwqEnAFyCobZKmPQ4I74inuPCPrQlT8rGXgMEsg04gh4m6cE/+05kvChmUhXWcX NwWFftqwTnCuEOwd13julu7ymbO8Uz0xgQ3RigPxCJVtoGpGQ/zmVmDQ3h2itz6/kALs PblNrFaY+Hdir3W1DshZ7LRyka2RNTjCRfzy6uVP9rM2ayO/98r0uNYb1cNbwRtHlyHz Hw+F2Mp+rrbZueoUAYjShSMwR+1loCfUPdIbE5cdT+dcmdlt4cPfYmq7zaHrgf9LK/KH aUdQ2wlV8Ot+XbI9nXFS3c9MVZ1oimN6M/hRjrK+5CZjuJ3DSk/1pbGzjFXQ/Ecw7jzZ 0j2g== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyYHd48hugDaTPD0scTjgixgxauA" X-RZG-CLASS-ID: mo00 Received: from koenig-desktop.workgroup by smtp.strato.de (RZmta 48.2.1 AUTH) with ESMTPSA id V28b60yADJ7G27h (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Sun, 13 Nov 2022 20:07:16 +0100 (CET) From: Oneric To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Nov 2022 20:07:01 +0100 Message-Id: <20221113190704.15518-1-oneric@oneric.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 0/3] Some small ASS conversion fixes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zI6uzY0wM4sF This fixes colours and font selection for files converted to ASS. To avoid a bug with patchwork’s diff download stripping CRLFs, I formatted the updates of reference files as binary. They intentionally contain CRLF characters and without them do not pass FATE. tests/ref/fate/sub-scc keeps a text diff since it alone is marked as "diff eol=crlf" in .gitattributes. Oneric (3): avcodec/ass: fix comment avcodec/ass: accurately preserve colours avcodec/ass: specify a permissive encoding libavcodec/ass.c | 5 +++-- tests/ref/fate/sub-aqtitle | Bin 3213 -> 3233 bytes tests/ref/fate/sub-cc | Bin 839 -> 859 bytes tests/ref/fate/sub-cc-realtime | Bin 1524 -> 1544 bytes tests/ref/fate/sub-cc-scte20 | Bin 945 -> 965 bytes tests/ref/fate/sub-charenc | Bin 6008 -> 6028 bytes tests/ref/fate/sub-jacosub | Bin 1783 -> 1803 bytes tests/ref/fate/sub-microdvd | Bin 1375 -> 1395 bytes tests/ref/fate/sub-movtext | Bin 783 -> 803 bytes tests/ref/fate/sub-mpl2 | Bin 870 -> 890 bytes tests/ref/fate/sub-mpsub | Bin 2517 -> 2537 bytes tests/ref/fate/sub-mpsub-frames | Bin 736 -> 756 bytes tests/ref/fate/sub-pjs | Bin 860 -> 880 bytes tests/ref/fate/sub-realtext | Bin 939 -> 959 bytes tests/ref/fate/sub-sami | Bin 1981 -> 2001 bytes tests/ref/fate/sub-sami2 | Bin 9970 -> 9990 bytes tests/ref/fate/sub-scc | 3 ++- tests/ref/fate/sub-srt | Bin 6301 -> 6321 bytes tests/ref/fate/sub-srt-badsyntax | Bin 1561 -> 1581 bytes tests/ref/fate/sub-stl | Bin 2241 -> 2261 bytes tests/ref/fate/sub-subviewer | Bin 780 -> 800 bytes tests/ref/fate/sub-subviewer1 | Bin 1494 -> 1514 bytes tests/ref/fate/sub-vplayer | Bin 742 -> 762 bytes tests/ref/fate/sub-webvtt | Bin 1985 -> 2005 bytes tests/ref/fate/sub-webvtt2 | Bin 1648 -> 1668 bytes 25 files changed, 5 insertions(+), 3 deletions(-)