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

avcodec/siren: remove constant region_size
by Michael Niedermayer 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Dec 24 21:32:41 2020 +0100| [1208872946c8c66a59df709c901b4dc1e84efb69] | committer: Michael Niedermayer avcodec/siren: remove constant region_size Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1208872946c8c66a5… --- libavcodec/siren.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 3d0cdd4554..2d72fb9572 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -353,6 +353,7 @@ static const float noise_category6[20] = { }; #define FRAME_SIZE 320 +#define REGION_SIZE 20 typedef struct SirenContext { GetBitContext gb; @@ -362,7 +363,6 @@ typedef struct SirenContext { int number_of_regions; int scale_factor; int sample_rate_bits; - int region_size; unsigned dw1, dw2, dw3, dw4; @@ -403,7 +403,6 @@ static av_cold int siren_init(AVCodecContext *avctx) s->esf_adjustment = 7; s->number_of_regions = 14; s->scale_factor = 22; - s->region_size = 20; s->dw1 = s->dw2 = s->dw3 = s->dw4 = 1; for (i = 0; i < 64; i++) { @@ -575,7 +574,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, for (region = 0; region < number_of_regions; region++) { category = power_categories[region]; - coefs_ptr = coefs + (region * s->region_size); + coefs_ptr = coefs + (region * REGION_SIZE); if (category >= 0 && category < 7) { decoder_tree = decoder_tables[category]; @@ -624,11 +623,11 @@ static int decode_vector(SirenContext *s, int number_of_regions, } } - coefs_ptr = coefs + (region * s->region_size); + coefs_ptr = coefs + (region * REGION_SIZE); if (category == 5) { i = 0; - for (j = 0; j < s->region_size; j++) { + for (j = 0; j < REGION_SIZE; j++) { if (*coefs_ptr != 0) i++; coefs_ptr++; @@ -637,7 +636,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, noise = decoder_standard_deviation[region] * noise_category5[i]; } else if (category == 6) { i = 0; - for (j = 0; j < s->region_size; j++) { + for (j = 0; j < REGION_SIZE; j++) { if (*coefs_ptr++ != 0) i++; } @@ -649,7 +648,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, noise = 0; } - coefs_ptr = coefs + (region * s->region_size); + coefs_ptr = coefs + (region * REGION_SIZE); if (category == 5 || category == 6 || category == 7) { dw1 = get_dw(s);

1 0

