January 2021 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter: add kirsch video filter
by Paul B Mahol 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jan 23 14:54:51 2021 +0100| [35f86280478bd4fb7404800ff8952d98e8d1100d] | committer: Paul B Mahol avfilter: add kirsch video filter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35f86280478bd4fb7… --- Changelog | 1 + doc/filters.texi | 21 +++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_convolution.c | 133 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 158 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 8319bbc298..8015221f50 100644 --- a/Changelog +++ b/Changelog @@ -59,6 +59,7 @@ version <next>: - epx filter - Dolby E parser - shear filter +- kirsch filter version 4.3: diff --git a/doc/filters.texi b/doc/filters.texi index 8b448a30cc..efd2211483 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -13400,6 +13400,27 @@ kerndeint=map=1 @end example @end itemize +@section kirsch +Apply kirsch operator to input video stream. + +The filter accepts the following option: + +@table @option +@item planes +Set which planes will be processed, unprocessed planes will be copied. +By default value 0xf, all planes will be processed. + +@item scale +Set value which will be multiplied with filtered result. + +@item delta +Set value which will be added to filtered result. +@end table + +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @section lagfun Slowly update darker pixels. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index b930a00d8b..fbb4e29bd0 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -298,6 +298,7 @@ OBJS-$(CONFIG_INFLATE_FILTER) += vf_neighbor.o OBJS-$(CONFIG_INTERLACE_FILTER) += vf_tinterlace.o OBJS-$(CONFIG_INTERLEAVE_FILTER) += f_interleave.o OBJS-$(CONFIG_KERNDEINT_FILTER) += vf_kerndeint.o +OBJS-$(CONFIG_KIRSCH_FILTER) += vf_convolution.o OBJS-$(CONFIG_LAGFUN_FILTER) += vf_lagfun.o OBJS-$(CONFIG_LENSCORRECTION_FILTER) += vf_lenscorrection.o OBJS-$(CONFIG_LENSFUN_FILTER) += vf_lensfun.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 616962690b..d9d36554c4 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -283,6 +283,7 @@ extern AVFilter ff_vf_inflate; extern AVFilter ff_vf_interlace; extern AVFilter ff_vf_interleave; extern AVFilter ff_vf_kerndeint; +extern AVFilter ff_vf_kirsch; extern AVFilter ff_vf_lagfun; extern AVFilter ff_vf_lenscorrection; extern AVFilter ff_vf_lensfun; diff --git a/libavfilter/version.h b/libavfilter/version.h index d588e3169b..bedeaa90a1 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 7 -#define LIBAVFILTER_VERSION_MINOR 98 +#define LIBAVFILTER_VERSION_MINOR 99 #define LIBAVFILTER_VERSION_MICRO 100 diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index c238dae925..7b655ae25b 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -159,6 +159,55 @@ static void filter16_sobel(uint8_t *dstp, int width, } } +static void filter16_kirsch(uint8_t *dstp, int width, + float scale, float delta, const int *const matrix, + const uint8_t *c[], int peak, int radius, + int dstride, int stride) +{ + uint16_t *dst = (uint16_t *)dstp; + const uint16_t *c0 = (const uint16_t *)c[0], *c1 = (const uint16_t *)c[1], *c2 = (const uint16_t *)c[2]; + const uint16_t *c3 = (const uint16_t *)c[3], *c5 = (const uint16_t *)c[5]; + const uint16_t *c6 = (const uint16_t *)c[6], *c7 = (const uint16_t *)c[7], *c8 = (const uint16_t *)c[8]; + int x; + + for (x = 0; x < width; x++) { + int sum0 = c0[x] * 5 + c1[x] * 5 + c2[x] * 5 + + c3[x] * -3 + c5[x] * -3 + + c6[x] * -3 + c7[x] * -3 + c8[x] * -3; + int sum1 = c0[x] * -3 + c1[x] * 5 + c2[x] * 5 + + c3[x] * 5 + c5[x] * -3 + + c6[x] * -3 + c7[x] * -3 + c8[x] * -3; + int sum2 = c0[x] * -3 + c1[x] * -3 + c2[x] * 5 + + c3[x] * 5 + c5[x] * 5 + + c6[x] * -3 + c7[x] * -3 + c8[x] * -3; + int sum3 = c0[x] * -3 + c1[x] * -3 + c2[x] * -3 + + c3[x] * 5 + c5[x] * 5 + + c6[x] * 5 + c7[x] * -3 + c8[x] * -3; + int sum4 = c0[x] * -3 + c1[x] * -3 + c2[x] * -3 + + c3[x] * -3 + c5[x] * 5 + + c6[x] * 5 + c7[x] * 5 + c8[x] * -3; + int sum5 = c0[x] * -3 + c1[x] * -3 + c2[x] * -3 + + c3[x] * -3 + c5[x] * -3 + + c6[x] * 5 + c7[x] * 5 + c8[x] * 5; + int sum6 = c0[x] * 5 + c1[x] * -3 + c2[x] * -3 + + c3[x] * -3 + c5[x] * -3 + + c6[x] * -3 + c7[x] * 5 + c8[x] * 5; + int sum7 = c0[x] * 5 + c1[x] * 5 + c2[x] * -3 + + c3[x] * -3 + c5[x] * -3 + + c6[x] * -3 + c7[x] * -3 + c8[x] * 5; + + sum0 = FFMAX(sum0, sum1); + sum2 = FFMAX(sum2, sum3); + sum4 = FFMAX(sum4, sum5); + sum6 = FFMAX(sum6, sum7); + sum0 = FFMAX(sum0, sum2); + sum4 = FFMAX(sum4, sum6); + sum0 = FFMAX(sum0, sum4); + + dst[x] = av_clip(FFABS(sum0) * scale + delta, 0, peak); + } +} + static void filter_prewitt(uint8_t *dst, int width, float scale, float delta, const int *const matrix, const uint8_t *c[], int peak, int radius, @@ -214,6 +263,54 @@ static void filter_sobel(uint8_t *dst, int width, } } +static void filter_kirsch(uint8_t *dst, int width, + float scale, float delta, const int *const matrix, + const uint8_t *c[], int peak, int radius, + int dstride, int stride) +{ + const uint8_t *c0 = c[0], *c1 = c[1], *c2 = c[2]; + const uint8_t *c3 = c[3], *c5 = c[5]; + const uint8_t *c6 = c[6], *c7 = c[7], *c8 = c[8]; + int x; + + for (x = 0; x < width; x++) { + int sum0 = c0[x] * 5 + c1[x] * 5 + c2[x] * 5 + + c3[x] * -3 + c5[x] * -3 + + c6[x] * -3 + c7[x] * -3 + c8[x] * -3; + int sum1 = c0[x] * -3 + c1[x] * 5 + c2[x] * 5 + + c3[x] * 5 + c5[x] * -3 + + c6[x] * -3 + c7[x] * -3 + c8[x] * -3; + int sum2 = c0[x] * -3 + c1[x] * -3 + c2[x] * 5 + + c3[x] * 5 + c5[x] * 5 + + c6[x] * -3 + c7[x] * -3 + c8[x] * -3; + int sum3 = c0[x] * -3 + c1[x] * -3 + c2[x] * -3 + + c3[x] * 5 + c5[x] * 5 + + c6[x] * 5 + c7[x] * -3 + c8[x] * -3; + int sum4 = c0[x] * -3 + c1[x] * -3 + c2[x] * -3 + + c3[x] * -3 + c5[x] * 5 + + c6[x] * 5 + c7[x] * 5 + c8[x] * -3; + int sum5 = c0[x] * -3 + c1[x] * -3 + c2[x] * -3 + + c3[x] * -3 + c5[x] * -3 + + c6[x] * 5 + c7[x] * 5 + c8[x] * 5; + int sum6 = c0[x] * 5 + c1[x] * -3 + c2[x] * -3 + + c3[x] * -3 + c5[x] * -3 + + c6[x] * -3 + c7[x] * 5 + c8[x] * 5; + int sum7 = c0[x] * 5 + c1[x] * 5 + c2[x] * -3 + + c3[x] * -3 + c5[x] * -3 + + c6[x] * -3 + c7[x] * -3 + c8[x] * 5; + + sum0 = FFMAX(sum0, sum1); + sum2 = FFMAX(sum2, sum3); + sum4 = FFMAX(sum4, sum5); + sum6 = FFMAX(sum6, sum7); + sum0 = FFMAX(sum0, sum2); + sum4 = FFMAX(sum4, sum6); + sum0 = FFMAX(sum0, sum4); + + dst[x] = av_clip_uint8(FFABS(sum0) * scale + delta); + } +} + static void filter16_3x3(uint8_t *dstp, int width, float rdiv, float bias, const int *const matrix, const uint8_t *c[], int peak, int radius, @@ -604,6 +701,10 @@ static int config_input(AVFilterLink *inlink) if (s->depth > 8) for (p = 0; p < s->nb_planes; p++) s->filter[p] = filter16_sobel; + } else if (!strcmp(ctx->filter->name, "kirsch")) { + if (s->depth > 8) + for (p = 0; p < s->nb_planes; p++) + s->filter[p] = filter16_kirsch; } return 0; @@ -744,6 +845,17 @@ static av_cold int init(AVFilterContext *ctx) s->rdiv[i] = s->scale; s->bias[i] = s->delta; } + } else if (!strcmp(ctx->filter->name, "kirsch")) { + for (i = 0; i < 4; i++) { + if ((1 << i) & s->planes) + s->filter[i] = filter_kirsch; + else + s->copy[i] = 1; + s->size[i] = 3; + s->setup[i] = setup_3x3; + s->rdiv[i] = s->scale; + s->bias[i] = s->delta; + } } return 0; @@ -864,4 +976,25 @@ AVFilter ff_vf_roberts = { }; #endif /* CONFIG_ROBERTS_FILTER */ + +#if CONFIG_KIRSCH_FILTER + +#define kirsch_options prewitt_roberts_sobel_options +AVFILTER_DEFINE_CLASS(kirsch); + +AVFilter ff_vf_kirsch = { + .name = "kirsch", + .description = NULL_IF_CONFIG_SMALL("Apply kirsch operator."), + .priv_size = sizeof(ConvolutionContext), + .priv_class = &kirsch_class, + .init = init, + .query_formats = query_formats, + .inputs = convolution_inputs, + .outputs = convolution_outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .process_command = process_command, +}; + +#endif /* CONFIG_KIRSCH_FILTER */ + #endif /* CONFIG_PREWITT_FILTER || CONFIG_ROBERTS_FILTER || CONFIG_SOBEL_FILTER */

