Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
Soft Works:
> - stripstyles {S -> S)
> Remove all inline styles from subtitle events
>
> Signed-off-by: softworkz
> ---
> libavfilter/Makefile | 1 +
> libavfilter/allfilters.c | 1 +
> libavfilter/sf_stripstyles.c | 211 +++
> 3 files changed, 213 insertions(+)
> create mode 100644 libavfilter/sf_stripstyles.c
>
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index e6fef97c08..309c404bf7 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -540,6 +540,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
> vsink_nullsink.o
> OBJS-$(CONFIG_CENSOR_FILTER) += sf_textmod.o
> OBJS-$(CONFIG_SHOW_SPEAKER_FILTER) += sf_textmod.o
> OBJS-$(CONFIG_TEXTMOD_FILTER)+= sf_textmod.o
> +OBJS-$(CONFIG_STRIPSTYLES_FILTER)+= sf_stripstyles.o
>
> # multimedia filters
> OBJS-$(CONFIG_ABITSCOPE_FILTER) += avf_abitscope.o
> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> index fc72858d18..e2e4deea22 100644
> --- a/libavfilter/allfilters.c
> +++ b/libavfilter/allfilters.c
> @@ -528,6 +528,7 @@ extern const AVFilter ff_avf_showwavespic;
> extern const AVFilter ff_vaf_spectrumsynth;
> extern const AVFilter ff_sf_censor;
> extern const AVFilter ff_sf_show_speaker;
> +extern const AVFilter ff_sf_stripstyles;
> extern const AVFilter ff_sf_textmod;
> extern const AVFilter ff_svf_graphicsub2video;
> extern const AVFilter ff_svf_textsub2video;
> diff --git a/libavfilter/sf_stripstyles.c b/libavfilter/sf_stripstyles.c
> new file mode 100644
> index 00..15c00e73b1
> --- /dev/null
> +++ b/libavfilter/sf_stripstyles.c
> @@ -0,0 +1,211 @@
> +/*
> + * Copyright (c) 2021 softworkz
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> + */
> +
> +/**
> + * @file
> + * text subtitle filter which removes inline-styles from subtitles
> + */
> +
> +#include
This header and the API in it is not public.
> +
> +#include "libavutil/avassert.h"
> +#include "libavutil/opt.h"
> +#include "avfilter.h"
> +#include "internal.h"
> +#include "libavcodec/avcodec.h"
> +#include "libavcodec/ass_split.h"
> +
> +typedef struct StripStylesContext {
> +const AVClass *class;
> +enum AVSubtitleType format;
> +int remove_animated;
> +} StripStylesContext;
> +
> +typedef struct DialogContext {
> +const AVClass *class;
An AVClass is for options and logging (and would actually need an
AVClass, which you didn't define); you are not using it for that, so
just remove this.
> +const StripStylesContext* ss_ctx;
> +AVBPrint buffer;
> +int drawing_scale;
> +int is_animated;
> +} DialogContext;
> +
> +static void dialog_text_cb(void *priv, const char *text, int len)
> +{
> +DialogContext *s = priv;
> +if (!s->drawing_scale && (!s->is_animated ||
> !s->ss_ctx->remove_animated))
> +av_bprint_append_data(&s->buffer, text, len);
> +}
> +
> +static void dialog_new_line_cb(void *priv, int forced)
> +{
> +DialogContext *s = priv;
> +if (!s->drawing_scale && !s->is_animated)
> +av_bprint_append_data(&s->buffer, forced ? "\\N" : "\\n", 2);
> +}
> +
> +static void dialog_drawing_mode_cb(void *priv, int scale)
> +{
> +DialogContext *s = priv;
> +s->drawing_scale = scale;
> +}
> +
> +static void dialog_animate_cb(void *priv, int t1, int t2, int accel, char
> *style)
> +{
> +DialogContext *s = priv;
> +s->is_animated = 1;
> +}
> +
> +static void dialog_move_cb(void *priv, int x1, int y1, int x2, int y2, int
> t1, int t2)
> +{
> +DialogContext *s = priv;
> +if (t1 >= 0 || t2 >= 0)
> +s->is_animated = 1;
> +}
> +
> +static const ASSCodesCallbacks dialog_callbacks = {
> +.text = dialog_text_cb,
> +.new_line = dialog_new_line_cb,
> +.drawing_mode = dialog_drawing_mode_cb,
> +.animate = dialog_animate_cb,
> +.move = dialog_move_cb,
> +};
> +
> +static int query_formats(AVFilterContext *ctx)
> +{
> +AVFilterFormats *formats;
> +AVFilterLink *inlink = ctx->inputs[0];
> +AVFilterLink *outlink = ctx->outputs[0];
> +static const enum AVSubtitleType subtitle_fmts[] = {
> AV_SUBTITLE_FMT_ASS,
Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
> -Original Message-
> From: ffmpeg-devel On Behalf Of Andreas
> Rheinhardt
> Sent: Wednesday, 22 September 2021 03:06
> To: ffmpeg-devel@ffmpeg.org
> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> stripstyles filter
>
> Soft Works:
> > - stripstyles {S -> S)
> > Remove all inline styles from subtitle events
> >
> > Signed-off-by: softworkz
> > ---
> > libavfilter/Makefile | 1 +
> > libavfilter/allfilters.c | 1 +
> > libavfilter/sf_stripstyles.c | 211 +++
> > 3 files changed, 213 insertions(+)
> > create mode 100644 libavfilter/sf_stripstyles.c
> >
> > diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> > index e6fef97c08..309c404bf7 100644
> > --- a/libavfilter/Makefile
> > +++ b/libavfilter/Makefile
> > @@ -540,6 +540,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
> vsink_nullsink.o
> > OBJS-$(CONFIG_CENSOR_FILTER) += sf_textmod.o
> > OBJS-$(CONFIG_SHOW_SPEAKER_FILTER) += sf_textmod.o
> > OBJS-$(CONFIG_TEXTMOD_FILTER)+= sf_textmod.o
> > +OBJS-$(CONFIG_STRIPSTYLES_FILTER)+= sf_stripstyles.o
> >
> > # multimedia filters
> > OBJS-$(CONFIG_ABITSCOPE_FILTER) += avf_abitscope.o
> > diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> > index fc72858d18..e2e4deea22 100644
> > --- a/libavfilter/allfilters.c
> > +++ b/libavfilter/allfilters.c
> > @@ -528,6 +528,7 @@ extern const AVFilter ff_avf_showwavespic;
> > extern const AVFilter ff_vaf_spectrumsynth;
> > extern const AVFilter ff_sf_censor;
> > extern const AVFilter ff_sf_show_speaker;
> > +extern const AVFilter ff_sf_stripstyles;
> > extern const AVFilter ff_sf_textmod;
> > extern const AVFilter ff_svf_graphicsub2video;
> > extern const AVFilter ff_svf_textsub2video;
> > diff --git a/libavfilter/sf_stripstyles.c b/libavfilter/sf_stripstyles.c
> > new file mode 100644
> > index 00..15c00e73b1
> > --- /dev/null
> > +++ b/libavfilter/sf_stripstyles.c
> > @@ -0,0 +1,211 @@
> > +/*
> > + * Copyright (c) 2021 softworkz
> > + *
> > + * This file is part of FFmpeg.
> > + *
> > + * FFmpeg is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Lesser General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later version.
> > + *
> > + * FFmpeg is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> > + * Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> > + * License along with FFmpeg; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-
> 1301 USA
> > + */
> > +
> > +/**
> > + * @file
> > + * text subtitle filter which removes inline-styles from subtitles
> > + */
> > +
> > +#include
>
> This header and the API in it is not public.
I'm not sure IIRC, but aren't there other cases where the ffmpeg libs
are accessing non-public symbols from each other?
> > +
> > +#include "libavutil/avassert.h"
> > +#include "libavutil/opt.h"
> > +#include "avfilter.h"
> > +#include "internal.h"
> > +#include "libavcodec/avcodec.h"
> > +#include "libavcodec/ass_split.h"
> > +
> > +typedef struct StripStylesContext {
> > +const AVClass *class;
> > +enum AVSubtitleType format;
> > +int remove_animated;
> > +} StripStylesContext;
> > +
> > +typedef struct DialogContext {
> > +const AVClass *class;
>
> An AVClass is for options and logging (and would actually need an
> AVClass, which you didn't define); you are not using it for that, so
> just remove this.
No I can't, because this is being passed to the
ff_ass_split_override_codes which expects an AVClass at the first
position of the struct.
> > +const StripStylesContext* ss_ctx;
> > +AVBPrint buffer;
> > +int drawing_scale;
> > +int is_animated;
> > +} DialogContext;
> > +
> > +static void dialog_text_cb(void *priv, const char *text, int len)
> > +{
> > +DialogContext *s = priv;
> > +if (!s-
Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
Soft Works:
>
>
>> -Original Message-
>> From: ffmpeg-devel On Behalf Of Andreas
>> Rheinhardt
>> Sent: Wednesday, 22 September 2021 03:06
>> To: ffmpeg-devel@ffmpeg.org
>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
>> stripstyles filter
>>
>> Soft Works:
>>> - stripstyles {S -> S)
>>> Remove all inline styles from subtitle events
>>>
>>> Signed-off-by: softworkz
>>> ---
>>> libavfilter/Makefile | 1 +
>>> libavfilter/allfilters.c | 1 +
>>> libavfilter/sf_stripstyles.c | 211 +++
>>> 3 files changed, 213 insertions(+)
>>> create mode 100644 libavfilter/sf_stripstyles.c
>>>
>>> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
>>> index e6fef97c08..309c404bf7 100644
>>> --- a/libavfilter/Makefile
>>> +++ b/libavfilter/Makefile
>>> @@ -540,6 +540,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
>> vsink_nullsink.o
>>> OBJS-$(CONFIG_CENSOR_FILTER) += sf_textmod.o
>>> OBJS-$(CONFIG_SHOW_SPEAKER_FILTER) += sf_textmod.o
>>> OBJS-$(CONFIG_TEXTMOD_FILTER)+= sf_textmod.o
>>> +OBJS-$(CONFIG_STRIPSTYLES_FILTER)+= sf_stripstyles.o
>>>
>>> # multimedia filters
>>> OBJS-$(CONFIG_ABITSCOPE_FILTER) += avf_abitscope.o
>>> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
>>> index fc72858d18..e2e4deea22 100644
>>> --- a/libavfilter/allfilters.c
>>> +++ b/libavfilter/allfilters.c
>>> @@ -528,6 +528,7 @@ extern const AVFilter ff_avf_showwavespic;
>>> extern const AVFilter ff_vaf_spectrumsynth;
>>> extern const AVFilter ff_sf_censor;
>>> extern const AVFilter ff_sf_show_speaker;
>>> +extern const AVFilter ff_sf_stripstyles;
>>> extern const AVFilter ff_sf_textmod;
>>> extern const AVFilter ff_svf_graphicsub2video;
>>> extern const AVFilter ff_svf_textsub2video;
>>> diff --git a/libavfilter/sf_stripstyles.c b/libavfilter/sf_stripstyles.c
>>> new file mode 100644
>>> index 00..15c00e73b1
>>> --- /dev/null
>>> +++ b/libavfilter/sf_stripstyles.c
>>> @@ -0,0 +1,211 @@
>>> +/*
>>> + * Copyright (c) 2021 softworkz
>>> + *
>>> + * This file is part of FFmpeg.
>>> + *
>>> + * FFmpeg is free software; you can redistribute it and/or
>>> + * modify it under the terms of the GNU Lesser General Public
>>> + * License as published by the Free Software Foundation; either
>>> + * version 2.1 of the License, or (at your option) any later version.
>>> + *
>>> + * FFmpeg is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>>> + * Lesser General Public License for more details.
>>> + *
>>> + * You should have received a copy of the GNU Lesser General Public
>>> + * License along with FFmpeg; if not, write to the Free Software
>>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-
>> 1301 USA
>>> + */
>>> +
>>> +/**
>>> + * @file
>>> + * text subtitle filter which removes inline-styles from subtitles
>>> + */
>>> +
>>> +#include
>>
>> This header and the API in it is not public.
>
> I'm not sure IIRC, but aren't there other cases where the ffmpeg libs
> are accessing non-public symbols from each other?
>
Yes, there are via avpriv functions. Yet this is strongly discouraged,
so the bar for new ones is pretty high.
>
>>> +
>>> +#include "libavutil/avassert.h"
>>> +#include "libavutil/opt.h"
>>> +#include "avfilter.h"
>>> +#include "internal.h"
>>> +#include "libavcodec/avcodec.h"
>>> +#include "libavcodec/ass_split.h"
>>> +
>>> +typedef struct StripStylesContext {
>>> +const AVClass *class;
>>> +enum AVSubtitleType format;
>>> +int remove_animated;
>>> +} StripStylesContext;
>>> +
>>> +typedef struct DialogContext {
>>> +const AVClass *class;
>>
>> An AVClass is for options and logging (and would actually need an
>> AVClass, which you didn't define); you are not using it for that, so
>> just remove this.
>
> No I can't, b
Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
> -Original Message-
> From: ffmpeg-devel On Behalf Of Andreas
> Rheinhardt
> Sent: Wednesday, 22 September 2021 03:58
> To: ffmpeg-devel@ffmpeg.org
> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> stripstyles filter
>
> Soft Works:
> >
> >
> >> -Original Message-
> >> From: ffmpeg-devel On Behalf Of Andreas
> >> Rheinhardt
> >> Sent: Wednesday, 22 September 2021 03:06
> >> To: ffmpeg-devel@ffmpeg.org
> >> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> >> stripstyles filter
> >>
> >> Soft Works:
> >>> - stripstyles {S -> S)
> >>> Remove all inline styles from subtitle events
> >>>
> >>> Signed-off-by: softworkz
> >>> ---
> >>> libavfilter/Makefile | 1 +
> >>> libavfilter/allfilters.c | 1 +
> >>> libavfilter/sf_stripstyles.c | 211 +++
> >>> 3 files changed, 213 insertions(+)
> >>> create mode 100644 libavfilter/sf_stripstyles.c
> >>>
> >>> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> >>> index e6fef97c08..309c404bf7 100644
> >>> --- a/libavfilter/Makefile
> >>> +++ b/libavfilter/Makefile
> >>> @@ -540,6 +540,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
> >> vsink_nullsink.o
> >>> OBJS-$(CONFIG_CENSOR_FILTER) += sf_textmod.o
> >>> OBJS-$(CONFIG_SHOW_SPEAKER_FILTER) += sf_textmod.o
> >>> OBJS-$(CONFIG_TEXTMOD_FILTER)+= sf_textmod.o
> >>> +OBJS-$(CONFIG_STRIPSTYLES_FILTER)+= sf_stripstyles.o
> >>>
> >>> # multimedia filters
> >>> OBJS-$(CONFIG_ABITSCOPE_FILTER) += avf_abitscope.o
> >>> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> >>> index fc72858d18..e2e4deea22 100644
> >>> --- a/libavfilter/allfilters.c
> >>> +++ b/libavfilter/allfilters.c
> >>> @@ -528,6 +528,7 @@ extern const AVFilter ff_avf_showwavespic;
> >>> extern const AVFilter ff_vaf_spectrumsynth;
> >>> extern const AVFilter ff_sf_censor;
> >>> extern const AVFilter ff_sf_show_speaker;
> >>> +extern const AVFilter ff_sf_stripstyles;
> >>> extern const AVFilter ff_sf_textmod;
> >>> extern const AVFilter ff_svf_graphicsub2video;
> >>> extern const AVFilter ff_svf_textsub2video;
> >>> diff --git a/libavfilter/sf_stripstyles.c b/libavfilter/sf_stripstyles.c
> >>> new file mode 100644
> >>> index 00..15c00e73b1
> >>> --- /dev/null
> >>> +++ b/libavfilter/sf_stripstyles.c
> >>> @@ -0,0 +1,211 @@
> >>> +/*
> >>> + * Copyright (c) 2021 softworkz
> >>> + *
> >>> + * This file is part of FFmpeg.
> >>> + *
> >>> + * FFmpeg is free software; you can redistribute it and/or
> >>> + * modify it under the terms of the GNU Lesser General Public
> >>> + * License as published by the Free Software Foundation; either
> >>> + * version 2.1 of the License, or (at your option) any later version.
> >>> + *
> >>> + * FFmpeg is distributed in the hope that it will be useful,
> >>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> >>> + * Lesser General Public License for more details.
> >>> + *
> >>> + * You should have received a copy of the GNU Lesser General Public
> >>> + * License along with FFmpeg; if not, write to the Free Software
> >>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-
> >> 1301 USA
> >>> + */
> >>> +
> >>> +/**
> >>> + * @file
> >>> + * text subtitle filter which removes inline-styles from subtitles
> >>> + */
> >>> +
> >>> +#include
> >>
> >> This header and the API in it is not public.
> >
> > I'm not sure IIRC, but aren't there other cases where the ffmpeg libs
> > are accessing non-public symbols from each other?
> >
>
> Yes, there are via avpriv functions. Yet this is strongly discouraged,
> so the bar for new ones is pretty high.
>
> >
> >>> +
> >>> +#include "libavutil/avassert.h"
> >>> +#include "libavutil/o
Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
Soft Works:
>
>
>> -Original Message-
>> From: ffmpeg-devel On Behalf Of Andreas
>> Rheinhardt
>> Sent: Wednesday, 22 September 2021 03:58
>> To: ffmpeg-devel@ffmpeg.org
>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
>> stripstyles filter
>>
>> Soft Works:
>>>
>>>
>>>> -Original Message-
>>>> From: ffmpeg-devel On Behalf Of Andreas
>>>> Rheinhardt
>>>> Sent: Wednesday, 22 September 2021 03:06
>>>> To: ffmpeg-devel@ffmpeg.org
>>>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
>>>> stripstyles filter
>>>>
>>>> Soft Works:
>>>>> - stripstyles {S -> S)
>>>>> Remove all inline styles from subtitle events
>>>>>
>>>>> Signed-off-by: softworkz
>>>>> ---
>>>>> libavfilter/Makefile | 1 +
>>>>> libavfilter/allfilters.c | 1 +
>>>>> libavfilter/sf_stripstyles.c | 211 +++
>>>>> 3 files changed, 213 insertions(+)
>>>>> create mode 100644 libavfilter/sf_stripstyles.c
>>>>>
>>>>> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
>>>>> index e6fef97c08..309c404bf7 100644
>>>>> --- a/libavfilter/Makefile
>>>>> +++ b/libavfilter/Makefile
>>>>> @@ -540,6 +540,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
>>>> vsink_nullsink.o
>>>>> OBJS-$(CONFIG_CENSOR_FILTER) += sf_textmod.o
>>>>> OBJS-$(CONFIG_SHOW_SPEAKER_FILTER) += sf_textmod.o
>>>>> OBJS-$(CONFIG_TEXTMOD_FILTER)+= sf_textmod.o
>>>>> +OBJS-$(CONFIG_STRIPSTYLES_FILTER)+= sf_stripstyles.o
>>>>>
>>>>> # multimedia filters
>>>>> OBJS-$(CONFIG_ABITSCOPE_FILTER) += avf_abitscope.o
>>>>> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
>>>>> index fc72858d18..e2e4deea22 100644
>>>>> --- a/libavfilter/allfilters.c
>>>>> +++ b/libavfilter/allfilters.c
>>>>> @@ -528,6 +528,7 @@ extern const AVFilter ff_avf_showwavespic;
>>>>> extern const AVFilter ff_vaf_spectrumsynth;
>>>>> extern const AVFilter ff_sf_censor;
>>>>> extern const AVFilter ff_sf_show_speaker;
>>>>> +extern const AVFilter ff_sf_stripstyles;
>>>>> extern const AVFilter ff_sf_textmod;
>>>>> extern const AVFilter ff_svf_graphicsub2video;
>>>>> extern const AVFilter ff_svf_textsub2video;
>>>>> diff --git a/libavfilter/sf_stripstyles.c b/libavfilter/sf_stripstyles.c
>>>>> new file mode 100644
>>>>> index 00..15c00e73b1
>>>>> --- /dev/null
>>>>> +++ b/libavfilter/sf_stripstyles.c
>>>>> @@ -0,0 +1,211 @@
>>>>> +/*
>>>>> + * Copyright (c) 2021 softworkz
>>>>> + *
>>>>> + * This file is part of FFmpeg.
>>>>> + *
>>>>> + * FFmpeg is free software; you can redistribute it and/or
>>>>> + * modify it under the terms of the GNU Lesser General Public
>>>>> + * License as published by the Free Software Foundation; either
>>>>> + * version 2.1 of the License, or (at your option) any later version.
>>>>> + *
>>>>> + * FFmpeg is distributed in the hope that it will be useful,
>>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>>>>> + * Lesser General Public License for more details.
>>>>> + *
>>>>> + * You should have received a copy of the GNU Lesser General Public
>>>>> + * License along with FFmpeg; if not, write to the Free Software
>>>>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-
>>>> 1301 USA
>>>>> + */
>>>>> +
>>>>> +/**
>>>>> + * @file
>>>>> + * text subtitle filter which removes inline-styles from subtitles
>>>>> + */
>>>>> +
>>>>> +#include
>>>>
>>>> This header and the API in it is not public.
>>>
>>> I'm not sure IIRC, but aren't there other cases where the ffmpeg libs
>>> are accessing non-public sy
Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
> -Original Message-
> From: ffmpeg-devel On Behalf Of Andreas
> Rheinhardt
> Sent: Wednesday, 22 September 2021 04:48
> To: ffmpeg-devel@ffmpeg.org
> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> stripstyles filter
>
> Soft Works:
> >
> >
> >> -Original Message-
> >> From: ffmpeg-devel On Behalf Of Andreas
> >> Rheinhardt
> >> Sent: Wednesday, 22 September 2021 03:58
> >> To: ffmpeg-devel@ffmpeg.org
> >> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> >> stripstyles filter
> >>
> >> Soft Works:
> >>>
> >>>
> >>>> -Original Message-
> >>>> From: ffmpeg-devel On Behalf Of
> Andreas
> >>>> Rheinhardt
> >>>> Sent: Wednesday, 22 September 2021 03:06
> >>>> To: ffmpeg-devel@ffmpeg.org
> >>>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> >>>> stripstyles filter
> >>>>
> >>>> Soft Works:
> >>>>> - stripstyles {S -> S)
> >>>>> Remove all inline styles from subtitle events
> >>>>>
> >>>>> Signed-off-by: softworkz
> >>>>> ---
> >>>>> libavfilter/Makefile | 1 +
> >>>>> libavfilter/allfilters.c | 1 +
> >>>>> libavfilter/sf_stripstyles.c | 211 +++
> >>>>> 3 files changed, 213 insertions(+)
> >>>>> create mode 100644 libavfilter/sf_stripstyles.c
> >>>>>
> >>>>> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> >>>>> index e6fef97c08..309c404bf7 100644
> >>>>> --- a/libavfilter/Makefile
> >>>>> +++ b/libavfilter/Makefile
> >>>>> @@ -540,6 +540,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
> >>>> vsink_nullsink.o
> >>>>> OBJS-$(CONFIG_CENSOR_FILTER) += sf_textmod.o
> >>>>> OBJS-$(CONFIG_SHOW_SPEAKER_FILTER) += sf_textmod.o
> >>>>> OBJS-$(CONFIG_TEXTMOD_FILTER)+= sf_textmod.o
> >>>>> +OBJS-$(CONFIG_STRIPSTYLES_FILTER)+= sf_stripstyles.o
> >>>>>
> >>>>> # multimedia filters
> >>>>> OBJS-$(CONFIG_ABITSCOPE_FILTER) += avf_abitscope.o
> >>>>> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> >>>>> index fc72858d18..e2e4deea22 100644
> >>>>> --- a/libavfilter/allfilters.c
> >>>>> +++ b/libavfilter/allfilters.c
> >>>>> @@ -528,6 +528,7 @@ extern const AVFilter ff_avf_showwavespic;
> >>>>> extern const AVFilter ff_vaf_spectrumsynth;
> >>>>> extern const AVFilter ff_sf_censor;
> >>>>> extern const AVFilter ff_sf_show_speaker;
> >>>>> +extern const AVFilter ff_sf_stripstyles;
> >>>>> extern const AVFilter ff_sf_textmod;
> >>>>> extern const AVFilter ff_svf_graphicsub2video;
> >>>>> extern const AVFilter ff_svf_textsub2video;
> >>>>> diff --git a/libavfilter/sf_stripstyles.c
> b/libavfilter/sf_stripstyles.c
> >>>>> new file mode 100644
> >>>>> index 00..15c00e73b1
> >>>>> --- /dev/null
> >>>>> +++ b/libavfilter/sf_stripstyles.c
> >>>>> @@ -0,0 +1,211 @@
> >>>>> +/*
> >>>>> + * Copyright (c) 2021 softworkz
> >>>>> + *
> >>>>> + * This file is part of FFmpeg.
> >>>>> + *
> >>>>> + * FFmpeg is free software; you can redistribute it and/or
> >>>>> + * modify it under the terms of the GNU Lesser General Public
> >>>>> + * License as published by the Free Software Foundation; either
> >>>>> + * version 2.1 of the License, or (at your option) any later version.
> >>>>> + *
> >>>>> + * FFmpeg is distributed in the hope that it will be useful,
> >>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> >>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> >>>>> + * Lesser General Public License for more details.
> >>>>> + *
> >>>>> + * You should have received a copy of the GNU Lesser General Public
> >>>
Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
Soft Works:
>
>
>> -Original Message-
>> From: ffmpeg-devel On Behalf Of Andreas
>> Rheinhardt
>> Sent: Wednesday, 22 September 2021 04:48
>> To: ffmpeg-devel@ffmpeg.org
>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
>> stripstyles filter
>>
>> Soft Works:
>>>
>>>
>>>> -Original Message-
>>>> From: ffmpeg-devel On Behalf Of Andreas
>>>> Rheinhardt
>>>> Sent: Wednesday, 22 September 2021 03:58
>>>> To: ffmpeg-devel@ffmpeg.org
>>>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
>>>> stripstyles filter
>>>>
>>>> Soft Works:
>>>>>
>>>>>
>>>>>> -Original Message-
>>>>>> From: ffmpeg-devel On Behalf Of
>> Andreas
>>>>>> Rheinhardt
>>>>>> Sent: Wednesday, 22 September 2021 03:06
>>>>>> To: ffmpeg-devel@ffmpeg.org
>>>>>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
>>>>>> stripstyles filter
>>>>>>
>>>>>> Soft Works:
>>>>>>> - stripstyles {S -> S)
>>>>>>> Remove all inline styles from subtitle events
>>>>>>>
>>>>>>> Signed-off-by: softworkz
>>>>>>> ---
>>>>>>> libavfilter/Makefile | 1 +
>>>>>>> libavfilter/allfilters.c | 1 +
>>>>>>> libavfilter/sf_stripstyles.c | 211 +++
>>>>>>> 3 files changed, 213 insertions(+)
>>>>>>> create mode 100644 libavfilter/sf_stripstyles.c
>>>>>>>
>>>>>>> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
>>>>>>> index e6fef97c08..309c404bf7 100644
>>>>>>> --- a/libavfilter/Makefile
>>>>>>> +++ b/libavfilter/Makefile
>>>>>>> @@ -540,6 +540,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
>>>>>> vsink_nullsink.o
>>>>>>> OBJS-$(CONFIG_CENSOR_FILTER) += sf_textmod.o
>>>>>>> OBJS-$(CONFIG_SHOW_SPEAKER_FILTER) += sf_textmod.o
>>>>>>> OBJS-$(CONFIG_TEXTMOD_FILTER)+= sf_textmod.o
>>>>>>> +OBJS-$(CONFIG_STRIPSTYLES_FILTER)+= sf_stripstyles.o
>>>>>>>
>>>>>>> # multimedia filters
>>>>>>> OBJS-$(CONFIG_ABITSCOPE_FILTER) += avf_abitscope.o
>>>>>>> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
>>>>>>> index fc72858d18..e2e4deea22 100644
>>>>>>> --- a/libavfilter/allfilters.c
>>>>>>> +++ b/libavfilter/allfilters.c
>>>>>>> @@ -528,6 +528,7 @@ extern const AVFilter ff_avf_showwavespic;
>>>>>>> extern const AVFilter ff_vaf_spectrumsynth;
>>>>>>> extern const AVFilter ff_sf_censor;
>>>>>>> extern const AVFilter ff_sf_show_speaker;
>>>>>>> +extern const AVFilter ff_sf_stripstyles;
>>>>>>> extern const AVFilter ff_sf_textmod;
>>>>>>> extern const AVFilter ff_svf_graphicsub2video;
>>>>>>> extern const AVFilter ff_svf_textsub2video;
>>>>>>> diff --git a/libavfilter/sf_stripstyles.c
>> b/libavfilter/sf_stripstyles.c
>>>>>>> new file mode 100644
>>>>>>> index 00..15c00e73b1
>>>>>>> --- /dev/null
>>>>>>> +++ b/libavfilter/sf_stripstyles.c
>>>>>>> @@ -0,0 +1,211 @@
>>>>>>> +/*
>>>>>>> + * Copyright (c) 2021 softworkz
>>>>>>> + *
>>>>>>> + * This file is part of FFmpeg.
>>>>>>> + *
>>>>>>> + * FFmpeg is free software; you can redistribute it and/or
>>>>>>> + * modify it under the terms of the GNU Lesser General Public
>>>>>>> + * License as published by the Free Software Foundation; either
>>>>>>> + * version 2.1 of the License, or (at your option) any later version.
>>>>>>> + *
>>>>>>> + * FFmpeg is distributed in the hope that it will be useful,
>>>>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>>>&g
Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
> -Original Message-
> From: ffmpeg-devel On Behalf Of Andreas
> Rheinhardt
> Sent: Wednesday, 22 September 2021 05:28
> To: ffmpeg-devel@ffmpeg.org
> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> stripstyles filter
>
> Soft Works:
> >
> >
> >> -Original Message-
> >> From: ffmpeg-devel On Behalf Of Andreas
> >> Rheinhardt
> >> Sent: Wednesday, 22 September 2021 04:48
> >> To: ffmpeg-devel@ffmpeg.org
> >> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> >> stripstyles filter
> >>
> >> Soft Works:
> >>>
> >>>
> >>>> -Original Message-
> >>>> From: ffmpeg-devel On Behalf Of
> Andreas
> >>>> Rheinhardt
> >>>> Sent: Wednesday, 22 September 2021 03:58
> >>>> To: ffmpeg-devel@ffmpeg.org
> >>>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> >>>> stripstyles filter
> >>>>
> >>>> Soft Works:
> >>>>>
> >>>>>
> >>>>>> -Original Message-
> >>>>>> From: ffmpeg-devel On Behalf Of
> >> Andreas
> >>>>>> Rheinhardt
> >>>>>> Sent: Wednesday, 22 September 2021 03:06
> >>>>>> To: ffmpeg-devel@ffmpeg.org
> >>>>>> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> >>>>>> stripstyles filter
> >>>>>>
> >>>>>> Soft Works:
> >>>>>>> - stripstyles {S -> S)
> >>>>>>> Remove all inline styles from subtitle events
> >>>>>>>
> >>>>>>> Signed-off-by: softworkz
> >>>>>>> ---
> >>>>>>> libavfilter/Makefile | 1 +
> >>>>>>> libavfilter/allfilters.c | 1 +
> >>>>>>> libavfilter/sf_stripstyles.c | 211
> +++
> >>>>>>> 3 files changed, 213 insertions(+)
> >>>>>>> create mode 100644 libavfilter/sf_stripstyles.c
> >>>>>>>
> >>>>>>> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> >>>>>>> index e6fef97c08..309c404bf7 100644
> >>>>>>> --- a/libavfilter/Makefile
> >>>>>>> +++ b/libavfilter/Makefile
> >>>>>>> @@ -540,6 +540,7 @@ OBJS-$(CONFIG_NULLSINK_FILTER) +=
> >>>>>> vsink_nullsink.o
> >>>>>>> OBJS-$(CONFIG_CENSOR_FILTER) += sf_textmod.o
> >>>>>>> OBJS-$(CONFIG_SHOW_SPEAKER_FILTER) += sf_textmod.o
> >>>>>>> OBJS-$(CONFIG_TEXTMOD_FILTER)+= sf_textmod.o
> >>>>>>> +OBJS-$(CONFIG_STRIPSTYLES_FILTER)+= sf_stripstyles.o
> >>>>>>>
> >>>>>>> # multimedia filters
> >>>>>>> OBJS-$(CONFIG_ABITSCOPE_FILTER) += avf_abitscope.o
> >>>>>>> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> >>>>>>> index fc72858d18..e2e4deea22 100644
> >>>>>>> --- a/libavfilter/allfilters.c
> >>>>>>> +++ b/libavfilter/allfilters.c
> >>>>>>> @@ -528,6 +528,7 @@ extern const AVFilter ff_avf_showwavespic;
> >>>>>>> extern const AVFilter ff_vaf_spectrumsynth;
> >>>>>>> extern const AVFilter ff_sf_censor;
> >>>>>>> extern const AVFilter ff_sf_show_speaker;
> >>>>>>> +extern const AVFilter ff_sf_stripstyles;
> >>>>>>> extern const AVFilter ff_sf_textmod;
> >>>>>>> extern const AVFilter ff_svf_graphicsub2video;
> >>>>>>> extern const AVFilter ff_svf_textsub2video;
> >>>>>>> diff --git a/libavfilter/sf_stripstyles.c
> >> b/libavfilter/sf_stripstyles.c
> >>>>>>> new file mode 100644
> >>>>>>> index 00..15c00e73b1
> >>>>>>> --- /dev/null
> >>>>>>> +++ b/libavfilter/sf_stripstyles.c
> >>>>>>> @@ -0,0 +1,211 @@
> >>>>>>> +/*
> >>>>>>> + * Copyright (c) 2021 softworkz
> >>>>>>> + *
>
Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add stripstyles filter
> -Original Message-
> From: ffmpeg-devel On Behalf Of Andreas
> Rheinhardt
> Sent: Wednesday, 22 September 2021 05:28
> To: ffmpeg-devel@ffmpeg.org
> Subject: Re: [FFmpeg-devel] [PATCH v8 11/13] avfilter/stripstyles: Add
> stripstyles filter
> >>> It crashed at some point, I don't remember where exactly, but the first
> >>> member of the struct got overwritten and invalidated. Then I realized
> that
> >>> it was assumed to have an AVClass.
> >>>
> >>
> >> This surprises me. Are you sure that you did not forget the AVClass from
> >> your private filter context (in this case, StripStylesContext)?
> >
> > That's something that happened as well, but at an earlier time and
> > with a different filter..
> >
> > I think I had some logging in the callback functions (ASSCodesCallbacks)
> > before, probably that's how it happened to crash.
> >
>
> That would make sense. If you want to have logging in these callbacks,
> you should probably move DialogContext into StripStylesContext and use
> the latter as opaque priv pointer.
I did it the other way round now. As StripStylesContext is already a member
of DialogContext, I'm just passing this one as the context for logging
typedef struct DialogContext {
StripStylesContext* ss_ctx;
AVBPrint buffer;
int drawing_scale;
int is_animated;
} DialogContext;
static void dialog_text_cb(void *priv, const char *text, int len)
{
DialogContext *s = priv;
av_log(s->ss_ctx, AV_LOG_DEBUG, "dialog_text_cb: %s\n", text);
The AVClass is removed and all should be fine that way.
> >>>>> If not, what would you suggest. Duplicate the ass code in avfilter,
> >>>>> move it to avutil and make it public, or any other idea?
> >>>>>
> >>>>
> >>>> Making it public? You know that your 10/13 would not be possible if this
> >>>> were public? (And it would also not work if it were avpriv; at least not
> >>>> without some versioning uglyness.)
> >>>> I don't like the idea of duplicating the code. The only vague suggestion
> >>>> that I have is that this might be more suitable for a bitstream filter.
> >>>
> >>> The ass subtitle format is used as the internal text subtitle format,
> >>> which means that those ass manipulation function are required to be
> >>> accessible by many other text subtitle filter in some way.
> >>> I'm using them in more filters already..
> >>>
> >>
> >> Then we have a problem. And I don't have a solution.
> >
> > Function prefixes per preprocessor defs to compile the same two source
> files
> > into both libs?
> >
>
> If we opt for duplicating, then it could be made in a way that it is
> only duplicated for shared builds; see
> https://github.com/mkver/FFmpeg/commits/avpriv (I finally need to get
> this patchset updated and sent before the next release while the ABI is
> still open.)
>
> > Moving into avutil would appear to make more sense to me. Anyway, it's
> exactly
> > that: utility functions. (it's not the ass encoder or decoder)
> >
>
> That has the compatibility problem I mentioned.
Yes, you said:
> >>>> Making it public? You know that your 10/13 would not be possible if this
> >>>> were public?
That is clearly true, but this is not something that will happen again,
soon. I have looked at the history of the exports of ass.h and ass_split.h
and there haven't been changes for years to the definitions and just one
function added.
After re-thinking and looking at all available options, my conclusion is
that the best option would be to put it into avutil and make it public.
(an ABI break is pending anyway).
avutil contains a number of utility functions for audio and video, so
it seems to be the right place for having a few utility functions for
subtitles that are commonly used from multiple libraries.
If there aren't any objections (please let me know), I would incorporate
that change into the subtitle patchset.
Thanks,
softworkz
___
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".