avformat/mpc8: Check size before implicitly converting to int
by Michael Niedermayer 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Dec 24 20:42:27 2020 +0100| [78d6d8ddb571ecca54616517defbf894a45ea9c3] | committer: Michael Niedermayer avformat/mpc8: Check size before implicitly converting to int Fixes: Timeout Fixes: 28551/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-6229183210586112 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=78d6d8ddb571ecca5… --- libavformat/mpc8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 447a8d4fdf..ff7da2ef55 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -292,7 +292,7 @@ static int mpc8_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; mpc8_get_chunk_header(s->pb, &tag, &size); - if (size < 0) + if (size < 0 || size > INT_MAX) return -1; if(tag == TAG_AUDIOPACKET){ if ((ret = av_get_packet(s->pb, pkt, size)) < 0)

1 0

doc/filters: mention commands support for pseudocolor
by Paul B Mahol 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Jan 28 20:54:58 2021 +0100| [ed51890191d660829eef2d1eef802da957b7fef0] | committer: Paul B Mahol doc/filters: mention commands support for pseudocolor > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed51890191d660829… --- doc/filters.texi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 8ce5a82f39..a88d834d75 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16246,6 +16246,10 @@ The maximum allowed component value. All expressions default to "val". +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @subsection Examples @itemize

1 0

avfilter/vf_pseudocolor: add support for commands
by Paul B Mahol 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Jan 28 15:39:16 2021 +0100| [61a0ff892ee74ee710aa88ebecc50440fe48bc46] | committer: Paul B Mahol avfilter/vf_pseudocolor: add support for commands > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61a0ff892ee74ee71… --- libavfilter/vf_pseudocolor.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 9dfcecfa55..21c054adff 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -127,7 +127,7 @@ typedef struct PseudoColorContext { } PseudoColorContext; #define OFFSET(x) offsetof(PseudoColorContext, 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 pseudocolor_options[] = { { "c0", "set component #0 expression", OFFSET(comp_expr_str[0]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS }, @@ -720,6 +720,17 @@ 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 *args, + char *res, int res_len, int flags) +{ + int ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + + if (ret < 0) + return ret; + + return config_input(ctx->inputs[0]); +} + static const AVFilterPad inputs[] = { { .name = "default", @@ -761,4 +772,5 @@ AVFilter ff_vf_pseudocolor = { .inputs = inputs, .outputs = outputs, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .process_command = process_command, };

1 0

avfilter/vf_pseudocolor: use macro for code that repeats
by Paul B Mahol 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Jan 28 15:30:57 2021 +0100| [891da955af52a6ef2b8821b2a5218a8fcb31d80e] | committer: Paul B Mahol avfilter/vf_pseudocolor: use macro for code that repeats > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=891da955af52a6ef2… --- libavfilter/vf_pseudocolor.c | 67 +++++++++++--------------------------------- 1 file changed, 17 insertions(+), 50 deletions(-) diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 2cba46e3da..9dfcecfa55 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -183,6 +183,13 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, fmts_list); } +#define PCLIP(v, max, dst, src, x) \ + if (v >= 0 && v <= max) { \ + dst[x] = v; \ + } else { \ + dst[x] = src[x]; \ + } + static void pseudocolor_filter(int max, int width, int height, const uint8_t *index, const uint8_t *src, @@ -198,11 +205,7 @@ static void pseudocolor_filter(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize; src += slinesize; @@ -225,11 +228,7 @@ static void pseudocolor_filter_11(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[(y << 1) * ilinesize + (x << 1)]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } src += slinesize; dst += dlinesize; @@ -251,11 +250,7 @@ static void pseudocolor_filter_11d(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[(y >> 1) * ilinesize + (x >> 1)]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } src += slinesize; dst += dlinesize; @@ -277,11 +272,7 @@ static void pseudocolor_filter_10(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x << 1]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize; src += slinesize; @@ -304,11 +295,7 @@ static void pseudocolor_filter_10d(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x >> 1]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize; src += slinesize; @@ -334,11 +321,7 @@ static void pseudocolor_filter_16(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize / 2; src += slinesize / 2; @@ -364,11 +347,7 @@ static void pseudocolor_filter_16_10(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x << 1]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize / 2; src += slinesize / 2; @@ -394,11 +373,7 @@ static void pseudocolor_filter_16_10d(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[x >> 1]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } index += ilinesize / 2; src += slinesize / 2; @@ -428,11 +403,7 @@ static void pseudocolor_filter_16_11(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[(y << 1) * ilinesize + (x << 1)]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } src += slinesize; dst += dlinesize; @@ -461,11 +432,7 @@ static void pseudocolor_filter_16_11d(int max, int width, int height, for (x = 0; x < width; x++) { int v = lut[index[(y >> 1) * ilinesize + (x >> 1)]]; - if (v >= 0 && v <= max) { - dst[x] = v; - } else { - dst[x] = src[x]; - } + PCLIP(v, max, dst, src, x); } src += slinesize; dst += dlinesize;

1 0