1 0

doc/filters: mention that shear filter supports commands
by Paul B Mahol 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 27 11:40:05 2021 +0100| [021dc4f1073ae4d77f49e181c22c3d2e79e98cd2] | committer: Paul B Mahol doc/filters: mention that shear filter supports commands > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=021dc4f1073ae4d77… --- doc/filters.texi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index ebe56ae5d5..8b448a30cc 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -17850,6 +17850,10 @@ Default value is "black". Set interpolation type. Can be @code{bilinear} or @code{nearest}. Default is @code{bilinear}. @end table +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @section showinfo Show a line containing various information for each input video frame.

1 0

libavutil/frame.h: correct typo for AVFilmGrainParams in comment
by Guo, Yejun 27 Jan '21

27 Jan '21

ffmpeg | branch: master | Guo, Yejun <yejun.guo(a)intel.com> | Wed Jan 27 13:13:12 2021 +0800| [149bfc2445d5cbc8bb8a0d7f058f18a363770a8c] | committer: Guo, Yejun libavutil/frame.h: correct typo for AVFilmGrainParams in comment > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=149bfc2445d5cbc8b… --- libavutil/frame.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/frame.h b/libavutil/frame.h index 392315f40f..1aeafef6de 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -194,7 +194,7 @@ enum AVFrameSideDataType { AV_FRAME_DATA_SEI_UNREGISTERED, /** - * Film grain parameters for a frame, described by AVFilmGrainParameters. + * Film grain parameters for a frame, described by AVFilmGrainParams. * Must be present for every frame which should have film grain applied. */ AV_FRAME_DATA_FILM_GRAIN_PARAMS,

1 0

avcodec/sei: add Parameter Sets Inclusion Indication enum value
by James Almer 27 Jan '21

27 Jan '21

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Jan 22 16:30:51 2021 -0300| [683cd25c5a397447eb53754af948e7bf2cb3361e] | committer: James Almer avcodec/sei: add Parameter Sets Inclusion Indication enum value Defined in H.274, it shares the same value as Active Parameter Sets from the H.265 spec. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=683cd25c5a397447e… --- libavcodec/sei.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/sei.h b/libavcodec/sei.h index f07c72ae7b..5513590b51 100644 --- a/libavcodec/sei.h +++ b/libavcodec/sei.h @@ -85,6 +85,7 @@ enum { SEI_TYPE_GREEN_METADATA = 56, SEI_TYPE_STRUCTURE_OF_PICTURES_INFO = 128, SEI_TYPE_ACTIVE_PARAMETER_SETS = 129, + SEI_TYPE_PARAMETER_SETS_INCLUSION_INDICATION = SEI_TYPE_ACTIVE_PARAMETER_SETS, SEI_TYPE_DECODING_UNIT_INFO = 130, SEI_TYPE_TEMPORAL_SUB_LAYER_ZERO_IDX = 131, SEI_TYPE_DECODED_PICTURE_HASH = 132,

1 0

avfilter/vf_colorchannelmixer: extend pl option functionality
by Paul B Mahol 26 Jan '21

26 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 27 00:33:56 2021 +0100| [2ee2e4cd416c0847826610e70d6c79e48f78344c] | committer: Paul B Mahol avfilter/vf_colorchannelmixer: extend pl option functionality > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ee2e4cd416c08478… --- doc/filters.texi | 3 +- libavfilter/vf_colorchannelmixer.c | 85 +++++++++++++++++++++++--------------- 2 files changed, 54 insertions(+), 34 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 8870457f8e..ebe56ae5d5 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8067,7 +8067,8 @@ Default is @code{1} for @var{aa}, and @code{0} for @var{ar}, @var{ag} and @var{a Allowed ranges for options are @code{[-2.0, 2.0]}. @item pl -Preserve lightness when changing colors. Default is disabled. +Preserve lightness when changing colors. Allowed range is from @code{[0.0, 1.0]}. +Default is @code{0.0}, thus disabled. @end table @subsection Examples diff --git a/libavfilter/vf_colorchannelmixer.c b/libavfilter/vf_colorchannelmixer.c index 6085b36265..9857a666ff 100644 --- a/libavfilter/vf_colorchannelmixer.c +++ b/libavfilter/vf_colorchannelmixer.c @@ -44,7 +44,7 @@ typedef struct ColorChannelMixerContext { double br, bg, bb, ba; double ar, ag, ab, aa; double sr, sg, sb; - int preserve_lightness; + double preserve_lightness; int *lut[4][4]; @@ -75,7 +75,7 @@ static const AVOption colorchannelmixer_options[] = { { "ag", "set the green gain for the alpha channel", OFFSET(ag), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -2, 2, FLAGS }, { "ab", "set the blue gain for the alpha channel", OFFSET(ab), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -2, 2, FLAGS }, { "aa", "set the alpha gain for the alpha channel", OFFSET(aa), AV_OPT_TYPE_DOUBLE, {.dbl=1}, -2, 2, FLAGS }, - { "pl", "preserve lightness", OFFSET(preserve_lightness), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, + { "pl", "preserve lightness", OFFSET(preserve_lightness), AV_OPT_TYPE_DOUBLE, {.dbl=0}, 0, 1, FLAGS }, { NULL } }; @@ -106,6 +106,11 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, fmts_list); } +static float lerpf(float v0, float v1, float f) +{ + return v0 + (v1 - v0) * f; +} + static void preservel(float *r, float *g, float *b, float lin, float lout) { *r *= lout / lin; @@ -120,6 +125,10 @@ static av_always_inline int filter_slice_rgba_planar(AVFilterContext *ctx, void ThreadData *td = arg; AVFrame *in = td->in; AVFrame *out = td->out; + const float l = s->preserve_lightness; + const float sr = s->sr; + const float sg = s->sg; + const float sb = s->sb; const int slice_start = (out->height * jobnr) / nb_jobs; const int slice_end = (out->height * (jobnr+1)) / nb_jobs; const uint8_t *srcg = in->data[0] + slice_start * in->linesize[0]; @@ -142,7 +151,7 @@ static av_always_inline int filter_slice_rgba_planar(AVFilterContext *ctx, void float lin; if (pl) - lin = FFMAX3(rin, gin, bin) / 255.f + FFMIN3(rin, gin, bin) / 255.f; + lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin); rout = s->lut[R][R][rin] + s->lut[R][G][gin] + @@ -158,16 +167,16 @@ static av_always_inline int filter_slice_rgba_planar(AVFilterContext *ctx, void (have_alpha == 1 ? s->lut[B][A][ain] : 0); if (pl) { - float frout = rout / (255.f * s->sr); - float fgout = gout / (255.f * s->sg); - float fbout = bout / (255.f * s->sb); + float frout = rout / sr; + float fgout = gout / sg; + float fbout = bout / sb; float lout = FFMAX3(frout, fgout, fbout) + FFMIN3(frout, fgout, fbout); preservel(&frout, &fgout, &fbout, lin, lout); - rout = lrintf(frout * 255.f); - gout = lrintf(fgout * 255.f); - bout = lrintf(fbout * 255.f); + rout = lrintf(lerpf(rout, frout, l)); + gout = lrintf(lerpf(gout, fgout, l)); + bout = lrintf(lerpf(bout, fbout, l)); } dstr[j] = av_clip_uint8(rout); @@ -202,6 +211,10 @@ static av_always_inline int filter_slice_rgba16_planar(AVFilterContext *ctx, voi ThreadData *td = arg; AVFrame *in = td->in; AVFrame *out = td->out; + const float l = s->preserve_lightness; + const float sr = s->sr; + const float sg = s->sg; + const float sb = s->sb; const int slice_start = (out->height * jobnr) / nb_jobs; const int slice_end = (out->height * (jobnr+1)) / nb_jobs; const uint16_t *srcg = (const uint16_t *)(in->data[0] + slice_start * in->linesize[0]); @@ -212,8 +225,6 @@ static av_always_inline int filter_slice_rgba16_planar(AVFilterContext *ctx, voi uint16_t *dstb = (uint16_t *)(out->data[1] + slice_start * out->linesize[1]); uint16_t *dstr = (uint16_t *)(out->data[2] + slice_start * out->linesize[2]); uint16_t *dsta = (uint16_t *)(out->data[3] + slice_start * out->linesize[3]); - const float scale = 1.f / ((1 << depth) - 1); - const float factor = (1 << depth) - 1; int i, j; for (i = slice_start; i < slice_end; i++) { @@ -226,7 +237,7 @@ static av_always_inline int filter_slice_rgba16_planar(AVFilterContext *ctx, voi float lin; if (pl) - lin = FFMAX3(rin, gin, bin) * scale + FFMIN3(rin, gin, bin) * scale; + lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin); rout = s->lut[R][R][rin] + s->lut[R][G][gin] + @@ -242,16 +253,16 @@ static av_always_inline int filter_slice_rgba16_planar(AVFilterContext *ctx, voi (have_alpha == 1 ? s->lut[B][A][ain] : 0); if (pl) { - float frout = rout / (factor * s->sr); - float fgout = gout / (factor * s->sg); - float fbout = bout / (factor * s->sb); + float frout = rout / sr; + float fgout = gout / sg; + float fbout = bout / sb; float lout = FFMAX3(frout, fgout, fbout) + FFMIN3(frout, fgout, fbout); preservel(&frout, &fgout, &fbout, lin, lout); - rout = lrintf(frout * factor); - gout = lrintf(fgout * factor); - bout = lrintf(fbout * factor); + rout = lrintf(lerpf(rout, frout, l)); + gout = lrintf(lerpf(gout, fgout, l)); + bout = lrintf(lerpf(bout, fbout, l)); } dstr[j] = av_clip_uintp2(rout, depth); @@ -386,6 +397,10 @@ static av_always_inline int filter_slice_rgba_packed(AVFilterContext *ctx, void ThreadData *td = arg; AVFrame *in = td->in; AVFrame *out = td->out; + const float l = s->preserve_lightness; + const float sr = s->sr; + const float sg = s->sg; + const float sb = s->sb; const int slice_start = (out->height * jobnr) / nb_jobs; const int slice_end = (out->height * (jobnr+1)) / nb_jobs; const uint8_t roffset = s->rgba_map[R]; @@ -409,7 +424,7 @@ static av_always_inline int filter_slice_rgba_packed(AVFilterContext *ctx, void float lin; if (pl) - lin = FFMAX3(rin, gin, bin) / 255.f + FFMIN3(rin, gin, bin) / 255.f; + lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin); rout = s->lut[R][R][rin] + s->lut[R][G][gin] + @@ -425,16 +440,16 @@ static av_always_inline int filter_slice_rgba_packed(AVFilterContext *ctx, void (have_alpha == 1 ? s->lut[B][A][ain] : 0); if (pl) { - float frout = rout / (255.f * s->sr); - float fgout = gout / (255.f * s->sg); - float fbout = bout / (255.f * s->sb); + float frout = rout / sr; + float fgout = gout / sg; + float fbout = bout / sb; float lout = FFMAX3(frout, fgout, fbout) + FFMIN3(frout, fgout, fbout); preservel(&frout, &fgout, &fbout, lin, lout); - rout = lrintf(frout * 255.f); - gout = lrintf(fgout * 255.f); - bout = lrintf(fbout * 255.f); + rout = lrintf(lerpf(rout, frout, l)); + gout = lrintf(lerpf(gout, fgout, l)); + bout = lrintf(lerpf(bout, fbout, l)); } dst[j + roffset] = av_clip_uint8(rout); @@ -464,6 +479,10 @@ static av_always_inline int filter_slice_rgba16_packed(AVFilterContext *ctx, voi ThreadData *td = arg; AVFrame *in = td->in; AVFrame *out = td->out; + const float l = s->preserve_lightness; + const float sr = s->sr; + const float sg = s->sg; + const float sb = s->sb; const int slice_start = (out->height * jobnr) / nb_jobs; const int slice_end = (out->height * (jobnr+1)) / nb_jobs; const uint8_t roffset = s->rgba_map[R]; @@ -487,7 +506,7 @@ static av_always_inline int filter_slice_rgba16_packed(AVFilterContext *ctx, voi float lin; if (pl) - lin = FFMAX3(rin, gin, bin) / 65535.f + FFMIN3(rin, gin, bin) / 65535.f; + lin = FFMAX3(rin, gin, bin) + FFMIN3(rin, gin, bin); rout = s->lut[R][R][rin] + s->lut[R][G][gin] + @@ -503,16 +522,16 @@ static av_always_inline int filter_slice_rgba16_packed(AVFilterContext *ctx, voi (have_alpha == 1 ? s->lut[B][A][ain] : 0); if (pl) { - float frout = rout / (65535.f * s->sr); - float fgout = gout / (65535.f * s->sg); - float fbout = bout / (65535.f * s->sb); + float frout = rout / sr; + float fgout = gout / sg; + float fbout = bout / sb; float lout = FFMAX3(frout, fgout, fbout) + FFMIN3(frout, fgout, fbout); preservel(&frout, &fgout, &fbout, lin, lout); - rout = lrintf(frout * 65535.f); - gout = lrintf(fgout * 65535.f); - bout = lrintf(fbout * 65535.f); + rout = lrintf(lerpf(rout, frout, l)); + gout = lrintf(lerpf(gout, fgout, l)); + bout = lrintf(lerpf(bout, fbout, l)); } dst[j + roffset] = av_clip_uint16(rout); @@ -720,7 +739,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFilterContext *ctx = inlink->dst; ColorChannelMixerContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; - const int pl = s->preserve_lightness; + const int pl = s->preserve_lightness > 0.; ThreadData td; AVFrame *out;

1 0

avfilter/vf_lenscorrection: remove unused elements
by Paul B Mahol 26 Jan '21

26 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jan 26 20:05:01 2021 +0100| [199d9e705a076606e3f86b01ae2927b48cd5a098] | committer: Paul B Mahol avfilter/vf_lenscorrection: remove unused elements > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=199d9e705a076606e… --- libavfilter/vf_lenscorrection.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c index a74adea4a6..9386f795da 100644 --- a/libavfilter/vf_lenscorrection.c +++ b/libavfilter/vf_lenscorrection.c @@ -38,8 +38,6 @@ typedef struct LenscorrectionCtx { const AVClass *av_class; - int width; - int height; int planewidth[4]; int planeheight[4]; int depth; @@ -262,8 +260,6 @@ static int config_output(AVFilterLink *outlink) rect->planeheight[0] = rect->planeheight[3] = inlink->h; rect->planewidth[1] = rect->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, pixdesc->log2_chroma_w); rect->planewidth[0] = rect->planewidth[3] = inlink->w; - outlink->w = rect->width = inlink->w; - outlink->h = rect->height = inlink->h; rect->nb_planes = av_pix_fmt_count_planes(inlink->format); rect->filter_slice = rect->depth <= 8 ? filter8_slice : filter16_slice; if (rect->interpolation)

1 0

avfilter/vf_lenscorrection: reduce overhead calling execute for every plane
by Paul B Mahol 26 Jan '21

26 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jan 26 20:02:41 2021 +0100| [499c3193a5c59896a5f66863e0db07c915c8f4fb] | committer: Paul B Mahol avfilter/vf_lenscorrection: reduce overhead calling execute for every plane > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=499c3193a5c59896a… --- libavfilter/vf_lenscorrection.c | 100 +++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 57 deletions(-) diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c index 4d30d445df..a74adea4a6 100644 --- a/libavfilter/vf_lenscorrection.c +++ b/libavfilter/vf_lenscorrection.c @@ -40,7 +40,8 @@ typedef struct LenscorrectionCtx { const AVClass *av_class; int width; int height; - int hsub, vsub; + int planewidth[4]; + int planeheight[4]; int depth; int nb_planes; double cx, cy, k1, k2; @@ -50,7 +51,7 @@ typedef struct LenscorrectionCtx { int32_t *correction[4]; - int (*filter_slice)(AVFilterContext *ctx, void *arg, int job, int nb_jobs); + int (*filter_slice)(AVFilterContext *ctx, void *arg, int job, int nb_jobs, int plane); } LenscorrectionCtx; #define OFFSET(x) offsetof(LenscorrectionCtx, x) @@ -71,29 +72,24 @@ AVFILTER_DEFINE_CLASS(lenscorrection); typedef struct ThreadData { AVFrame *in, *out; - int w, h; - int depth; - int plane; - int fill_color; - int xcenter, ycenter; - int32_t *correction; } ThreadData; #define NEAREST(type, name) \ static int filter##name##_slice(AVFilterContext *ctx, void *arg, int job, \ - int nb_jobs) \ + int nb_jobs, int plane) \ { \ + LenscorrectionCtx *rect = ctx->priv; \ ThreadData *td = arg; \ AVFrame *in = td->in; \ AVFrame *out = td->out; \ \ - const int fill_color = td->fill_color; \ - const int w = td->w, h = td->h; \ - const int xcenter = td->xcenter; \ - const int ycenter = td->ycenter; \ + const int32_t *correction = rect->correction[plane]; \ + const int fill_color = rect->fill_color[plane]; \ + const int w = rect->planewidth[plane], h = rect->planeheight[plane]; \ + const int xcenter = rect->cx * w; \ + const int ycenter = rect->cy * h; \ const int start = (h * job ) / nb_jobs; \ const int end = (h * (job+1)) / nb_jobs; \ - const int plane = td->plane; \ const int inlinesize = in->linesize[plane] / sizeof(type); \ const int outlinesize = out->linesize[plane] / sizeof(type); \ const type *indata = (const type *)in->data[plane]; \ @@ -103,7 +99,7 @@ static int filter##name##_slice(AVFilterContext *ctx, void *arg, int job, \ type *out = outrow; \ for (int j = 0; j < w; j++) { \ const int off_x = j - xcenter; \ - const int64_t radius_mult = td->correction[j + i*w]; \ + const int64_t radius_mult = correction[j + i*w]; \ const int x = xcenter + ((radius_mult * off_x + (1<<23))>>24); \ const int y = ycenter + ((radius_mult * off_y + (1<<23))>>24); \ const char isvalid = x >= 0 && x < w && y >= 0 && y < h; \ @@ -119,22 +115,23 @@ NEAREST(uint16_t, 16) #define BILINEAR(type, name) \ static int filter##name##_slice_bilinear(AVFilterContext *ctx, void *arg, \ - int job, int nb_jobs) \ + int job, int nb_jobs, int plane) \ { \ + LenscorrectionCtx *rect = ctx->priv; \ ThreadData *td = arg; \ AVFrame *in = td->in; \ AVFrame *out = td->out; \ \ - const int fill_color = td->fill_color; \ - const int depth = td->depth; \ + const int32_t *correction = rect->correction[plane]; \ + const int fill_color = rect->fill_color[plane]; \ + const int depth = rect->depth; \ const uint64_t max = (1 << 24) - 1; \ const uint64_t add = (1 << 23); \ - const int w = td->w, h = td->h; \ - const int xcenter = td->xcenter; \ - const int ycenter = td->ycenter; \ + const int w = rect->planewidth[plane], h = rect->planeheight[plane]; \ + const int xcenter = rect->cx * w; \ + const int ycenter = rect->cy * h; \ const int start = (h * job ) / nb_jobs; \ const int end = (h * (job+1)) / nb_jobs; \ - const int plane = td->plane; \ const int inlinesize = in->linesize[plane] / sizeof(type); \ const int outlinesize = out->linesize[plane] / sizeof(type); \ const type *indata = (const type *)in->data[plane]; \ @@ -146,7 +143,7 @@ static int filter##name##_slice_bilinear(AVFilterContext *ctx, void *arg, \ \ for (int j = 0; j < w; j++) { \ const int off_x = j - xcenter; \ - const int64_t radius_mult = td->correction[j + i*w]; \ + const int64_t radius_mult = correction[j + i*w]; \ const int x = xcenter + ((radius_mult * off_x + (1<<23)) >> 24); \ const int y = ycenter + ((radius_mult * off_y + (1<<23)) >> 24); \ const char isvalid = x >= 0 && x <= w - 1 && y >= 0 && y <= h - 1; \ @@ -227,10 +224,8 @@ static av_cold void uninit(AVFilterContext *ctx) static void calc_correction(AVFilterContext *ctx, int plane) { LenscorrectionCtx *rect = ctx->priv; - int hsub = plane == 1 || plane == 2 ? rect->hsub : 0; - int vsub = plane == 1 || plane == 2 ? rect->vsub : 0; - int w = AV_CEIL_RSHIFT(rect->width, hsub); - int h = AV_CEIL_RSHIFT(rect->height, vsub); + int w = rect->planewidth[plane]; + int h = rect->planeheight[plane]; int xcenter = rect->cx * w; int ycenter = rect->cy * h; int k1 = rect->k1 * (1<<24); @@ -263,8 +258,10 @@ static int config_output(AVFilterLink *outlink) ff_fill_rgba_map(rgba_map, inlink->format); rect->depth = pixdesc->comp[0].depth; factor = 1 << (rect->depth - 8); - rect->hsub = pixdesc->log2_chroma_w; - rect->vsub = pixdesc->log2_chroma_h; + rect->planeheight[1] = rect->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, pixdesc->log2_chroma_h); + rect->planeheight[0] = rect->planeheight[3] = inlink->h; + rect->planewidth[1] = rect->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, pixdesc->log2_chroma_w); + rect->planewidth[0] = rect->planewidth[3] = inlink->w; outlink->w = rect->width = inlink->w; outlink->h = rect->height = inlink->h; rect->nb_planes = av_pix_fmt_count_planes(inlink->format); @@ -285,10 +282,8 @@ static int config_output(AVFilterLink *outlink) } for (int plane = 0; plane < rect->nb_planes; plane++) { - int hsub = plane == 1 || plane == 2 ? rect->hsub : 0; - int vsub = plane == 1 || plane == 2 ? rect->vsub : 0; - int w = AV_CEIL_RSHIFT(rect->width, hsub); - int h = AV_CEIL_RSHIFT(rect->height, vsub); + int w = rect->planewidth[plane]; + int h = rect->planeheight[plane]; if (!rect->correction[plane]) rect->correction[plane] = av_malloc_array(w, h * sizeof(**rect->correction)); @@ -300,13 +295,24 @@ static int config_output(AVFilterLink *outlink) return 0; } +static int filter_slice(AVFilterContext *ctx, void *arg, int job, + int nb_jobs) +{ + LenscorrectionCtx *rect = ctx->priv; + + for (int plane = 0; plane < rect->nb_planes; plane++) + rect->filter_slice(ctx, arg, job, nb_jobs, plane); + + return 0; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; - LenscorrectionCtx *rect = (LenscorrectionCtx*)ctx->priv; + LenscorrectionCtx *rect = ctx->priv; AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - int plane; + ThreadData td; if (!out) { av_frame_free(&in); @@ -315,28 +321,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) av_frame_copy_props(out, in); - for (plane = 0; plane < rect->nb_planes; ++plane) { - int hsub = plane == 1 || plane == 2 ? rect->hsub : 0; - int vsub = plane == 1 || plane == 2 ? rect->vsub : 0; - int w = AV_CEIL_RSHIFT(rect->width, hsub); - int h = AV_CEIL_RSHIFT(rect->height, vsub); - int xcenter = rect->cx * w; - int ycenter = rect->cy * h; - ThreadData td = { - .in = in, - .out = out, - .w = w, - .h = h, - .xcenter = xcenter, - .ycenter = ycenter, - .plane = plane, - .depth = rect->depth, - .fill_color = rect->fill_color[plane], - .correction = rect->correction[plane], - }; - - ctx->internal->execute(ctx, rect->filter_slice, &td, NULL, FFMIN(h, ff_filter_get_nb_threads(ctx))); - } + td.in = in; td.out = out; + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(rect->planeheight[1], ff_filter_get_nb_threads(ctx))); av_frame_free(&in); return ff_filter_frame(outlink, out);

1 0

avfilter/vf_lenscorrection: add support for commands
by Paul B Mahol 26 Jan '21

26 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jan 26 19:43:03 2021 +0100| [46f170e544e1fdf567dc9bcffe8fa3d3e6310357] | committer: Paul B Mahol avfilter/vf_lenscorrection: add support for commands > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46f170e544e1fdf56… --- doc/filters.texi | 4 ++ libavfilter/vf_lenscorrection.c | 88 ++++++++++++++++++++++++++++------------- 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index c35bda46eb..8870457f8e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -13468,6 +13468,10 @@ The formula that generates the correction is: where @var{r_0} is halve of the image diagonal and @var{r_src} and @var{r_tgt} are the distances from the focal point in the source and target images, respectively. +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @section lensfun Apply lens correction via the lensfun library (@url{http://lensfun.sourceforge.net/}). diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c index 7b0997ac4a..4d30d445df 100644 --- a/libavfilter/vf_lenscorrection.c +++ b/libavfilter/vf_lenscorrection.c @@ -54,7 +54,7 @@ typedef struct LenscorrectionCtx { } LenscorrectionCtx; #define OFFSET(x) offsetof(LenscorrectionCtx, x) -#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM static const AVOption lenscorrection_options[] = { { "cx", "set relative center x", OFFSET(cx), AV_OPT_TYPE_DOUBLE, {.dbl=0.5}, 0, 1, .flags=FLAGS }, { "cy", "set relative center y", OFFSET(cy), AV_OPT_TYPE_DOUBLE, {.dbl=0.5}, 0, 1, .flags=FLAGS }, @@ -224,7 +224,33 @@ static av_cold void uninit(AVFilterContext *ctx) } } -static int config_props(AVFilterLink *outlink) +static void calc_correction(AVFilterContext *ctx, int plane) +{ + LenscorrectionCtx *rect = ctx->priv; + int hsub = plane == 1 || plane == 2 ? rect->hsub : 0; + int vsub = plane == 1 || plane == 2 ? rect->vsub : 0; + int w = AV_CEIL_RSHIFT(rect->width, hsub); + int h = AV_CEIL_RSHIFT(rect->height, vsub); + int xcenter = rect->cx * w; + int ycenter = rect->cy * h; + int k1 = rect->k1 * (1<<24); + int k2 = rect->k2 * (1<<24); + const int64_t r2inv = (4LL<<60) / (w * w + h * h); + + for (int j = 0; j < h; j++) { + const int off_y = j - ycenter; + const int off_y2 = off_y * off_y; + for (int i = 0; i < w; i++) { + const int off_x = i - xcenter; + const int64_t r2 = ((off_x * off_x + off_y2) * r2inv + (1LL<<31)) >> 32; + const int64_t r4 = (r2 * r2 + (1<<27)) >> 28; + const int radius_mult = (r2 * k1 + r4 * k2 + (1LL<<27) + (1LL<<52))>>28; + rect->correction[plane][j * w + i] = radius_mult; + } + } +} + +static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; LenscorrectionCtx *rect = ctx->priv; @@ -257,7 +283,21 @@ static int config_props(AVFilterLink *outlink) rect->fill_color[2] = RGB_TO_V_BT709(rect->fill_rgba[0], rect->fill_rgba[1], rect->fill_rgba[2], 0) * factor; rect->fill_color[3] = rect->fill_rgba[3] * factor; } - return 0; + + for (int plane = 0; plane < rect->nb_planes; plane++) { + int hsub = plane == 1 || plane == 2 ? rect->hsub : 0; + int vsub = plane == 1 || plane == 2 ? rect->vsub : 0; + int w = AV_CEIL_RSHIFT(rect->width, hsub); + int h = AV_CEIL_RSHIFT(rect->height, vsub); + + if (!rect->correction[plane]) + rect->correction[plane] = av_malloc_array(w, h * sizeof(**rect->correction)); + if (!rect->correction[plane]) + return AVERROR(ENOMEM); + calc_correction(ctx, plane); + } + + return 0; } static int filter_frame(AVFilterLink *inlink, AVFrame *in) @@ -282,8 +322,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) int h = AV_CEIL_RSHIFT(rect->height, vsub); int xcenter = rect->cx * w; int ycenter = rect->cy * h; - int k1 = rect->k1 * (1<<24); - int k2 = rect->k2 * (1<<24); ThreadData td = { .in = in, .out = out, @@ -294,29 +332,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) .plane = plane, .depth = rect->depth, .fill_color = rect->fill_color[plane], + .correction = rect->correction[plane], }; - if (!rect->correction[plane]) { - int i,j; - const int64_t r2inv = (4LL<<60) / (w * w + h * h); - - rect->correction[plane] = av_malloc_array(w, h * sizeof(**rect->correction)); - if (!rect->correction[plane]) - return AVERROR(ENOMEM); - for (j = 0; j < h; j++) { - const int off_y = j - ycenter; - const int off_y2 = off_y * off_y; - for (i = 0; i < w; i++) { - const int off_x = i - xcenter; - const int64_t r2 = ((off_x * off_x + off_y2) * r2inv + (1LL<<31)) >> 32; - const int64_t r4 = (r2 * r2 + (1<<27)) >> 28; - const int radius_mult = (r2 * k1 + r4 * k2 + (1LL<<27) + (1LL<<52))>>28; - rect->correction[plane][j * w + i] = radius_mult; - } - } - } - - td.correction = rect->correction[plane]; ctx->internal->execute(ctx, rect->filter_slice, &td, NULL, FFMIN(h, ff_filter_get_nb_threads(ctx))); } @@ -324,6 +342,21 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return ff_filter_frame(outlink, out); } +static int process_command(AVFilterContext *ctx, + const char *cmd, + const char *arg, + char *res, + int res_len, + int flags) +{ + int ret = ff_filter_process_command(ctx, cmd, arg, res, res_len, flags); + + if (ret < 0) + return ret; + + return config_output(ctx->outputs[0]); +} + static const AVFilterPad lenscorrection_inputs[] = { { .name = "default", @@ -337,7 +370,7 @@ static const AVFilterPad lenscorrection_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_props, + .config_props = config_output, }, { NULL } }; @@ -352,4 +385,5 @@ AVFilter ff_vf_lenscorrection = { .priv_class = &lenscorrection_class, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .process_command = process_command, };

1 0

avcodec/cri: Fix whitespace issue in unpack_10bit()
by Michael Niedermayer 26 Jan '21

26 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Jan 26 19:52:10 2021 +0100| [33f6d8e37638304193df575fe5609808606dc188] | committer: Michael Niedermayer avcodec/cri: Fix whitespace issue in unpack_10bit() Found-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33f6d8e3763830419… --- libavcodec/cri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cri.c b/libavcodec/cri.c index 41be29eabb..f7c3b4ef48 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -80,7 +80,7 @@ static void unpack_10bit(GetByteContext *gb, uint16_t *dst, int shift, int pos = 0; while (count > 0) { - uint32_t a0, a1,a2,a3; + uint32_t a0, a1, a2, a3; if (bytestream2_get_bytes_left(gb) < 4) break; a0 = bytestream2_get_le32(gb);

1 0

avformat/realtextdec: Avoid undefined overflow in the end of read_ts()
by Michael Niedermayer 26 Jan '21

26 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Jan 16 23:37:41 2021 +0100| [aa1b8e6898f861cc065c3b0fe315e826a324d0a9] | committer: Michael Niedermayer avformat/realtextdec: Avoid undefined overflow in the end of read_ts() Fixes: signed integer overflow: 234080282628234040 * 100 cannot be represented in type 'long long' Fixes: 26910/clusterfuzz-testcase-minimized-ffmpeg_dem_REALTEXT_fuzzer-6649867065753600 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa1b8e6898f861cc0… --- libavformat/realtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/realtextdec.c b/libavformat/realtextdec.c index 390f8ddc67..f534774420 100644 --- a/libavformat/realtextdec.c +++ b/libavformat/realtextdec.c @@ -54,7 +54,7 @@ static int64_t read_ts(const char *s) if (sscanf(s, "%u:%u.%u", &mm, &ss, &ms) == 3) return ( mm*60LL + ss) * 100LL + ms; if (sscanf(s, "%u:%u" , &mm, &ss ) == 2) return ( mm*60LL + ss) * 100LL; if (sscanf(s, "%u.%u", &ss, &ms) == 2) return ( ss) * 100LL + ms; - return strtol(s, NULL, 10) * 100LL; + return strtoll(s, NULL, 10) * 100ULL; } static int realtext_read_header(AVFormatContext *s)

1 0