From patchwork Fri May 19 15:58:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41720 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1106378pzb; Fri, 19 May 2023 00:59:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4p0YxdgmMZQf6SjCtskER1kYrSpW9hgEKdJVqHVwzxjIN5790k4lHTzixboEs8Gsy8ieon X-Received: by 2002:a17:907:72cf:b0:966:2984:3da0 with SMTP id du15-20020a17090772cf00b0096629843da0mr860866ejc.63.1684483153541; Fri, 19 May 2023 00:59:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684483153; cv=none; d=google.com; s=arc-20160816; b=NCpErUCBgcdqRMEsfgZeLAb0hdabRFekw9KaDiN7cAF5fxGAvXXSwdTvPRn5FWsWwN OFyYbrRsXQKpSpJbpvn6dEVLXHGS0OA3UIe3pO1Gjr4namZz+7oBVyqPcq5CfXWgqzqZ KC7LREAMg2woEq96IM0uSz9fNcN7g1DNKgEvBPJeCQAdd0cKOoIlUqpayAQKxeTnowtS Cu7jqUP65EiE/xZI0Fx09fC+9fjvNW7WFIBLS3riwn33h4THBce1irrMaXFFVMdee4qE ewHtnRiECj3Y1buIFlHjQjvTVhmMjrrTCe3kobf5KjORSxOlkSFyz8E/1G6YRsoaPq68 M9tg== 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=w6k48O6PZclndszaVmVVfDsyZgNmuWy3f+POGw+LKh4=; b=QIHqs05rrmlhxIOQeKIpR9Pk9PmIaa6kUpv+t+EhW0YmPeQn6CjfnZACZeJZnkVKZq bRehFHPr22Gvk3KkcSUJHC3AtSkZ466WUeNdbhQrxzdXR/tEUWk1BzZP3zwAPyGCiNpB 4HRkSkcMi8rosSHtUzs8QAqjx0PJyCQIu4xquhwPVpJ4tadtlEAvo0p3b+Zy5nD172Ty nV78lxlKMqrdPL0oDm86PJurunXd2a79xFr0pciiCUO0HWGKyqm/hriXFnw4CmHnN31n 86TBW1wLqy+/JKmW+2OJ1dG+eqShn5Y+SrX5CmtJ7XPi/98Ve938G+MrSLkTGFNbUzRt dHoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=IUuxsbdr; 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 b16-20020aa7c6d0000000b0050bc68690c8si2287475eds.493.2023.05.19.00.59.13; Fri, 19 May 2023 00:59:13 -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=IUuxsbdr; 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 8957368C13A; Fri, 19 May 2023 10:59:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-149.mail.qq.com (out203-205-221-149.mail.qq.com [203.205.221.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1028E68BBA2 for ; Fri, 19 May 2023 10:59:02 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1684483134; bh=uhWeHZ6OCN4GYsM75f4TrUZ9JwMrVG6zk5x8aDX+2Xg=; h=From:To:Cc:Subject:Date; b=IUuxsbdr1T3sPrvnx0POntg8L1SsOMMAnDM8+nOGPmc6U7HNzqUR0m8HXgCMcf9F8 uAdrkRd0Nx+KIU52uSd4iAQT1ojLrgc+JB8HV6fGhuc35ImMojaIykv7mRlEd4o0Qw JhNK4oed8GzoqCW72BO1Nw+kmVRZTalVwPLw+I34= Received: from localhost.localdomain ([119.147.10.201]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id EB524E61; Fri, 19 May 2023 15:58:53 +0800 X-QQ-mid: xmsmtpt1684483133tbwibpsn5 Message-ID: X-QQ-XMAILINFO: MtZ6QPwsmM9XpBHTwnBqg0SrYkkXTTSB0r7RxahNtJiUAFNS8GDIRRxUFS0zp+ WckkowVj9jIUQT+54z8I8nJQBYtUaeni14c7r0unUaOzE/Yc2kULeVkz+KfAgN1rzS9zcRdRgwju 2aguvOEWniq6rcKhbJguYGgzyinB7X+MD03oap0iqSWcozHoaP6DhllxI0bDaoywoEzqF5wo52y+ XDGHbUO0jpazvR9K7dWKKmmELpuCBoQquoT1LRYn+oMA32A5Lg68AxD7q+Sqfgz6ZSPKMMAj7n3t ETTMwv4m6kPlk+brk780Yx5VVHgOkCtESDG6t+OqzDkBt3pgUFDON6axfr4GIKbx4iVp2M3161uu Sonf3hebGjwu9mMDq93s1n4phEVPEHGtfCB2q+x3sL7GTrSmeHqkBRYMNDzSJ2f6zDMkLDF+fRsf Zyr1M5tvpGRBJTIvjDbZt64ANsYl6ECLRGl9EM3wJuZ4ETZziuahFWBxk3evezsMkpUumNXTZjiz hysnTJZXuY8xZV18diTdjdO8HUUwGS+B1/R4ctzn1u3UptroLP9cDKuH9jacRoyeigLSoGw3TBau RTPLanVe5h4V9O4Ybb8T5+y5+8yeCig9bhiEk38UkmHNzeYqB2IvRbVk8tYyI+dDsL9LhEJD4GFh c3MBpiB9RoMA0BdtQnyrhBxGf1UuhOAf8xMcLzo28Svvv9PlJ6irXelQ1sTV9gyGvZAaMPvhR/mh TQoIw5EUUBiwigVL3YGXWA+Rdt75gmuOLX1lIMqiVbLD/tJaVm22t7ShenM+OiTzdjOEHA5/LLIl pJcZiSwbwrwGCN3Ik63MB2JChMS6+P9EQnkiu5SnVAkny9PDLMmDxii+qktVGJfze+8gXZqhgyem cWeGTO5YuVM3ij/X2fcEhXtab856cr0or8ewmJlIIQx7VoNFvwmg2e4NW1RDAomQ/tJZtbAmpJtY EqRcPTFNxMPznpXh/nZAkV62JCh4MGxvPWHf6+Q8A= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 May 2023 23:58:59 +0800 X-OQ-MSGID: <20230519155859.2968296-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: 3CCRPLFY+MbS From: Zhao Zhili So CJK can be wrapped automatically. Signed-off-by: Zhao Zhili --- libavfilter/version.h | 2 +- libavfilter/vf_subtitles.c | 13 +++++++++++++ 2 files changed, 14 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..d6a68e5cdd 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -61,6 +61,7 @@ typedef struct AssContext { int original_w, original_h; int shaping; FFDrawContext draw; + int wrap_unicode; } AssContext; #define OFFSET(x) offsetof(AssContext, x) @@ -72,6 +73,7 @@ typedef struct AssContext { {"original_size", "set the size of the original video (used to scale fonts)", OFFSET(original_w), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, FLAGS }, \ {"fontsdir", "set the directory containing the fonts to read", OFFSET(fontsdir), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, \ {"alpha", "enable processing of alpha channel", OFFSET(alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FLAGS }, \ + {"wrap_unicode", "break lines according to the Unicode Line Breaking Algorithm", OFFSET(wrap_unicode), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, FLAGS }, \ /* libass supports a log level ranging from 0 to 7 */ static const int ass_libavfilter_log_level_map[] = { @@ -329,6 +331,17 @@ static av_cold int init_subtitles(AVFilterContext *ctx) return AVERROR(EINVAL); } + if (ass->wrap_unicode) { +#if (LIBASS_VERSION >= 0x01600010) + ret = ass_track_set_feature(ass->track, ASS_FEATURE_WRAP_UNICODE, 1); + if (ret < 0) + av_log(ctx, AV_LOG_WARNING, "libass doesn't build with ASS_FEATURE_WRAP_UNICODE support\n"); +#else + av_log(ctx, AV_LOG_INFO, "libass version %#x doesn't support ASS_FEATURE_WRAP_UNICODE\n", + LIBASS_VERSION); +#endif + } + /* Open subtitles file */ ret = avformat_open_input(&fmt, ass->filename, NULL, NULL); if (ret < 0) {