From patchwork Sun Nov 13 19:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 39258 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2049927pzb; Sun, 13 Nov 2022 11:07:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf4lDI57tgQKJku24LSn88gEN6+GvPtRY5MnkW81OVHEfqAifxj3XIDpSwDedIyVQBDqflZG X-Received: by 2002:a17:906:5fc9:b0:781:c97c:84d1 with SMTP id k9-20020a1709065fc900b00781c97c84d1mr8195115ejv.147.1668366466197; Sun, 13 Nov 2022 11:07:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668366466; cv=none; d=google.com; s=arc-20160816; b=SoSj/VrpQ/GKlmTIqzoHprJcv+m7Z3rKQV8njnXlyCG3aQpj8CgYNFkwzlx14jf/se toNxRKn3dHVmjAPHae3vHqGGEnBTF/e0s+dtlZDYeswX2Ljz9dIQUhvrQ5/4zAbJE5KW qoHX5p8VVWHmyFdRZsXXeFF9K0rDtvyEDAhHZUThHCGId4dlYJKUl+mn0VJo5ZF788k5 RNKAcYDVHTz4rmFUiy0z6E4jX8OJL0845Awa6sVZ6yGDuGfDA333jfNgDmKf+GXOprRq nn4+KezqXoozN9cCxzOSl4+888sWK+izEd3TP/vmU0/5NDD5fdRXiFwgHXhJ30z41wl8 Nh9w== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=iNllBqeJ7bbxuY3twylavn4qKc8JNMFMYj9oYJSDiDU=; b=asGuUiyuGW3us4Cpu+H1hHLCv0VIgrXKDRsBL2yXMhBpIKM+0Nop25lgYAe35D5MA+ 9TSnF9z30yU0Ybwvy4qeOKDEbvMAZVXoFpqvCFRDxOrQiyAC+YwYqla/030aMnasFJwN 7z1vv5sFRtgjJKqPfdVrgk51x5RyfLlwYbjp7SlrjRCPESUjrxfhsem31hrndFsHaEFZ gTaveQLjsPO2iir4lUQI8BoM8m1bfKq3WvJ9HN/NsD491h0VKo47oyoizfSQdo+pMBdx PBAyyzZMEEqa5Iv2WHMvR73grsrPT4Yl6AgLXCsJ00uRklZcGF5Bw7un9yc+NtOb0yy+ rHXw== 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=r4gQ9VJ2; 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 b21-20020a17090630d500b0078d44c5da0esi5988896ejb.667.2022.11.13.11.07.45; Sun, 13 Nov 2022 11:07:46 -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=r4gQ9VJ2; 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 4982D68BB4C; Sun, 13 Nov 2022 21:07:26 +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 C828168AD79 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=References:In-Reply-To:Message-Id:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=F0gwFXG8gl+WqO6SszoFIXgJoHETCYKICVrrfTTV4fU=; b=r4gQ9VJ20ok4UFo3sEg+W4sYFj1yGLyv1OBLdXOg3pdZgiFgPgfjVMWmnMGDOUjyL+ vnUr6LZv6jEhkTxyoKXC1jBTpuIaaHyoDBNqkS2UNif/GxVgTbmu1isEMD/ugTYXYRWQ jnh4SGvtAIhUeZ6zkmgS6m61/m9jOK/88bX/dtEOXtyRbc9iHlCcaC3lzL5klOQMcLD0 ZLfh/5bEDd8TQTJUJu8L7FVfqzZl1gz1ErUOA3gTTC+re610TOUsw/mbvgTJFvhnNE6k WxMf9k7jhY6o/eAySV9PkJzf8szkmgQfQFWdYmBdPv0czYtaV9THQ8DcofOHusDpNoJp qC3w== 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 V28b60yADJ7G27k (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:04 +0100 Message-Id: <20221113190704.15518-4-oneric@oneric.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221113190704.15518-1-oneric@oneric.de> References: <20221113190704.15518-1-oneric@oneric.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/ass: specify a permissive encoding 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: YnYcRqsdaiOx The Encoding field (and the \fe tag) allows to limit font selection to only those fonts declaring support for the specified codepage in their OS/2's table "Code Page Character Range" field. Particularly, Encoding=0 means only font's declaring support for "ANSI", or rather "Latin (Western European)", are allowed to be selected. Specifying Encoding=1 allows all fonts to be considered. We do not want to limit font selection, so specify Encoding=1. NB: at the time of writing libass only partially supports this field, thus hiding the issue in any libass-based renderer. A VSFilter-based DirectShow filter or XySubFilter will reveal the issue when a font not declaring support for latin characters is specified in a style. --- libavcodec/ass.c | 2 +- tests/ref/fate/sub-aqtitle | Bin 3233 -> 3233 bytes tests/ref/fate/sub-cc | Bin 859 -> 859 bytes tests/ref/fate/sub-cc-realtime | Bin 1544 -> 1544 bytes tests/ref/fate/sub-cc-scte20 | Bin 965 -> 965 bytes tests/ref/fate/sub-charenc | Bin 6028 -> 6028 bytes tests/ref/fate/sub-jacosub | Bin 1803 -> 1803 bytes tests/ref/fate/sub-microdvd | Bin 1395 -> 1395 bytes tests/ref/fate/sub-movtext | Bin 803 -> 803 bytes tests/ref/fate/sub-mpl2 | Bin 890 -> 890 bytes tests/ref/fate/sub-mpsub | Bin 2537 -> 2537 bytes tests/ref/fate/sub-mpsub-frames | Bin 756 -> 756 bytes tests/ref/fate/sub-pjs | Bin 880 -> 880 bytes tests/ref/fate/sub-realtext | Bin 959 -> 959 bytes tests/ref/fate/sub-sami | Bin 2001 -> 2001 bytes tests/ref/fate/sub-sami2 | Bin 9990 -> 9990 bytes tests/ref/fate/sub-scc | 2 +- tests/ref/fate/sub-srt | Bin 6321 -> 6321 bytes tests/ref/fate/sub-srt-badsyntax | Bin 1581 -> 1581 bytes tests/ref/fate/sub-stl | Bin 2261 -> 2261 bytes tests/ref/fate/sub-subviewer | Bin 800 -> 800 bytes tests/ref/fate/sub-subviewer1 | Bin 1514 -> 1514 bytes tests/ref/fate/sub-vplayer | Bin 762 -> 762 bytes tests/ref/fate/sub-webvtt | Bin 2005 -> 2005 bytes tests/ref/fate/sub-webvtt2 | Bin 1668 -> 1668 bytes 25 files changed, 2 insertions(+), 2 deletions(-) index 516d26af9ab09613f939d004826e44c80b3b1054..5e4f5ff7fcdeb665d7de42a3d8856474e9ee2765 100644 GIT binary patch delta 14 Vcmcc3cAIU(J4Qys&F>j=7y&P41*8A~ delta 14 Vcmcc3cAIU(J4Qx>&F>j=7y&O}1)~4} index a97d29f70ba1d3984887eacb6e833abb8a406902..cded979cb874371943ce5eb0648b472fec9d5d1b 100644 GIT binary patch delta 14 WcmX@gew2N~J4Qys&F>knF#-TC76s%0 delta 14 WcmX@gew2N~J4Qx>&F>knF#-TC5C!7^ index 32086d9365399ae3a968f9f61c6e3fa83a35ff65..9f555fb7470fa81d30e7668ede0fa883b105d729 100644 GIT binary patch delta 14 VcmeC?>*m|=ijmQ9^J_*0RsbhH1jGOU delta 14 VcmeC?>*m|=ijmP^^J_*0RsbhB1j7IT index 973e9f16457906c4bf9bd95d7053b2c4e405e68a..f96af3f8cfeab191fd2386219fa05352b9348fc9 100644 GIT binary patch delta 14 VcmZ3?wwP_h4@O4A%|98n7y&7?1qJ{B delta 14 VcmZ3?wwP_h4@O3V%|98n7y&7+1qA>A index 4c3d37fa42206d262e221b1d0b81312289329143..28c36ea40ca5bfb08e30c2ae7add905a9135c398 100644 GIT binary patch delta 14 WcmaDU{8D(sD@I1c&952%u>$}z00wFR delta 14 WcmaDU{8D(sD@I0x&952%u>$}y`UYtL index a32720514305771ae40b9182a9c469e098b6b1aa..0eb6880a14681ca8bbf0247b2c77bd866c50e601 100644 GIT binary patch delta 14 Vcmeys_JM7~D@I1c&950-838ed1>XPw delta 14 Vcmeys_JM7~D@I0x&950-838eX1>OJv index 3f194bdd0253eff13af8df85876f656e9fca8658..7c1eff3bccc134dc3b81b0d166ebe83872007046 100644 GIT binary patch delta 14 Wcmcb}f02K~D@I1c&951su>t@u{stHT delta 14 Wcmcb}f02K~D@I0x&951su>t@u_y!jM index ff667eb4ec..a9ff3676be 100644 index 27bdd48c404370d047697c06b710e44aaa371b74..b77cada3f5710ff27d0d7dacc7d56119fd23700c 100644 GIT binary patch delta 14 VcmZ3>vzBMWD@I1c&951qSO6-;1tkCg delta 14 VcmZ3>vzBMWD@I0x&951qSO6-&1tb6f index e910e154ba6203eca72f994d2f3cfd40d50f5ebc..b3d69bfd1f3983aba6ee76718778b31decf0b1a1 100644 GIT binary patch delta 14 VcmZ3$wt#KJD@I1c&950v838E91n&R< delta 14 VcmZ3$wt#KJD@I0x&950v838E31nvL; index ef9cb2d9e5eec004f9d1ae70112bf4fee6a0bbfb..3949a2be89c06a43407fd324432ff4272d09ac7b 100644 GIT binary patch delta 14 Vcmeyx`iphLD@I1c&952x838ed1$zJh delta 14 Vcmeyx`iphLD@I0x&952x838eX1$qDg index 56afed8944071d465eba2a8c0308af88863e54b6..1d236eabdcef44467ff14d3e7b6fd1445283c111 100644 GIT binary patch delta 14 VcmZqSZQEPM$j*-!D^Ls`~762yY1iAnK delta 14 VcmeC+>EPM$j*-z|^Ls`~762yS1i1hJ diff --git a/tests/ref/fate/sub-cc-scte20 b/tests/ref/fate/sub-cc-scte20 diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc index 339137ae0b5485c4c954f859316cf8b413b01505..67e209856fccd5e1aebbacbe4c966ec769aebcd2 100644 GIT binary patch delta 14 VcmeCt@6q4zijmQ9^J~V1q5vy`1(^T< delta 14 VcmeCt@6q4zijmP^^J~V1q5vy=1(*N; diff --git a/tests/ref/fate/sub-jacosub b/tests/ref/fate/sub-jacosub diff --git a/tests/ref/fate/sub-microdvd b/tests/ref/fate/sub-microdvd index 11440c28243f00cf99f07ff91ab2eb1c23dc2cc1..fa418f53db612e33dd6839b9ed1ce5ba8985e82f 100644 GIT binary patch delta 14 Vcmey&^_gqKCq_oY&7TO diff --git a/tests/ref/fate/sub-pjs b/tests/ref/fate/sub-pjs diff --git a/tests/ref/fate/sub-realtext b/tests/ref/fate/sub-realtext index d80db64dafcc51c0536b968eb0416444bbdb2a21..347a8c0eabcb1037a837d3514e820a3fbdac9b96 100644 GIT binary patch delta 14 WcmdnbzMp-=D@I1c&951+FaiKALIutM delta 14 WcmdnbzMp-=D@I0x&951+FaiKAJO#}F diff --git a/tests/ref/fate/sub-sami b/tests/ref/fate/sub-sami diff --git a/tests/ref/fate/sub-sami2 b/tests/ref/fate/sub-sami2 index bab07e4c0709cb420c1c248782e95bbf015b844f..9b5dcbe7a2c185c1e3ea0f559bcf0ba289d261e1 100644 GIT binary patch delta 14 VcmZqkYxCRiijmQ9^J_+FRRAo~1yuk5 delta 14 VcmZqkYxCRiijmP^^J_+FRRAo^1yle4 diff --git a/tests/ref/fate/sub-scc b/tests/ref/fate/sub-scc --- a/tests/ref/fate/sub-scc +++ b/tests/ref/fate/sub-scc @@ -8,7 +8,7 @@ YCbCr Matrix: None [V4+ Styles] Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,0 +Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,1 [Events] Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt index a6ed4f31df47709db51272dff3bd889cb9ffc317..7449090fd063f5a8b7e948568db736f47d4c7832 100644 GIT binary patch delta 14 WcmdmJxY2OKD@I1c&951ci2(pFzXlBe delta 14 WcmdmJxY2OKD@I0x&951ci2(pFxdsdX diff --git a/tests/ref/fate/sub-srt-badsyntax b/tests/ref/fate/sub-srt-badsyntax diff --git a/tests/ref/fate/sub-stl b/tests/ref/fate/sub-stl index 3e847a68beb5d6cfca08ea4612027d72eda9958a..3bf1f0d43fa614c4354348c2fc28946caa554ed3 100644 GIT binary patch delta 14 WcmcaAcvW!2D@I1c&950>u>k-up9U!a delta 14 WcmcaAcvW!2D@I0x&950>u>k-unFc5T diff --git a/tests/ref/fate/sub-subviewer b/tests/ref/fate/sub-subviewer diff --git a/tests/ref/fate/sub-subviewer1 b/tests/ref/fate/sub-subviewer1 index 2d253288e1db9f2c2061512b6c85ebaefc5c51b0..4c19890ff143fad91649ec2e89d0f22c71b0fbfc 100644 GIT binary patch delta 14 WcmaFG{fc|TD@I1c&952%GXnrJSO!@D delta 14 WcmaFG{fc|TD@I0x&952%GXnrJQU+K6 diff --git a/tests/ref/fate/sub-vplayer b/tests/ref/fate/sub-vplayer diff --git a/tests/ref/fate/sub-webvtt b/tests/ref/fate/sub-webvtt index 091cfb5d3f73c97c82146d67bb0447f3fd8bebe7..2317c7d5a0500c4fc576db99e8c074d74e43c821 100644 GIT binary patch delta 14 Wcmcc0f0cj3D@I1c&950>u>t@vZU!U( delta 14 Wcmcc0f0cj3D@I0x&950>u>t@vXa*wy