From patchwork Mon May 22 13:26:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41780 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1717366pzb; Mon, 22 May 2023 06:26:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4etz6Ddz0Zq2EfiZ/I6bT1Aujal4W4Bxd/eHqga0sypDP/NAWdHIHKxUus9Lp2Th+cqTxE X-Received: by 2002:a17:906:fe45:b0:96a:58a:6cd8 with SMTP id wz5-20020a170906fe4500b0096a058a6cd8mr9219161ejb.9.1684761996064; Mon, 22 May 2023 06:26:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684761996; cv=none; d=google.com; s=arc-20160816; b=p5WlwiK72zhmERpS0i+55CwQlTPDKCkX34OsAB3KmYrj10PLW4270XiKVi+a/MCMZv Ej5XHKfRjR0FyCnv3aBY9Jv5ZT0hJx/yTLkU2yAxDQF5ByJEtUdKv5fJBlr+aly56s+O obC2ge7wUT6jzJ80p/BWuOEd/d9INcjdcfLjgavUVAl7lklStfVXEPYBjr36c3NgR8mc Lk7WhS3SLMA8i0kcQYYYjlgPvTjuaqoIbBuI6lyOkhWtrxXIauvklN+cE3wN+S5wbZzo ydlSJ0ZNR0iNGY/bq+TxGcqQ3cx3JD5IIlpouB2ip7fotVJ4KHtXI9peYFeo4QpdiBPR 9FCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=MTmIZU6N3ALBziyEbIcaS0CLhJ+0u/Uo/8wQiRPDsbg=; b=dTu/9y9xk49Qf1stU4fnZZs11nuETOwoLgskVUJs64KhFe0SQJafMB/0imsWOw6bTI sozsz/ix5+KXG0VZablXjFuNEvsu96JTAkeCFjCA9J22AiCp4k45Z+v/W2/2pju5HYpu cNFKIh1cwS8wGekrSxPNeoNtFaVkCIjrFsozzWkp++/SYYDNe0aPfSXDvuqPMGbtLw4+ js8EH5Scm6TpRaZ0gdqEsYWAyOFike7qG252mPiXocp2JTWCBdOoCnlOSFA0+1UEB/5I K2RWM0S1MjPWReX8oS151nM3PhMdS6NVWjbGDead/LOCB7vznKcr9WxKipGNCqaDz+BG VdkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=JQ+EG5Tn; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p5-20020a056402074500b0050bc508a980si4270916edy.670.2023.05.22.06.26.34; Mon, 22 May 2023 06:26:36 -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=@foxmail.com header.s=s201512 header.b=JQ+EG5Tn; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9770B68C090; Mon, 22 May 2023 16:26:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18C6A68B004 for ; Mon, 22 May 2023 16:26:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1684761972; bh=pSEiQ1/8WTidVw7rtjw1jBcoFwE99biVyhkNesK2tz8=; h=From:To:Cc:Subject:Date; b=JQ+EG5TnsHYTQ9YTggW8uUjedW9R+p+heOUSLCUGapphgSDVR39/oRQ6iwOoAowjS QWmyfVq7S5KK6LMRDFO/Sct1QbaApEcg45QgCVJEJUD4KBYNL8PLDyuxMrqqasWLRc NodINP2k6rvOt7La1X+futbys0jXDr3tOVPvUGkM= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.71]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id 6831BC61; Mon, 22 May 2023 21:26:03 +0800 X-QQ-mid: xmsmtpt1684761963tqpn1ksnc Message-ID: X-QQ-XMAILINFO: NioaTWkRhWwaGhGWnHXl9SYOvUHdHvsvK1EwtIjE+xyl6dci0cvkZ0xLeUhym5 VQKhd/kfZNuaCu3594CaEDZcsFKW8nYjhmFu6yWpZjL5U12+P2QD1/z2lPxZ5u1Nt9HQwmE/6T8E RuEyxSWn+zsU2e1+FCvdEFI5MhaNqT79fDjgEWqde3n8eRZORxUNY441T8YlDDroaUYJpKB3G9JQ OshY0yn05olhuGQFHCuhST6FFU3ku7mD5GEFoZ4SW2Su9f2I7pRuA/V81sBopTOqc1hGxav9hxLZ ChQv1b6mGUQTUoAL8y9/BtIfyOYA3LHp2k1gu2KwcRq7kNcK0zoiXilLyWiYdIDsXGZNYUVlERUf /W9M3zmBBSdhOwgXv/MmlTVmSj+MmT8cOzwz2IpDs9YO4opvA5vKG6AC2YM4n9C4PbBSBcbTlhy1 Rvg1UN4PUavf+7MqnD1XCxBHTSt/m2ZNkzygUST6ofVSCfkxIN+LuG08QsYlglXBV7ndUOfCw0Am SioXDfNzzj1NwxEyTim+6oxxxPOOyPyWpM6FYvKzge3XtKgdkAAAX2ayugHCcgvbArX92rWNvuDH eRaj3KrHsKD3hYKAJdCI7Fc8ZppyL2hUZwD6XGgSwo8hJUfe7hQe1K40ppbzGX8nil3y6Z9Gx4dn pe1qzbCwYBvDWwIQwYJ6Q0MTi9exAo7UQPO3J78z8JazGIzVg9L7qXMPLv0/akpfMomyIOvXPcV5 NnPgMYzzqasOVL0Wdhi1bCRXuNGhNCITgTIbParvI9GYc1naaxdzPivGdhDly2RmzutHG+lTqcyN 1c8OQJTpfp3AZWENoVtsN/40dTpPtMEWOHFwDTn+CAJH3m+uHbmrFxpyIR/Jn5ALY6lHyD3ecUSy 4IHY9dC+OQj+XRgVsu6NNCGIwpZyRJl3d6lKtckMgSA0DovVwpooBcugtAlZ0SlkTMlpOfDBYEwZ zj3xU7eJrSqQw+5QpRAPXmtkTU17O4r7idVbSFNKFo4o5Jfumhxg== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 May 2023 21:26:02 +0800 X-OQ-MSGID: <20230522132602.17170-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avfilter/vf_subtitles: add wrap_unicode option 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sRFZTKLvFsau From: Zhao Zhili So CJK can be wrapped automatically. Signed-off-by: Zhao Zhili --- v3: Fix build error with older libass v2: Don't overwrite wrap automatically for native ASS libavfilter/version.h | 2 +- libavfilter/vf_subtitles.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libavfilter/version.h b/libavfilter/version.h index ba8a6fdab2..08779130f5 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -32,7 +32,7 @@ #include "version_major.h" #define LIBAVFILTER_VERSION_MINOR 8 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 82e140e986..3e5a19e715 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -45,6 +45,8 @@ #include "formats.h" #include "video.h" +#define FF_ASS_FEATURE_WRAP_UNICODE (LIBASS_VERSION >= 0x01600010) + typedef struct AssContext { const AVClass *class; ASS_Library *library; @@ -61,6 +63,7 @@ typedef struct AssContext { int original_w, original_h; int shaping; FFDrawContext draw; + int wrap_unicode; } AssContext; #define OFFSET(x) offsetof(AssContext, x) @@ -271,6 +274,9 @@ static const AVOption subtitles_options[] = { {"stream_index", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS}, {"si", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS}, {"force_style", "force subtitle style", OFFSET(force_style), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS}, +#if FF_ASS_FEATURE_WRAP_UNICODE + {"wrap_unicode", "break lines according to the Unicode Line Breaking Algorithm", OFFSET(wrap_unicode), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, FLAGS }, +#endif {NULL}, }; @@ -432,6 +438,18 @@ static av_cold int init_subtitles(AVFilterContext *ctx) if (ret < 0) goto end; +#if FF_ASS_FEATURE_WRAP_UNICODE + /* Don't overwrite wrap automatically for native ASS */ + if (ass->wrap_unicode == -1) + ass->wrap_unicode = st->codecpar->codec_id != AV_CODEC_ID_ASS; + if (ass->wrap_unicode) { + ret = ass_track_set_feature(ass->track, ASS_FEATURE_WRAP_UNICODE, 1); + if (ret < 0) + av_log(ctx, AV_LOG_WARNING, + "libass wasn't built with ASS_FEATURE_WRAP_UNICODE support\n"); + } +#endif + if (ass->force_style) { char **list = NULL; char *temp = NULL;