avfilter/vf_pseudocolor: add presets
by Paul B Mahol 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Jan 28 15:13:58 2021 +0100| [d01aa49753ba02d45f635a3dd66ea5df5de0393e] | committer: Paul B Mahol avfilter/vf_pseudocolor: add presets > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d01aa49753ba02d45… --- doc/filters.texi | 14 ++++++ libavfilter/vf_pseudocolor.c | 109 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index fb9995eddf..8ce5a82f39 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16208,6 +16208,20 @@ set pixel fourth component expression, corresponds to the alpha component @item i set component to use as base for altering colors + +@item p +Pick one of built-in LUTs. By default is set to none. + +Available LUTs: +@table @samp +@item magma +@item inferno +@item plasma +@item viridis +@item turbo +@item cividis +@end table + @end table Each of them specifies the expression to use for computing the lookup table for diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 4c24f49bd9..2cba46e3da 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -59,8 +59,53 @@ enum var_name { VAR_VARS_NB }; +enum ColorMaps { + MAGMA, + INFERNO, + PLASMA, + VIRIDIS, + TURBO, + CIVIDIS, + NB_CMAPS, +}; + +static const double presets[][3][8] = +{ + [MAGMA] = { + {-7.5631093e-16, 7.4289183e-13, -2.8525484e-10, 5.4446085e-08, -5.5596238e-06, 3.0569325e-04, -2.3137421e-03, 1.2152095e-02 }, + { 1.3217636e-15, -1.2214648e-12, 4.4319712e-10, -8.0197993e-08, 7.6598370e-06, -3.6523704e-04, 8.4836670e-03, -2.5536888e-02 }, + {-1.1446568e-15, 1.0013446e-12, -3.5651575e-10, 6.6775016e-08, -6.7120346e-06, 2.7346619e-04, 4.7969657e-03, 1.1971441e-02 }, + }, + [INFERNO] = { + {-3.9848859e-18, 9.4821649e-14, -6.7371977e-11, 1.8469937e-08, -2.5359307e-06, 1.7959053e-04, 3.9782564e-04, 2.8845935e-04 }, + { 6.8408539e-16, -6.5499979e-13, 2.4562526e-10, -4.5989298e-08, 4.5723324e-06, -2.2111913e-04, 5.2023164e-03, -1.1226064e-02 }, + {-2.9921470e-15, 2.5864165e-12, -8.7403799e-10, 1.4713388e-07, -1.2701505e-05, 4.5159935e-04, 3.1087989e-03, 1.9122831e-02 }, + }, + [PLASMA] = { + { 3.6196089e-16, -3.3623041e-13, 1.2324010e-10, -2.2769060e-08, 2.2297792e-06, -1.2567829e-04, 9.9791629e-03, 5.7247918e-02 }, + { 5.0262888e-16, -5.3193896e-13, 2.2451715e-10, -4.7529623e-08, 5.1374873e-06, -2.3260136e-04, 3.1502825e-03, 1.5362491e-02 }, + {-1.7782261e-16, 2.2487839e-13, -1.0610236e-10, 2.4112644e-08, -2.6331623e-06, 8.9499751e-05, 2.1386328e-03, 5.3824268e-01 }, + }, + [VIRIDIS] = { + { 9.4850045e-16, -8.6629383e-13, 3.0310944e-10, -5.1340396e-08, 4.6024275e-06, -2.2744239e-04, 4.5559993e-03, 2.5662350e-01 }, + { 9.6461041e-17, -6.9209477e-14, 1.7625397e-11, -2.0229773e-09, 1.4900110e-07, -1.9315187e-05, 5.8967339e-03, 3.9544827e-03 }, + { 5.1785449e-16, -3.6663004e-13, 1.0249990e-10, -1.5431998e-08, 1.5007941e-06, -1.2001502e-04, 7.6951526e-03, 3.2292815e-01 }, + }, + [TURBO] = { + {-4.3683890e-15, 3.7020347e-12, -1.1712592e-09, 1.6401790e-07, -8.6842919e-06, -1.8542465e-06, 8.4485325e-03, 1.6267077e-01 }, + {-4.0011069e-16, 2.7861423e-13, -6.3388921e-11, 5.8872238e-09, -5.4466522e-07, 1.8037114e-05, 1.0599869e-02, 7.6914696e-02 }, + {-2.8242609e-15, 2.9234108e-12, -1.1726546e-09, 2.2552115e-07, -2.0059387e-05, 5.0595552e-04, 1.7714932e-02, 2.7271836e-01 }, + }, + [CIVIDIS] = { + {-9.5484131e-16, 9.6988184e-13, -4.0058766e-10, 8.5743924e-08, -9.9644797e-06, 5.9197908e-04, -1.0361579e-02, 3.3164429e-02 }, + { 1.2731941e-17, -9.4238449e-15, 2.2808841e-12, -1.1548296e-10, -2.3888913e-08, 3.8986680e-06, 2.5879330e-03, 1.2769733e-01 }, + { 4.6004608e-16, -5.0686849e-13, 2.2753449e-10, -5.3074099e-08, 6.7196096e-06, -4.4120020e-04, 1.3435551e-02, 2.8293355e-01 }, + }, +}; + typedef struct PseudoColorContext { const AVClass *class; + int preset; int max; int index; int nb_planes; @@ -90,6 +135,14 @@ static const AVOption pseudocolor_options[] = { { "c2", "set component #2 expression", OFFSET(comp_expr_str[2]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS }, { "c3", "set component #3 expression", OFFSET(comp_expr_str[3]), AV_OPT_TYPE_STRING, {.str="val"}, .flags = FLAGS }, { "i", "set component as base", OFFSET(index), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, .flags = FLAGS }, + { "p", "set preset", OFFSET(preset), AV_OPT_TYPE_INT, {.i64=-1},-1,NB_CMAPS-1, .flags = FLAGS, "preset" }, + { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=-1},.flags = FLAGS, "preset" }, + { "magma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MAGMA}, .flags = FLAGS, "preset" }, + { "inferno", NULL, 0, AV_OPT_TYPE_CONST, {.i64=INFERNO}, .flags = FLAGS, "preset" }, + { "plasma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PLASMA}, .flags = FLAGS, "preset" }, + { "viridis", NULL, 0, AV_OPT_TYPE_CONST, {.i64=VIRIDIS}, .flags = FLAGS, "preset" }, + { "turbo", NULL, 0, AV_OPT_TYPE_CONST, {.i64=TURBO}, .flags = FLAGS, "preset" }, + { "cividis", NULL, 0, AV_OPT_TYPE_CONST, {.i64=CIVIDIS}, .flags = FLAGS, "preset" }, { NULL } }; @@ -419,14 +472,39 @@ static void pseudocolor_filter_16_11d(int max, int width, int height, } } +#define RGB_TO_Y_BT709(r, g, b) \ +((0.21260*219.0/255.0) * (r) + (0.71520*219.0/255.0) * (g) + \ + (0.07220*219.0/255.0) * (b)) + +#define RGB_TO_U_BT709(r1, g1, b1, max) \ +(-(0.11457*224.0/255.0) * r1 - (0.38543*224.0/255.0) * g1 + \ + (0.50000*224.0/255.0) * b1 + max * 0.5) + +#define RGB_TO_V_BT709(r1, g1, b1, max) \ +((0.50000*224.0/255.0) * r1 - (0.45415*224.0/255.0) * g1 - \ + (0.04585*224.0/255.0) * b1 + max * 0.5) + +static double poly_eval(const double *const poly, double x) +{ + double res = 0.; + + for (int i = 0; i < 8; i++) { + res += pow(x, i) * poly[7-i]; + } + + return av_clipd(res, 0., 1.); +} + static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; PseudoColorContext *s = ctx->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); - int depth, ret, hsub, vsub, color; + int depth, ret, hsub, vsub, color, factor, rgb; + rgb = desc->flags & AV_PIX_FMT_FLAG_RGB; depth = desc->comp[0].depth; + factor = 1 << (depth - 8); s->max = (1 << depth) - 1; s->nb_planes = av_pix_fmt_count_planes(inlink->format); @@ -457,7 +535,7 @@ static int config_input(AVFilterLink *inlink) s->var_values[VAR_VMAX] = 240 * (1 << (depth - 8)); s->var_values[VAR_AMAX] = s->max; - for (color = 0; color < s->nb_planes; color++) { + for (color = 0; color < s->nb_planes && s->preset < 0; color++) { double res; int val; @@ -488,6 +566,33 @@ static int config_input(AVFilterLink *inlink) } } + if (s->preset >= 0) { + for (int i = 0; i < 256; i++) { + for (int j = 0; j < factor; j++) { + const double lf = j / (double)factor; + double r, g, b; + + g = poly_eval(presets[s->preset][1], i + lf) * s->max; + b = poly_eval(presets[s->preset][2], i + lf) * s->max; + r = poly_eval(presets[s->preset][0], i + lf) * s->max; + + if (!rgb) { + double y = RGB_TO_Y_BT709(r, g, b); + double u = RGB_TO_U_BT709(r, g, b, s->max); + double v = RGB_TO_V_BT709(r, g, b, s->max); + + r = v; + g = y; + b = u; + } + + s->lut[0][i*factor+j] = g; + s->lut[1][i*factor+j] = b; + s->lut[2][i*factor+j] = r; + } + } + } + switch (inlink->format) { case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_YUVA444P:

