From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 23E1E465E9 for ; Mon, 22 May 2023 17:11:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E5C268C02E; Mon, 22 May 2023 20:11:34 +0300 (EEST) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FF7D68BF62 for ; Mon, 22 May 2023 20:11:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; t=1684775487; cv=none; d=strato.com; s=strato-dkim-0002; b=WywEtQ86AbMe52z0gkBVAwAB5xKolPsARQin4/CMWKU28lDNaGHWPzq/7eov8hRHUb XxFnsPDpha9ZUxXeTyBWGV1hMoB6PP47zBXqVDq31kzfAjqYbvFBeKRlEfFDvljoRfP1 oGiNc39O9GGtizuKye6ML6LSLQaworE+uLVTG7pKc0GfXJ35YpdYY625jwhg1BLYcZAo BJdsRuukFU6OdtCGsF6grAFyfJWr/5xebRGKSaG7P2lu2cFp7h7xHFEPRPdR2TGZIiF1 0IDu4cvKirgnOad9+iwnKPeH1vE1URaF0Kg/j3N88MwyN/Pk4sKzPrar2++8TaU1QzoC MtEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1684775487; s=strato-dkim-0002; d=strato.com; h=In-Reply-To:References:Message-ID:Subject:To:From:Date:Cc:Date:From: Subject:Sender; bh=f6fGWPIaW2nGp5mUqkA2g2JvcBS8xQ3t7v3qi2WYKfE=; b=M+S81PYc6H4iz0uEsXPdYHHjUG7fyt6l5JMbOULAUYc9BqV82dQ4Xirt/HLItxR2k9 rxnesHMbZ59NHrb6ZpsR54hHpKbDJAIOJwKYJhznoylMYGUgmSfTi21dYnThZZ1gaAI0 EV8qds6FKsqkmwWdmzctATXRtoTOldnIOnbKQVOd961YPx4JvkEtc7RiUYXEbAbV13Ue SZFymRJ4z5PYJONXcyN8JzRAyZAfInsZXoMvEluEe/yYPm7D3kUagbQmcmvE3jvNSCSD RslERLKmq44fbZEjXfzItdIk1ggDxlmlwVlzUo68ufbSo4GEE+XnQLbnC9Nw/As1wdAs Gjnw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1684775487; s=strato-dkim-0002; d=oneric.de; h=In-Reply-To:References:Message-ID:Subject:To:From:Date:Cc:Date:From: Subject:Sender; bh=f6fGWPIaW2nGp5mUqkA2g2JvcBS8xQ3t7v3qi2WYKfE=; b=RUoUWiQ+ub5xHBXQLpgd41mDtOH6JfYhWYum1kTHeML92OWD59jUwjNHxrxT40lZE0 r0WKuEfLI7LzPputD6GXJ1S/kNTViDiR13vkh73EXJUR8v/Ct+xzUjsiChqZPXxxk8pa f0BT8zUlzaS4Dwwg274QR2m6ZUoM/qtGdw040N1F/f1NramP/99aEgCl4xWirKf5WNze stfwKCnkbWVEDNMV5gPs+uhlZArtTb+Qop32tk6w0L6JlZypA4O0gXBAGDNHACW33ztl xYb3k+//lMevlpgra6ciYWqQdGvd6Fy1O4f4fwJBOhFXR1Z5HVo+0+Gb1Drf2speT5+m mcDw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1684775487; s=strato-dkim-0003; d=oneric.de; h=In-Reply-To:References:Message-ID:Subject:To:From:Date:Cc:Date:From: Subject:Sender; bh=f6fGWPIaW2nGp5mUqkA2g2JvcBS8xQ3t7v3qi2WYKfE=; b=MANeM908MlRXeMCjTbHRdrDtZF+tWztWGl1nGalMpKNgQFsAvQCLRPdFC9JPaeBd+F BjMSl/9kGO55IZXXUyDw== X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLz5+3wgQ8k5PIikk7qUsPU2CaUYK+S/j6VLtTAe9MrjjQrdCJBO4ZXU26ipUoM1v/JkFw==" Received: from oneric.de by smtp.strato.de (RZmta 49.4.0 AUTH) with ESMTPSA id R2b608z4MHBQfC4 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Mon, 22 May 2023 19:11:26 +0200 (CEST) Date: Mon, 22 May 2023 19:11:26 +0200 From: Oneric To: FFmpeg development discussions and patches Message-ID: References: MIME-Version: 1.0 In-Reply-To: Subject: Re: [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 Content-Type: multipart/mixed; boundary="===============4988030264306051455==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============4988030264306051455== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="J9aUMzgCIs3QFMW1" Content-Disposition: inline Content-Transfer-Encoding: 7bit --J9aUMzgCIs3QFMW1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, May 22, 2023 at 21:26:02 +0800, Zhao Zhili wrote: > From: Zhao Zhili >=20 > So CJK can be wrapped automatically. >=20 > 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(-) >=20 > 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" > =20 > #define LIBAVFILTER_VERSION_MINOR 8 > -#define LIBAVFILTER_VERSION_MICRO 100 > +#define LIBAVFILTER_VERSION_MICRO 101 > =20 > =20 > #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" > =20 > +#define FF_ASS_FEATURE_WRAP_UNICODE (LIBASS_VERSION >=3D 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; > =20 > #define OFFSET(x) offsetof(AssContext, x) > @@ -271,6 +274,9 @@ static const AVOption subtitles_options[] =3D { > {"stream_index", "set stream index", OFFSET(stream_index= ), AV_OPT_TYPE_INT, { .i64 =3D -1 }, -1, INT_MAX, FLAGS}, > {"si", "set stream index", OFFSET(stream_index= ), AV_OPT_TYPE_INT, { .i64 =3D -1 }, -1, INT_MAX, FLAGS}, > {"force_style", "force subtitle style", OFFSET(force_style)= , AV_OPT_TYPE_STRING, {.str =3D 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 =3D -1 }, -1, 1= , FLAGS }, > +#endif > {NULL}, > }; > =20 > @@ -432,6 +438,18 @@ static av_cold int init_subtitles(AVFilterContext *c= tx) > if (ret < 0) > goto end; > =20 > +#if FF_ASS_FEATURE_WRAP_UNICODE > + /* Don't overwrite wrap automatically for native ASS */ > + if (ass->wrap_unicode =3D=3D -1) > + ass->wrap_unicode =3D st->codecpar->codec_id !=3D AV_CODEC_ID_AS= S; > + if (ass->wrap_unicode) { > + ret =3D ass_track_set_feature(ass->track, ASS_FEATURE_WRAP_UNICO= DE, 1); > + if (ret < 0) > + av_log(ctx, AV_LOG_WARNING, > + "libass wasn't built with ASS_FEATURE_WRAP_UNICODE su= pport\n"); > + } > +#endif > + > if (ass->force_style) { > char **list =3D NULL; > char *temp =3D NULL; > --=20 > 2.34.1 The new option and its build-time requirement should probably also be documented in doc/filters.texi. Other than that v3 looks good to me. --J9aUMzgCIs3QFMW1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE3a/BnkayrS1rJvhDl6CODP/XCVEFAmRrojUACgkQl6CODP/X CVGcARAAt7K2mLZ130xNjuz/PMnBbg2XzYmVHeiFn+KQHSzM6zoxv8RgOYVocY/c 5PCx1Z7tl/7f6UIfQW1ul12GE3t4F91CGzA1wMVUkgTYrHng0cS3VnlaGbj88/cy p0OVi1dvRULk2M35COOp9D46721ZdslMAL8urlhVOFAvGQVSPzAOdAM+b4MvX6TS QT/2HC3uLcviSquKHV2lj9Ir1N4a11OgPi5umfuwH5ht+FnZz1nbA0sGMu6O9SqW TbBN67rjKuGn5F6GFNB2yOcrzr6SelzvNqxlOw3z83C386nuy0hRrvM1MPIyLEsG +lZJvqcszHJtlX0vwebOzG/GhKQ0nCpZIiglAwqPVI/gp05HasIxv/eFvyb0ipzm hzdWIXpklDgnGQKh0sDAKvSPGIfYyDjY3xGU9LL65aB+E3ecaKIpavCWaAe6Nno+ v/iANf+FDf3cFYct7MXI+Az0xESK+cYDMGG72LIXl/pMpBRR+89Wg/ny0azBlQEC eAU/EqXSAewwLsx+r95kv6D4TU2vbX/NVyEVMO9cNvQ4+Wh1gR39Iek4zDL94DYD Ofcpns4yKNWcxKfBeM9Ti6pXM7ABDuhil9P+/iXORawF/QhAwkwtt1PtPwyZyQ2F QUmVCDeVD1BC57NJT7ey+PYr2CD5DowUzqNL87M7lAxnlrYSzYk= =SDO2 -----END PGP SIGNATURE----- --J9aUMzgCIs3QFMW1-- --===============4988030264306051455== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============4988030264306051455==--