> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-boun...@ffmpeg.org> On Behalf Of Michael
> Niedermayer
> Sent: Tuesday, November 30, 2021 9:36 AM
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v18 15/19] avfilter/textmod: Add textmod,
> censor and show_speaker filters
>
> On Mon, Nov 29, 2021 at 07:48:38PM +0000, Soft Works wrote:
> > - textmod {S -> S)
> > Modify subtitle text in a number of ways
> >
> > - censor {S -> S)
> > Censor subtitles using a word list
> >
> > - show_speaker {S -> S)
> > Prepend speaker names from ASS subtitles to the visible text lines
> >
> > Signed-off-by: softworkz <softwo...@hotmail.com>
> > ---
> > doc/filters.texi | 206 ++++++++++++
> > libavfilter/Makefile | 5 +
> > libavfilter/allfilters.c | 3 +
> > libavfilter/sf_textmod.c | 697 +++++++++++++++++++++++++++++++++++++++
> > 4 files changed, 911 insertions(+)
> > create mode 100644 libavfilter/sf_textmod.c
>
> git am doesnt like this one:
>
> Applying: avfilter/textmod: Add textmod, censor and show_speaker filters
> .git/rebase-apply/patch:269: trailing whitespace.
> /*
> .git/rebase-apply/patch:270: trailing whitespace.
> * Copyright (c) 2021 softworkz
> .git/rebase-apply/patch:271: trailing whitespace.
> *
> .git/rebase-apply/patch:272: trailing whitespace.
> * This file is part of FFmpeg.
> .git/rebase-apply/patch:273: trailing whitespace.
> *
> warning: squelched 692 whitespace errors
> warning: 697 lines add whitespace errors.
> Using index info to reconstruct a base tree...
> .git/rebase-apply/patch:269: trailing whitespace.
> /*
> .git/rebase-apply/patch:270: trailing whitespace.
> * Copyright (c) 2021 softworkz
> .git/rebase-apply/patch:271: trailing whitespace.
> *
> .git/rebase-apply/patch:272: trailing whitespace.
> * This file is part of FFmpeg.
> .git/rebase-apply/patch:273: trailing whitespace.
> *
> error: patch failed: doc/filters.texi:25560
> error: doc/filters.texi: patch does not apply
> error: patch failed: libavfilter/Makefile:551
> error: libavfilter/Makefile: patch does not apply
> error: patch failed: libavfilter/allfilters.c:541
> error: libavfilter/allfilters.c: patch does not apply
> error: Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Patch failed at 0001 avfilter/textmod: Add textmod, censor and show_speaker
> filters
> Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
I could apply successfully here onto commit 3809467d
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0001-avcodec-avutil-Move-enum-AVSubtitleType.eml"
Applying: avcodec,avutil: Move enum AVSubtitleType
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0002-avutil-frame-Prepare-AVFrame-for-subtitle-handling.eml"
.git/rebase-apply/patch:283: trailing whitespace.
dst->x = src->x;
.git/rebase-apply/patch:284: trailing whitespace.
dst->y = src->y;
.git/rebase-apply/patch:285: trailing whitespace.
dst->w = src->w;
.git/rebase-apply/patch:286: trailing whitespace.
dst->h = src->h;
.git/rebase-apply/patch:288: trailing whitespace.
dst->type = src->type;
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Applying: avutil/frame: Prepare AVFrame for subtitle handling
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0003-avcodec-subtitles-Introduce-new-frame-based-subtit.eml"
.git/rebase-apply/patch:30: trailing whitespace.
attribute_deprecated
.git/rebase-apply/patch:41: trailing whitespace.
attribute_deprecated
warning: 2 lines add whitespace errors.
Applying: avcodec/subtitles: Introduce new frame-based subtitle decoding API
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0004-avfilter-subtitles-Update-vf_subtitles-to-use-new-.eml"
Applying: avfilter/subtitles: Update vf_subtitles to use new decoding api
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0005-avcodec-avutil-Move-ass-helper-functions-to-avutil.eml"
.git/rebase-apply/patch:299: trailing whitespace.
primary_color, secondary_color, outline_color,
warning: 1 line adds whitespace errors.
Applying: avcodec,avutil: Move ass helper functions to avutil as avpriv_ and
extend ass dialog parsing
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0006-avcodec-subtitles-Migrate-subtitle-encoders-to-fra.eml"
.git/rebase-apply/patch:661: trailing whitespace.
* \brief
.git/rebase-apply/patch:662: trailing whitespace.
* \param avctx
.git/rebase-apply/patch:664: trailing whitespace.
* \param buf_size
.git/rebase-apply/patch:665: trailing whitespace.
* \param sub
.git/rebase-apply/patch:666: trailing whitespace.
* \return
warning: 5 lines add whitespace errors.
Applying: avcodec/subtitles: Migrate subtitle encoders to frame-based API and
provide a compatibility shim for the legacy api
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0007-fftools-play-probe-Adjust-for-subtitle-changes.eml"
Applying: fftools/play,probe: Adjust for subtitle changes
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0008-avfilter-subtitles-Add-subtitles.c-for-subtitle-fr.eml"
Applying: avfilter/subtitles: Add subtitles.c for subtitle frame allocation
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0009-avfilter-avfilter-Handle-subtitle-frames.eml"
.git/rebase-apply/patch:95: trailing whitespace.
warning: 1 line adds whitespace errors.
Applying: avfilter/avfilter: Handle subtitle frames
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0010-avfilter-sbuffer-Add-sbuffersrc-and-sbuffersink-fi.eml"
Applying: avfilter/sbuffer: Add sbuffersrc and sbuffersink filters
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0011-avfilter-overlaygraphicsubs-Add-overlaygraphicsubs.eml"
.git/rebase-apply/patch:522: trailing whitespace.
jmax = FFMIN(-xp + dst_wp, src_wp);
warning: 1 line adds whitespace errors.
Applying: avfilter/overlaygraphicsubs: Add overlaygraphicsubs and
graphicsub2video filters
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0012-fftools-ffmpeg-Replace-sub2video-with-subtitle-fra.eml"
.git/rebase-apply/patch:403: trailing whitespace.
if (filtered_frame->format == AV_SUBTITLE_FMT_ASS &&
!enc->subtitle_header
.git/rebase-apply/patch:417: trailing whitespace.
.git/rebase-apply/patch:688: trailing whitespace.
if (!ist_src || !check_output_constraints(ist, ost)
.git/rebase-apply/patch:879: trailing whitespace.
// in the followng case we auto-insert the graphicsub2video
conversion filter
warning: 4 lines add whitespace errors.
Applying: fftools/ffmpeg: Replace sub2video with subtitle frame filtering and
use new frame-based subtitle encoding API
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0013-avfilter-avfilter-Fix-hardcoded-input-index.eml"
Applying: avfilter/avfilter: Fix hardcoded input index
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0014-avfilter-overlaytextsubs-Add-overlaytextsubs-and-t.eml"
Applying: avfilter/overlaytextsubs: Add overlaytextsubs and textsubs2video
filters
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0015-avfilter-textmod-Add-textmod-censor-and-show_speak.eml"
Applying: avfilter/textmod: Add textmod, censor and show_speaker filters
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0016-avfilter-stripstyles-Add-stripstyles-filter.eml"
.git/rebase-apply/patch:282: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Applying: avfilter/stripstyles: Add stripstyles filter
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0017-avfilter-splitcc-Add-splitcc-filter-for-closed-cap.eml"
Applying: avfilter/splitcc: Add splitcc filter for closed caption handling
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0018-avfilter-graphicsub2text-Add-new-graphicsub2text-f.eml"
.git/rebase-apply/patch:356: trailing whitespace.
av_log(ctx, AV_LOG_DEBUG, "filter_frame sub_pts: %"PRIu64", start_time: %d,
end_time: %d, num_areas: %d\n",
.git/rebase-apply/patch:365: trailing whitespace.
warning: 2 lines add whitespace errors.
Applying: avfilter/graphicsub2text: Add new graphicsub2text filter (OCR)
admin@MACHINE MINGW64 /source/ffmpeg (master-upstream)
$ git am
"X:\source\patches\v18-0019-avfilter-subscale-Add-filter-for-scaling-and-or-re.eml"
.git/rebase-apply/patch:335: trailing whitespace.
char *margin_h_expr;
.git/rebase-apply/patch:336: trailing whitespace.
char *margin_v_expr;
.git/rebase-apply/patch:818: trailing whitespace.
av_log(ctx, AV_LOG_DEBUG, "process_area - start: x/y: (%d:%d) size: %dx%d
scale_mode: %d x-factor: %d:%d y-factor: %d:%d\n",
.git/rebase-apply/patch:995: trailing whitespace.
if (s->use_caching && s->cache_frame && s->cache_frame->subtitle_pts
.git/rebase-apply/patch:1109: new blank line at EOF.
+
warning: 5 lines add whitespace errors.
Applying: avfilter/subscale: Add filter for scaling and/or re-arranging
graphical subtitles
I have a attached a zipped version of the patch. I'm not sure whether that
helps. The filte doesn't contain any long lines.
Or is it the missing newline char at the end of the file again?
Thanks,
sw
<<attachment: v18-0015.zip>>
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