1 0

avcodec/xbmenc: Allow for making UW images
by Jose Da Silva 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Jose Da Silva <digital(a)joescat.com> | Mon Jan 18 21:43:13 2021 -0800| [c31a7d07f6f22a94b7f44dcb73c025b2d78cfc66] | committer: Paul B Mahol avcodec/xbmenc: Allow for making UW images I've run into some bugs where I was downloading a bunch of data and began seeing weird hiccups. For example, javascript promises to allow you to push some very long lines of data, but the hiccups I saw was with data larger than 2k in length (windows) pushed out of a child process stdout piped into the stdin of the calling parent program. Soo much for smooth promises, this was broken and would run into similar problems on a linux PC with 32k line limits. The solution was to break the data into smaller chunks than 2k - and then these data hiccups disappeared (windows PC). It would be expected to be similar for linux PCs (32k I think) and other OSes with different sizes. If the ANSI required minimum needs to be 509 chars or larger (assuming 509+<CR>+<LF>+<0>=512), then 509 was chosen as the shortest worst-case scenario) in this patch. Most small pictures will go output looking pretty much the same data out until you get to about 84bytes (672 pixels wide), where lines out begin to be split. For example a UW 4K will exceed a 2k readln and a UW 10K picture approaches an 8k readln The purpose for this patch is to ensure that data remains below the readline limits (of 509 chars), so that programs (like javascript) can push data in large chunks without breaking into hiccups because the data length is too long to be pushed cleanly in one go. Subject: [PATCH 3/3] avcodec/xbmenc: Allow for making UW images Worst-case ANSI must allow for 509 chars, while Windows allows for 2048 and Linux for 32K line length. This allows an OS with a small readline access limitation to fetch very wide images (created from ffmpeg). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c31a7d07f6f22a94b… --- libavcodec/xbmenc.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index 193ced652a..1cf13f6f0b 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -24,15 +24,25 @@ #include "internal.h" #include "mathops.h" +#define ANSI_MIN_READLINE 509 + static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *p, int *got_packet) { - int i, j, commas, ret, size, linesize; + int i, j, l, commas, ret, size, linesize, lineout, rowsout; uint8_t *ptr, *buf; - linesize = (avctx->width + 7) / 8; + linesize = lineout = (avctx->width + 7) / 8; commas = avctx->height * linesize; - size = avctx->height * (linesize * 6 + 1) + 106; + + /* ANSI worst case minimum readline is 509 chars. */ + rowsout = avctx->height; + if (lineout > (ANSI_MIN_READLINE / 6)) { + lineout = ANSI_MIN_READLINE / 6; + rowsout = (commas + lineout - 1) / lineout; + } + + size = rowsout * (lineout * 6 + 1) + 106; if ((ret = ff_alloc_packet2(avctx, pkt, size, 0)) < 0) return ret; @@ -42,14 +52,20 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, buf += snprintf(buf, 32, "#define image_width %u\n", avctx->width); buf += snprintf(buf, 33, "#define image_height %u\n", avctx->height); buf += snprintf(buf, 39, "static unsigned char image_bits[] = {\n"); - for (i = 0; i < avctx->height; i++) { + for (i = 0, l = lineout; i < avctx->height; i++) { for (j = 0; j < linesize; j++) { buf += snprintf(buf, 6, " 0x%02X", ff_reverse[*ptr++]); - if (--commas > 0) - buf += snprintf(buf, 2, ","); + if (--commas <= 0) { + buf += snprintf(buf, 2, "\n"); + break; + } + buf += snprintf(buf, 2, ","); + if (--l <= 0) { + buf += snprintf(buf, 2, "\n"); + l = lineout; + } } ptr += p->linesize[0] - linesize; - buf += snprintf(buf, 2, "\n"); } buf += snprintf(buf, 5, " };\n");

