From: "Zhao Zhili" <quinkblack@foxmail.com> To: "'FFmpeg development discussions and patches'" <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH] avfilter/vf_subtitles: add wrap_unicode option Date: Sat, 20 May 2023 01:48:44 +0800 Message-ID: <tencent_35B4532D1C480B906615109266E767DDEA06@qq.com> (raw) In-Reply-To: <CAM=jba9seRsSvaw2GbH7ejYQ1J9Gq3xAX4cnMBQR59zQhCnkJA@mail.gmail.com> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Lance Wang > Sent: 2023年5月19日 22:15 > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH] avfilter/vf_subtitles: add wrap_unicode option > > On Fri, May 19, 2023 at 3:59 PM Zhao Zhili <quinkblack@foxmail.com> wrote: > > > From: Zhao Zhili <zhilizhao@tencent.com> > > > > So CJK can be wrapped automatically. > > > > Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> > > --- > > 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 > > + } > > + > > > > I prefer to enable the feature default(if libass library support) instead > of adding a new option to turn off it(default is on). > Also, if the version is right, then why to check the return? User may wants to scale fonts than wrap, for example. I'm not familiar with the use case, since libass gives it as an option, I guess there is a reason for that. To support ASS_FEATURE_WRAP_UNICODE, libass depends on libunibreak. So it can fail if libass doesn't build with libunibreak enabled. The log messages revealed two different failures. > +#if (LIBASS_VERSION >= 0x01600010) > + ass_track_set_feature(ass->track, ASS_FEATURE_WRAP_UNICODE, 1); > +#endif > + > > > > /* Open subtitles file */ > > ret = avformat_open_input(&fmt, ass->filename, NULL, NULL); > > if (ret < 0) { > > -- > > 2.25.1 > > > > _______________________________________________ > > 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". > > > _______________________________________________ > 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". _______________________________________________ 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".
next prev parent reply other threads:[~2023-05-19 17:49 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-19 15:58 Zhao Zhili 2023-05-19 14:14 ` Lance Wang 2023-05-19 17:48 ` Zhao Zhili [this message] 2023-05-19 16:09 ` Oneric
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tencent_35B4532D1C480B906615109266E767DDEA06@qq.com \ --to=quinkblack@foxmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git