1 0

avcodec/xbmenc: xbm Lower memory use
by Jose Da Silva 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Jose Da Silva <digital(a)joescat.com> | Mon Jan 18 21:43:05 2021 -0800| [cb70e1921aeda4df11ad77ee550e7bdcdca2b834] | committer: Paul B Mahol avcodec/xbmenc: xbm Lower memory use Two minor memory improvements. First bug reduces memory needed to about 6/7 the needed amount, which allows you to host almost 7 pictures in the same memory needed for 6 Second is a recalculation of the total additional memory for headers etc. size = avctx->height x (linesize * 6 + 1) + (31+32+38+4+1) Subject: [PATCH 2/3] avcodec/xbmenc: xbm Lower memory use Small 6/7th size memory reduction. size = avctx->height x (linesize * 6 + 1) + (31+32+38+4+1) Signed-off-by: Joe Da Silva <digital(a)joescat.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb70e1921aeda4df1… --- libavcodec/xbmenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index 3fc0e3185a..193ced652a 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -32,7 +32,7 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, linesize = (avctx->width + 7) / 8; commas = avctx->height * linesize; - size = avctx->height * (linesize * 7 + 2) + 109; + size = avctx->height * (linesize * 6 + 1) + 106; if ((ret = ff_alloc_packet2(avctx, pkt, size, 0)) < 0) return ret; @@ -41,7 +41,7 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, buf += snprintf(buf, 32, "#define image_width %u\n", avctx->width); buf += snprintf(buf, 33, "#define image_height %u\n", avctx->height); - buf += snprintf(buf, 40, "static unsigned char image_bits[] = {\n"); + buf += snprintf(buf, 39, "static unsigned char image_bits[] = {\n"); for (i = 0; i < avctx->height; i++) { for (j = 0; j < linesize; j++) { buf += snprintf(buf, 6, " 0x%02X", ff_reverse[*ptr++]);

1 0

avcodec/xbmenc: Do not add last comma into output
by Jose Da Silva 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Jose Da Silva <digital(a)joescat.com> | Mon Jan 18 21:42:57 2021 -0800| [41b8fd3a16a0c8f2de71a5338fb4f086bd857124] | committer: Paul B Mahol avcodec/xbmenc: Do not add last comma into output There is a minor bug in xbm encode which adds a trailing comma at the end of data. This isn't a big problem, but it would be nicer to be more technically true to an array of data (by not including the last comma). This bug fixes the output from something like this (having 4 values): static unsigned char image_bits[] = { 0x00, 0x11, 0x22, } to C code that looks like this instead (having 3 values): static unsigned char image_bits[] = { 0x00, 0x11, 0x22 } which is the intended results. Subject: [PATCH 1/3] avcodec/xbmenc: Do not add last comma into output array xbm outputs c arrays of data. Including a comma at the end means there is another value to be added. This bug fix changes something like this: static unsigned char image_bits[] = { 0x00, 0x11, 0x22, } to C code like this: static unsigned char image_bits[] = { 0x00, 0x11, 0x22 } Signed-off-by: Joe Da Silva <digital(a)joescat.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41b8fd3a16a0c8f2d… --- libavcodec/xbmenc.c | 12 ++++++++---- tests/ref/lavf/xbm | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index b25615f2a4..3fc0e3185a 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -27,11 +27,12 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *p, int *got_packet) { - int i, j, ret, size, linesize; + int i, j, commas, ret, size, linesize; uint8_t *ptr, *buf; linesize = (avctx->width + 7) / 8; - size = avctx->height * (linesize * 7 + 2) + 110; + commas = avctx->height * linesize; + size = avctx->height * (linesize * 7 + 2) + 109; if ((ret = ff_alloc_packet2(avctx, pkt, size, 0)) < 0) return ret; @@ -42,8 +43,11 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, buf += snprintf(buf, 33, "#define image_height %u\n", avctx->height); buf += snprintf(buf, 40, "static unsigned char image_bits[] = {\n"); for (i = 0; i < avctx->height; i++) { - for (j = 0; j < linesize; j++) - buf += snprintf(buf, 7, " 0x%02X,", ff_reverse[*ptr++]); + for (j = 0; j < linesize; j++) { + buf += snprintf(buf, 6, " 0x%02X", ff_reverse[*ptr++]); + if (--commas > 0) + buf += snprintf(buf, 2, ","); + } ptr += p->linesize[0] - linesize; buf += snprintf(buf, 2, "\n"); } diff --git a/tests/ref/lavf/xbm b/tests/ref/lavf/xbm index bc157834ff..e54d6bc226 100644 --- a/tests/ref/lavf/xbm +++ b/tests/ref/lavf/xbm @@ -1,3 +1,3 @@ -0629055fd82366317c651a0af4bb82d7 *tests/data/images/xbm/02.xbm +83ed197cc88f382d9253365ffef70ec5 *tests/data/images/xbm/02.xbm tests/data/images/xbm/%02d.xbm CRC=0xc9a20204 -76411 tests/data/images/xbm/02.xbm +76410 tests/data/images/xbm/02.xbm

1 0

avcodec/flashsv2enc: Fix use of uninitialized value
by Andreas Rheinhardt 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Jan 27 12:24:33 2021 +0100| [9267e2ff0d5b518bcce6236d09f2941b2c1bba84] | committer: Andreas Rheinhardt avcodec/flashsv2enc: Fix use of uninitialized value Before 257a83b969157eb76c18158a4e503e908d8b1125, certain buffers were zero-allocated in the init function and only reallocated lateron if they turned out to be too small; now they are only allocated during init, leading to use-of-uninitialized values lateron. The same could happen before if the dimensions are big enough so that the buffers would be reallocated, as the new part of the reallocated buffer would not be zeroed (happened for 960x960). So always zero the buffers in the function designed to init them. Reviewed-by: Marton Balint <cus(a)passwd.hu> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9267e2ff0d5b518bc… --- libavcodec/flashsv2enc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index 5139b17a28..430b6806c8 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -142,6 +142,7 @@ static void init_blocks(FlashSV2Context * s, Block * blocks, { int row, col; Block *b; + memset(blocks, 0, s->cols * s->rows * sizeof(*blocks)); for (col = 0; col < s->cols; col++) { for (row = 0; row < s->rows; row++) { b = blocks + (col + row * s->cols);

1 0