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

avfilter/af_acrusher: add commands support
by Paul B Mahol 30 Jan '21

30 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jan 30 23:39:55 2021 +0100| [54de7dc372dc77cae0cb9b45987d365e5446399d] | committer: Paul B Mahol avfilter/af_acrusher: add commands support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54de7dc372dc77cae… --- doc/filters.texi | 4 ++++ libavfilter/af_acrusher.c | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 6782be3762..d2f62972dd 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -640,6 +640,10 @@ Set LFO range. Set LFO rate. @end table +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @section acue Delay audio filtering until a given wallclock timestamp. See the @ref{cue} diff --git a/libavfilter/af_acrusher.c b/libavfilter/af_acrusher.c index ddce74465d..d3c31c20bd 100644 --- a/libavfilter/af_acrusher.c +++ b/libavfilter/af_acrusher.c @@ -68,7 +68,7 @@ typedef struct ACrusherContext { } ACrusherContext; #define OFFSET(x) offsetof(ACrusherContext, x) -#define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM +#define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM static const AVOption acrusher_options[] = { { "level_in", "set level in", OFFSET(level_in), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.015625, 64, A }, @@ -325,13 +325,27 @@ static int config_input(AVFilterLink *inlink) s->lfo.srate = inlink->sample_rate; s->lfo.amount = .5; - s->sr = av_calloc(inlink->channels, sizeof(*s->sr)); + if (!s->sr) + s->sr = av_calloc(inlink->channels, sizeof(*s->sr)); if (!s->sr) return AVERROR(ENOMEM); return 0; } +static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, + char *res, int res_len, int flags) +{ + AVFilterLink *inlink = ctx->inputs[0]; + int ret; + + ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + if (ret < 0) + return ret; + + return config_input(inlink); +} + static const AVFilterPad avfilter_af_acrusher_inputs[] = { { .name = "default", @@ -359,4 +373,5 @@ AVFilter ff_af_acrusher = { .query_formats = query_formats, .inputs = avfilter_af_acrusher_inputs, .outputs = avfilter_af_acrusher_outputs, + .process_command = process_command, };

1 0

avfilter/vf_lagfun: add support for commands
by Paul B Mahol 30 Jan '21

30 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jan 30 17:23:26 2021 +0100| [633e344d962fe569e809c9136efe751b9df5575c] | committer: Paul B Mahol avfilter/vf_lagfun: add support for commands > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=633e344d962fe569e… --- doc/filters.texi | 4 ++++ libavfilter/vf_lagfun.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index a87f2fb7cc..6782be3762 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -13458,6 +13458,10 @@ Set factor for decaying. Default is .95. Allowed range is from 0 to 1. Set which planes to filter. Default is all. Allowed range is from 0 to 15. @end table +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @section lenscorrection Correct radial lens distortion diff --git a/libavfilter/vf_lagfun.c b/libavfilter/vf_lagfun.c index 1fbc889e35..0d5b6196ca 100644 --- a/libavfilter/vf_lagfun.c +++ b/libavfilter/vf_lagfun.c @@ -211,7 +211,7 @@ static av_cold void uninit(AVFilterContext *ctx) } #define OFFSET(x) offsetof(LagfunContext, x) -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_RUNTIME_PARAM static const AVOption lagfun_options[] = { { "decay", "set decay", OFFSET(decay), AV_OPT_TYPE_FLOAT, {.dbl=.95}, 0, 1, FLAGS }, @@ -249,4 +249,5 @@ AVFilter ff_vf_lagfun = { .outputs = outputs, .inputs = inputs, .flags = AVFILTER_FLAG_SLICE_THREADS, + .process_command = ff_filter_process_command, };

1 0

avfilter/vf_weave: add slice threading support
by Paul B Mahol 30 Jan '21

30 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jan 30 16:55:56 2021 +0100| [f0dd5c00cb9a1212db1a09b975072bb46b962718] | committer: Paul B Mahol avfilter/vf_weave: add slice threading support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0dd5c00cb9a1212d… --- libavfilter/vf_weave.c | 60 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c index 92b3946795..6139844b20 100644 --- a/libavfilter/vf_weave.c +++ b/libavfilter/vf_weave.c @@ -90,15 +90,51 @@ static int config_props_output(AVFilterLink *outlink) return 0; } +typedef struct ThreadData { + AVFrame *in, *out; +} ThreadData; + +static int weave_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + AVFilterLink *inlink = ctx->inputs[0]; + WeaveContext *s = ctx->priv; + ThreadData *td = arg; + AVFrame *in = td->in; + AVFrame *out = td->out; + + const int weave = (s->double_weave && !(inlink->frame_count_out & 1)); + const int field1 = weave ? s->first_field : (!s->first_field); + const int field2 = weave ? (!s->first_field) : s->first_field; + + for (int i = 0; i < s->nb_planes; i++) { + const int height = s->planeheight[i]; + const int start = (height * jobnr) / nb_jobs; + const int end = (height * (jobnr+1)) / nb_jobs; + + av_image_copy_plane(out->data[i] + out->linesize[i] * field1 + + out->linesize[i] * start * 2, + out->linesize[i] * 2, + in->data[i] + start * in->linesize[i], + in->linesize[i], + s->linesize[i], end - start); + av_image_copy_plane(out->data[i] + out->linesize[i] * field2 + + out->linesize[i] * start * 2, + out->linesize[i] * 2, + s->prev->data[i] + start * s->prev->linesize[i], + s->prev->linesize[i], + s->linesize[i], end - start); + } + + return 0; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; WeaveContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; + ThreadData td; AVFrame *out; - int i; - int weave; - int field1, field2; if (!s->prev) { s->prev = in; @@ -113,19 +149,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } av_frame_copy_props(out, in); - weave = (s->double_weave && !(inlink->frame_count_out & 1)); - field1 = weave ? s->first_field : (!s->first_field); - field2 = weave ? (!s->first_field) : s->first_field; - for (i = 0; i < s->nb_planes; i++) { - av_image_copy_plane(out->data[i] + out->linesize[i] * field1, - out->linesize[i] * 2, - in->data[i], in->linesize[i], - s->linesize[i], s->planeheight[i]); - av_image_copy_plane(out->data[i] + out->linesize[i] * field2, - out->linesize[i] * 2, - s->prev->data[i], s->prev->linesize[i], - s->linesize[i], s->planeheight[i]); - } + td.out = out, td.in = in; + ctx->internal->execute(ctx, weave_slice, &td, NULL, FFMIN(s->planeheight[1], + ff_filter_get_nb_threads(ctx))); out->pts = s->double_weave ? s->prev->pts : in->pts / 2; out->interlaced_frame = 1; @@ -173,6 +199,7 @@ AVFilter ff_vf_weave = { .uninit = uninit, .inputs = weave_inputs, .outputs = weave_outputs, + .flags = AVFILTER_FLAG_SLICE_THREADS, }; static av_cold int init(AVFilterContext *ctx) @@ -198,4 +225,5 @@ AVFilter ff_vf_doubleweave = { .uninit = uninit, .inputs = weave_inputs, .outputs = weave_outputs, + .flags = AVFILTER_FLAG_SLICE_THREADS, };

1 0

avfilter/vf_blackdetect: add slice threading support
by Paul B Mahol 30 Jan '21

30 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jan 30 16:04:28 2021 +0100| [0959f95a8ea03e1fba94f19395fd9e525bada113] | committer: Paul B Mahol avfilter/vf_blackdetect: add slice threading support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0959f95a8ea03e1fb… --- libavfilter/vf_blackdetect.c | 61 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index 5caf99af5c..565a7545e0 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -47,6 +47,8 @@ typedef struct BlackDetectContext { unsigned int nb_black_pixels; ///< number of black pixels counted so far AVRational time_base; int depth; + int nb_threads; + unsigned int *counter; } BlackDetectContext; #define OFFSET(x) offsetof(BlackDetectContext, x) @@ -112,8 +114,12 @@ static int config_input(AVFilterLink *inlink) const int factor = (1 << (depth - 8)); s->depth = depth; + s->nb_threads = ff_filter_get_nb_threads(ctx); s->time_base = inlink->time_base; s->black_min_duration = s->black_min_duration_time / av_q2d(s->time_base); + s->counter = av_calloc(s->nb_threads, sizeof(*s->counter)); + if (!s->counter) + return AVERROR(ENOMEM); s->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ? // luminance_minimum_value + pixel_black_th * luminance_range_size @@ -141,30 +147,56 @@ static void check_black_end(AVFilterContext *ctx) } } -static int filter_frame(AVFilterLink *inlink, AVFrame *picref) +static int black_counter(AVFilterContext *ctx, void *arg, + int jobnr, int nb_jobs) { - AVFilterContext *ctx = inlink->dst; BlackDetectContext *s = ctx->priv; - double picture_black_ratio = 0; + const unsigned int threshold = s->pixel_black_th_i; + unsigned int *counterp = &s->counter[jobnr]; + AVFrame *in = arg; + const int linesize = in->linesize[0]; + const int w = in->width; + const int h = in->height; + const int start = (h * jobnr) / nb_jobs; + const int end = (h * (jobnr+1)) / nb_jobs; + const int size = end - start; + unsigned int counter = 0; if (s->depth == 8) { - const uint8_t *p = picref->data[0]; + const uint8_t *p = in->data[0] + start * linesize; - for (int i = 0; i < inlink->h; i++) { - for (int x = 0; x < inlink->w; x++) - s->nb_black_pixels += p[x] <= s->pixel_black_th_i; - p += picref->linesize[0]; + for (int i = 0; i < size; i++) { + for (int x = 0; x < w; x++) + counter += p[x] <= threshold; + p += linesize; } } else { - const uint16_t *p = (const uint16_t *)picref->data[0]; + const uint16_t *p = (const uint16_t *)(in->data[0] + start * linesize); - for (int i = 0; i < inlink->h; i++) { - for (int x = 0; x < inlink->w; x++) - s->nb_black_pixels += p[x] <= s->pixel_black_th_i; - p += picref->linesize[0] / 2; + for (int i = 0; i < size; i++) { + for (int x = 0; x < w; x++) + counter += p[x] <= threshold; + p += linesize / 2; } } + *counterp = counter; + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *picref) +{ + AVFilterContext *ctx = inlink->dst; + BlackDetectContext *s = ctx->priv; + double picture_black_ratio = 0; + + ctx->internal->execute(ctx, black_counter, picref, NULL, + FFMIN(inlink->h, s->nb_threads)); + + for (int i = 0; i < s->nb_threads; i++) + s->nb_black_pixels += s->counter[i]; + picture_black_ratio = (double)s->nb_black_pixels / (inlink->w * inlink->h); av_log(ctx, AV_LOG_DEBUG, @@ -199,6 +231,8 @@ static av_cold void uninit(AVFilterContext *ctx) { BlackDetectContext *s = ctx->priv; + av_freep(&s->counter); + if (s->black_started) { // FIXME: black_end should be set to last_picref_pts + last_picref_duration s->black_end = s->last_picref_pts; @@ -233,4 +267,5 @@ AVFilter ff_vf_blackdetect = { .outputs = blackdetect_outputs, .uninit = uninit, .priv_class = &blackdetect_class, + .flags = AVFILTER_FLAG_SLICE_THREADS, };

1 0

avcodec/dolby_e: Avoid duplicating sample rate table
by Andreas Rheinhardt 30 Jan '21

30 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Tue Jan 26 17:14:05 2021 +0100| [44e27d937d88f3e7cdc83f4de1b9d3a590bcaa04] | committer: Andreas Rheinhardt avcodec/dolby_e: Avoid duplicating sample rate table Set the sample rate when parsing the header instead and only copy the value in the decoder and the parser. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44e27d937d88f3e7c… --- libavcodec/dolby_e.c | 2 +- libavcodec/dolby_e.h | 6 ++---- libavcodec/dolby_e_parse.c | 6 +++++- libavcodec/dolby_e_parser.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index 9031c18210..ecb2f4802a 100644 --- a/libavcodec/dolby_e.c +++ b/libavcodec/dolby_e.c @@ -1105,7 +1105,7 @@ static int dolby_e_decode_frame(AVCodecContext *avctx, void *data, } avctx->channels = s->metadata.nb_channels; - avctx->sample_rate = sample_rate_tab[s->metadata.fr_code]; + avctx->sample_rate = s->metadata.sample_rate; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; i = s->metadata.nb_channels / 2; diff --git a/libavcodec/dolby_e.h b/libavcodec/dolby_e.h index 32471bce80..9f0c065729 100644 --- a/libavcodec/dolby_e.h +++ b/libavcodec/dolby_e.h @@ -58,6 +58,8 @@ typedef struct DolbyEHeaderInfo { * @{ */ int multi_prog_warned; + + int sample_rate; /** @} */ } DolbyEHeaderInfo; @@ -81,10 +83,6 @@ typedef struct DBEContext { uint8_t buffer[1024 * 3 + AV_INPUT_BUFFER_PADDING_SIZE]; } DBEContext; -static const uint16_t sample_rate_tab[16] = { - 0, 42965, 43008, 44800, 53706, 53760 -}; - /** * Use the provided key to transform the input into data (put into s->buffer) * suitable for further processing and initialize s->gb to read said data. diff --git a/libavcodec/dolby_e_parse.c b/libavcodec/dolby_e_parse.c index 00b5536020..ffedcd99a4 100644 --- a/libavcodec/dolby_e_parse.c +++ b/libavcodec/dolby_e_parse.c @@ -30,6 +30,10 @@ static const uint8_t nb_channels_tab[MAX_PROG_CONF + 1] = { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 6, 6, 6, 6, 4, 4, 4, 4, 8, 8 }; +static const uint16_t sample_rate_tab[16] = { + 0, 42965, 43008, 44800, 53706, 53760 +}; + static int skip_input(DBEContext *s, int nb_words) { if (nb_words > s->input_size) { @@ -145,7 +149,7 @@ int ff_dolby_e_parse_header(DBEContext *s, const uint8_t *buf, int buf_size) header->fr_code = get_bits(&s->gb, 4); header->fr_code_orig = get_bits(&s->gb, 4); - if (!sample_rate_tab[header->fr_code] || + if (!(header->sample_rate = sample_rate_tab[header->fr_code]) || !sample_rate_tab[header->fr_code_orig]) { if (s->avctx) av_log(s->avctx, AV_LOG_ERROR, "Invalid frame rate code\n"); diff --git a/libavcodec/dolby_e_parser.c b/libavcodec/dolby_e_parser.c index 8e713b44ed..3ae973bddf 100644 --- a/libavcodec/dolby_e_parser.c +++ b/libavcodec/dolby_e_parser.c @@ -51,7 +51,7 @@ static int dolby_e_parse(AVCodecParserContext *s2, AVCodecContext *avctx, } avctx->channels = s->metadata.nb_channels; - avctx->sample_rate = sample_rate_tab[s->metadata.fr_code]; + avctx->sample_rate = s->metadata.sample_rate; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; end:

1 0

avcodec/dolby_e: Avoid code duplication when converting input
by Andreas Rheinhardt 30 Jan '21

30 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Tue Jan 26 16:33:01 2021 +0100| [7c27513d0458c7e80925e27529acee4473baedf6] | committer: Andreas Rheinhardt avcodec/dolby_e: Avoid code duplication when converting input convert_input, a nontrivial auxiliary function used by both the general parsing code as well as the decoder itself, has been duplicated in c7016e35a624a75bb5b82bee932ddfe28d013b3f; this commit removes said duplication. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c27513d0458c7e80… --- libavcodec/dolby_e.c | 40 ++-------------------------------------- libavcodec/dolby_e.h | 7 +++++++ libavcodec/dolby_e_parse.c | 8 +++++--- 3 files changed, 14 insertions(+), 41 deletions(-) diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index f828de2f88..9031c18210 100644 --- a/libavcodec/dolby_e.c +++ b/libavcodec/dolby_e.c @@ -25,7 +25,6 @@ #include "internal.h" #include "get_bits.h" -#include "put_bits.h" #include "dolby_e.h" #include "kbdwin.h" #include "fft.h" @@ -626,42 +625,6 @@ static int parse_key(DBEContext *s) return 0; } -static int convert_input(DBEContext *s, int nb_words, int key) -{ - const uint8_t *src = s->input; - uint8_t *dst = s->buffer; - PutBitContext pb; - int i; - - av_assert0(nb_words <= 1024u); - - if (nb_words > s->input_size) { - av_log(s->avctx, AV_LOG_ERROR, "Packet too short\n"); - return AVERROR_INVALIDDATA; - } - - switch (s->word_bits) { - case 16: - for (i = 0; i < nb_words; i++, src += 2, dst += 2) - AV_WB16(dst, AV_RB16(src) ^ key); - break; - case 20: - init_put_bits(&pb, s->buffer, sizeof(s->buffer)); - for (i = 0; i < nb_words; i++, src += 3) - put_bits(&pb, 20, AV_RB24(src) >> 4 ^ key); - flush_put_bits(&pb); - break; - case 24: - for (i = 0; i < nb_words; i++, src += 3, dst += 3) - AV_WB24(dst, AV_RB24(src) ^ key); - break; - default: - av_assert0(0); - } - - return init_get_bits(&s->gb, s->buffer, nb_words * s->word_bits); -} - static int parse_metadata_ext(DBEDecodeContext *s1) { DBEContext *s = &s1->dectx; @@ -992,7 +955,8 @@ static int parse_audio(DBEDecodeContext *s1, int start, int end, int seg_id) s1->channels[seg_id][ch].nb_groups = 0; continue; } - if ((ret = convert_input(s, s->metadata.ch_size[ch], key)) < 0) + ret = ff_dolby_e_convert_input(s, s->metadata.ch_size[ch], key); + if (ret < 0) return ret; if ((ret = parse_channel(s1, ch, seg_id)) < 0) { if (s1->avctx->err_recognition & AV_EF_EXPLODE) diff --git a/libavcodec/dolby_e.h b/libavcodec/dolby_e.h index 0838a1d3ea..32471bce80 100644 --- a/libavcodec/dolby_e.h +++ b/libavcodec/dolby_e.h @@ -84,6 +84,13 @@ typedef struct DBEContext { static const uint16_t sample_rate_tab[16] = { 0, 42965, 43008, 44800, 53706, 53760 }; + +/** + * Use the provided key to transform the input into data (put into s->buffer) + * suitable for further processing and initialize s->gb to read said data. + */ +int ff_dolby_e_convert_input(DBEContext *s, int nb_words, int key); + /** * Initialize DBEContext and parse Dolby E metadata. * Set word_bits/word_bytes, input, input_size, key_present diff --git a/libavcodec/dolby_e_parse.c b/libavcodec/dolby_e_parse.c index 33ec3d7f09..00b5536020 100644 --- a/libavcodec/dolby_e_parse.c +++ b/libavcodec/dolby_e_parse.c @@ -53,7 +53,7 @@ static int parse_key(DBEContext *s) return 0; } -static int convert_input(DBEContext *s, int nb_words, int key) +int ff_dolby_e_convert_input(DBEContext *s, int nb_words, int key) { const uint8_t *src = s->input; uint8_t *dst = s->buffer; @@ -63,6 +63,8 @@ static int convert_input(DBEContext *s, int nb_words, int key) av_assert0(nb_words <= 1024u); if (nb_words > s->input_size) { + if (s->avctx) + av_log(s->avctx, AV_LOG_ERROR, "Packet too short\n"); return AVERROR_INVALIDDATA; } @@ -116,7 +118,7 @@ int ff_dolby_e_parse_header(DBEContext *s, const uint8_t *buf, int buf_size) if ((key = parse_key(s)) < 0) return key; - if ((ret = convert_input(s, 1, key)) < 0) + if ((ret = ff_dolby_e_convert_input(s, 1, key)) < 0) return ret; skip_bits(&s->gb, 4); @@ -127,7 +129,7 @@ int ff_dolby_e_parse_header(DBEContext *s, const uint8_t *buf, int buf_size) return AVERROR_INVALIDDATA; } - if ((ret = convert_input(s, mtd_size, key)) < 0) + if ((ret = ff_dolby_e_convert_input(s, mtd_size, key)) < 0) return ret; skip_bits(&s->gb, 14);

1 0

avcodec/dolby_e_parse: Merge ff_dolby_e_parse_init/header
by Andreas Rheinhardt 30 Jan '21

30 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Tue Jan 26 15:46:15 2021 +0100| [8cbff41583409210abef0f57a1afbf8bb1f1f351] | committer: Andreas Rheinhardt avcodec/dolby_e_parse: Merge ff_dolby_e_parse_init/header These two functions are always called after another; after all, what ff_dolby_e_parse_init does is obviously part of parsing the frame header. Also move the DolbyEHeaderInfo into DBEContext so that parsing the frame header only needs one struct (both users used a DBEContext immediately followed by a separate DolbyEHeaderInfo). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8cbff41583409210a… --- libavcodec/dolby_e.c | 59 +++++++++++++++++++++------------------------ libavcodec/dolby_e.h | 54 ++++++++++++++++++----------------------- libavcodec/dolby_e_parse.c | 48 ++++++++++++++++-------------------- libavcodec/dolby_e_parser.c | 13 +++------- 4 files changed, 77 insertions(+), 97 deletions(-) diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index 1dd69a2ec2..f828de2f88 100644 --- a/libavcodec/dolby_e.c +++ b/libavcodec/dolby_e.c @@ -73,8 +73,6 @@ typedef struct DBEDecodeContext { AVCodecContext *avctx; DBEContext dectx; - DolbyEHeaderInfo metadata; - DBEChannel channels[MAX_SEGMENTS][MAX_CHANNELS]; DECLARE_ALIGNED(32, float, history)[MAX_CHANNELS][256]; @@ -667,8 +665,8 @@ static int convert_input(DBEContext *s, int nb_words, int key) static int parse_metadata_ext(DBEDecodeContext *s1) { DBEContext *s = &s1->dectx; - if (s1->metadata.mtd_ext_size) - return skip_input(s, s->key_present + s1->metadata.mtd_ext_size + 1); + if (s->metadata.mtd_ext_size) + return skip_input(s, s->key_present + s->metadata.mtd_ext_size + 1); return 0; } @@ -830,7 +828,7 @@ static int parse_bit_alloc(DBEDecodeContext *s1, DBEChannel *c) for (i = 0, p = NULL, g = c->groups; i < c->nb_groups; i++, p = g, g++) { if (c->exp_strategy[i] || bap_strategy[i]) { - bit_allocate(g->nb_exponent, g->imdct_idx, s1->metadata.fr_code, + bit_allocate(g->nb_exponent, g->imdct_idx, s->metadata.fr_code, c->exponents + g->exp_ofs, c->bap + g->exp_ofs, fg_spc[i], fg_ofs[i], msk_mod[i], snr_ofs); } else { @@ -936,12 +934,12 @@ static int parse_channel(DBEDecodeContext *s1, int ch, int seg_id) DBEChannel *c = &s1->channels[seg_id][ch]; int i, ret; - if (s1->metadata.rev_id[ch] > 1) { - avpriv_report_missing_feature(s->avctx, "Encoder revision %d", s1->metadata.rev_id[ch]); + if (s->metadata.rev_id[ch] > 1) { + avpriv_report_missing_feature(s->avctx, "Encoder revision %d", s->metadata.rev_id[ch]); return AVERROR_PATCHWELCOME; } - if (ch == lfe_channel_tab[s1->metadata.prog_conf]) { + if (ch == lfe_channel_tab[s->metadata.prog_conf]) { c->gr_code = 3; c->bw_code = 29; } else { @@ -990,18 +988,18 @@ static int parse_audio(DBEDecodeContext *s1, int start, int end, int seg_id) return key; for (ch = start; ch < end; ch++) { - if (!s1->metadata.ch_size[ch]) { + if (!s->metadata.ch_size[ch]) { s1->channels[seg_id][ch].nb_groups = 0; continue; } - if ((ret = convert_input(s, s1->metadata.ch_size[ch], key)) < 0) + if ((ret = convert_input(s, s->metadata.ch_size[ch], key)) < 0) return ret; if ((ret = parse_channel(s1, ch, seg_id)) < 0) { if (s1->avctx->err_recognition & AV_EF_EXPLODE) return ret; s1->channels[seg_id][ch].nb_groups = 0; } - if ((ret = skip_input(s, s1->metadata.ch_size[ch])) < 0) + if ((ret = skip_input(s, s->metadata.ch_size[ch])) < 0) return ret; } @@ -1011,8 +1009,8 @@ static int parse_audio(DBEDecodeContext *s1, int start, int end, int seg_id) static int parse_meter(DBEDecodeContext *s1) { DBEContext *s = &s1->dectx; - if (s1->metadata.meter_size) - return skip_input(s, s->key_present + s1->metadata.meter_size + 1); + if (s->metadata.meter_size) + return skip_input(s, s->key_present + s->metadata.meter_size + 1); return 0; } @@ -1086,14 +1084,15 @@ static void apply_gain(DBEDecodeContext *s, int begin, int end, float *output) static int filter_frame(DBEDecodeContext *s, AVFrame *frame) { + const DolbyEHeaderInfo *const metadata = &s->dectx.metadata; const uint8_t *reorder; int ch, ret; - if (s->metadata.nb_channels == 4) + if (metadata->nb_channels == 4) reorder = ch_reorder_4; - else if (s->metadata.nb_channels == 6) + else if (metadata->nb_channels == 6) reorder = ch_reorder_6; - else if (s->metadata.nb_programs == 1 && !(s->avctx->request_channel_layout & AV_CH_LAYOUT_NATIVE)) + else if (metadata->nb_programs == 1 && !(s->avctx->request_channel_layout & AV_CH_LAYOUT_NATIVE)) reorder = ch_reorder_8; else reorder = ch_reorder_n; @@ -1102,11 +1101,11 @@ static int filter_frame(DBEDecodeContext *s, AVFrame *frame) if ((ret = ff_get_buffer(s->avctx, frame, 0)) < 0) return ret; - for (ch = 0; ch < s->metadata.nb_channels; ch++) { + for (ch = 0; ch < metadata->nb_channels; ch++) { float *output = (float *)frame->extended_data[reorder[ch]]; transform(s, &s->channels[0][ch], s->history[ch], output); transform(s, &s->channels[1][ch], s->history[ch], output + FRAME_SAMPLES / 2); - apply_gain(s, s->metadata.begin_gain[ch], s->metadata.end_gain[ch], output); + apply_gain(s, metadata->begin_gain[ch], metadata->end_gain[ch], output); } return 0; @@ -1119,19 +1118,17 @@ static int dolby_e_decode_frame(AVCodecContext *avctx, void *data, DBEContext *s = &s1->dectx; int i, j, ret; - if ((ret = ff_dolby_e_parse_init(s, avpkt->data, avpkt->size)) < 0) - return ret; - - if ((ret = ff_dolby_e_parse_header(s, &s1->metadata)) < 0) + if ((ret = ff_dolby_e_parse_header(s, avpkt->data, avpkt->size)) < 0) return ret; - if (s1->metadata.nb_programs > 1 && !s1->metadata.multi_prog_warned) { + if (s->metadata.nb_programs > 1 && !s->metadata.multi_prog_warned) { av_log(avctx, AV_LOG_WARNING, "Stream has %d programs (configuration %d), " - "channels will be output in native order.\n", s1->metadata.nb_programs, s1->metadata.prog_conf); - s1->metadata.multi_prog_warned = 1; + "channels will be output in native order.\n", + s->metadata.nb_programs, s->metadata.prog_conf); + s->metadata.multi_prog_warned = 1; } - switch (s1->metadata.nb_channels) { + switch (s->metadata.nb_channels) { case 4: avctx->channel_layout = AV_CH_LAYOUT_4POINT0; break; @@ -1143,12 +1140,12 @@ static int dolby_e_decode_frame(AVCodecContext *avctx, void *data, break; } - avctx->channels = s1->metadata.nb_channels; - avctx->sample_rate = sample_rate_tab[s1->metadata.fr_code]; + avctx->channels = s->metadata.nb_channels; + avctx->sample_rate = sample_rate_tab[s->metadata.fr_code]; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; - i = s1->metadata.nb_channels / 2; - j = s1->metadata.nb_channels; + i = s->metadata.nb_channels / 2; + j = s->metadata.nb_channels; if ((ret = parse_audio(s1, 0, i, 0)) < 0) return ret; if ((ret = parse_audio(s1, i, j, 0)) < 0) @@ -1290,7 +1287,7 @@ static av_cold int dolby_e_init(AVCodecContext *avctx) if (!(s->fdsp = avpriv_float_dsp_alloc(0))) return AVERROR(ENOMEM); - s->metadata.multi_prog_warned = !!(avctx->request_channel_layout & AV_CH_LAYOUT_NATIVE); + s->dectx.metadata.multi_prog_warned = !!(avctx->request_channel_layout & AV_CH_LAYOUT_NATIVE); s->dectx.avctx = s->avctx = avctx; return 0; } diff --git a/libavcodec/dolby_e.h b/libavcodec/dolby_e.h index d7fac94fd9..0838a1d3ea 100644 --- a/libavcodec/dolby_e.h +++ b/libavcodec/dolby_e.h @@ -30,24 +30,6 @@ #define MAX_PROGRAMS 8 #define MAX_CHANNELS 8 -/** - * @struct DBEContext - * Dolby E reading context used by decoder and parser. - */ -typedef struct DBEContext { - void *avctx; - GetBitContext gb; - - const uint8_t *input; - int input_size; - - int word_bits; - int word_bytes; - int key_present; - - uint8_t buffer[1024 * 3 + AV_INPUT_BUFFER_PADDING_SIZE]; -} DBEContext; - /** * @struct DolbyEHeaderInfo * Coded Dolby E header values up to end_gain element, plus derived values. @@ -79,26 +61,38 @@ typedef struct DolbyEHeaderInfo { /** @} */ } DolbyEHeaderInfo; +/** + * @struct DBEContext + * Dolby E reading context used by decoder and parser. + */ +typedef struct DBEContext { + void *avctx; + GetBitContext gb; + + const uint8_t *input; + int input_size; + + int word_bits; + int word_bytes; + int key_present; + + DolbyEHeaderInfo metadata; + + uint8_t buffer[1024 * 3 + AV_INPUT_BUFFER_PADDING_SIZE]; +} DBEContext; + static const uint16_t sample_rate_tab[16] = { 0, 42965, 43008, 44800, 53706, 53760 }; /** - * Initialize DBEContext. - * Set word_bits/word_bytes, input, input_size, key_present. + * Initialize DBEContext and parse Dolby E metadata. + * Set word_bits/word_bytes, input, input_size, key_present + * and parse the header up to the end_gain element. * @param[out] s DBEContext. * @param[in] buf raw input buffer. * @param[in] buf_size must be 3 bytes at least. * @return Returns 0 on success, AVERROR_INVALIDDATA on error */ -int ff_dolby_e_parse_init(DBEContext *s, const uint8_t *buf, int buf_size); - -/** - * Parse Dolby E metadata. - * Parse the header up to the end_gain element. - * @param[in] s DBEContext . - * @param[out] hdr Pointer to struct where header info is written. - * @return Returns 0 on success, AVERROR_INVALIDDATA on error - */ -int ff_dolby_e_parse_header(DBEContext *s, DolbyEHeaderInfo *hdr); +int ff_dolby_e_parse_header(DBEContext *s, const uint8_t *buf, int buf_size); #endif diff --git a/libavcodec/dolby_e_parse.c b/libavcodec/dolby_e_parse.c index df2ba4a017..33ec3d7f09 100644 --- a/libavcodec/dolby_e_parse.c +++ b/libavcodec/dolby_e_parse.c @@ -88,9 +88,10 @@ static int convert_input(DBEContext *s, int nb_words, int key) return init_get_bits(&s->gb, s->buffer, nb_words * s->word_bits); } -int ff_dolby_e_parse_init(DBEContext *s, const uint8_t *buf, int buf_size) +int ff_dolby_e_parse_header(DBEContext *s, const uint8_t *buf, int buf_size) { - int hdr; + DolbyEHeaderInfo *const header = &s->metadata; + int hdr, ret, key, mtd_size; if (buf_size < 3) return AVERROR_INVALIDDATA; @@ -113,13 +114,6 @@ int ff_dolby_e_parse_init(DBEContext *s, const uint8_t *buf, int buf_size) s->input_size = buf_size / s->word_bytes - 1; s->key_present = hdr >> 24 - s->word_bits & 1; - return 0; -} - -int ff_dolby_e_parse_header(DBEContext *s, DolbyEHeaderInfo *hdr) -{ - int i, ret, key, mtd_size; - if ((key = parse_key(s)) < 0) return key; if ((ret = convert_input(s, 1, key)) < 0) @@ -137,37 +131,37 @@ int ff_dolby_e_parse_header(DBEContext *s, DolbyEHeaderInfo *hdr) return ret; skip_bits(&s->gb, 14); - hdr->prog_conf = get_bits(&s->gb, 6); - if (hdr->prog_conf > MAX_PROG_CONF) { + header->prog_conf = get_bits(&s->gb, 6); + if (header->prog_conf > MAX_PROG_CONF) { if (s->avctx) av_log(s->avctx, AV_LOG_ERROR, "Invalid program configuration\n"); return AVERROR_INVALIDDATA; } - hdr->nb_channels = nb_channels_tab[hdr->prog_conf]; - hdr->nb_programs = nb_programs_tab[hdr->prog_conf]; + header->nb_channels = nb_channels_tab[header->prog_conf]; + header->nb_programs = nb_programs_tab[header->prog_conf]; - hdr->fr_code = get_bits(&s->gb, 4); - hdr->fr_code_orig = get_bits(&s->gb, 4); - if (!sample_rate_tab[hdr->fr_code] || - !sample_rate_tab[hdr->fr_code_orig]) { + header->fr_code = get_bits(&s->gb, 4); + header->fr_code_orig = get_bits(&s->gb, 4); + if (!sample_rate_tab[header->fr_code] || + !sample_rate_tab[header->fr_code_orig]) { if (s->avctx) av_log(s->avctx, AV_LOG_ERROR, "Invalid frame rate code\n"); return AVERROR_INVALIDDATA; } skip_bits_long(&s->gb, 88); - for (i = 0; i < hdr->nb_channels; i++) - hdr->ch_size[i] = get_bits(&s->gb, 10); - hdr->mtd_ext_size = get_bits(&s->gb, 8); - hdr->meter_size = get_bits(&s->gb, 8); - - skip_bits_long(&s->gb, 10 * hdr->nb_programs); - for (i = 0; i < hdr->nb_channels; i++) { - hdr->rev_id[i] = get_bits(&s->gb, 4); + for (int i = 0; i < header->nb_channels; i++) + header->ch_size[i] = get_bits(&s->gb, 10); + header->mtd_ext_size = get_bits(&s->gb, 8); + header->meter_size = get_bits(&s->gb, 8); + + skip_bits_long(&s->gb, 10 * header->nb_programs); + for (int i = 0; i < header->nb_channels; i++) { + header->rev_id[i] = get_bits(&s->gb, 4); skip_bits1(&s->gb); - hdr->begin_gain[i] = get_bits(&s->gb, 10); - hdr->end_gain[i] = get_bits(&s->gb, 10); + header->begin_gain[i] = get_bits(&s->gb, 10); + header->end_gain[i] = get_bits(&s->gb, 10); } if (get_bits_left(&s->gb) < 0) { diff --git a/libavcodec/dolby_e_parser.c b/libavcodec/dolby_e_parser.c index b7e5db4e6f..8e713b44ed 100644 --- a/libavcodec/dolby_e_parser.c +++ b/libavcodec/dolby_e_parser.c @@ -24,8 +24,6 @@ typedef struct DBEParseContext { DBEContext dectx; - - DolbyEHeaderInfo metadata; } DBEParseContext; static int dolby_e_parse(AVCodecParserContext *s2, AVCodecContext *avctx, @@ -36,14 +34,11 @@ static int dolby_e_parse(AVCodecParserContext *s2, AVCodecContext *avctx, DBEContext *s = &s1->dectx; int ret; - if ((ret = ff_dolby_e_parse_init(s, buf, buf_size)) < 0) - goto end; - - if ((ret = ff_dolby_e_parse_header(s, &s1->metadata)) < 0) + if ((ret = ff_dolby_e_parse_header(s, buf, buf_size)) < 0) goto end; s2->duration = FRAME_SAMPLES; - switch (s1->metadata.nb_channels) { + switch (s->metadata.nb_channels) { case 4: avctx->channel_layout = AV_CH_LAYOUT_4POINT0; break; @@ -55,8 +50,8 @@ static int dolby_e_parse(AVCodecParserContext *s2, AVCodecContext *avctx, break; } - avctx->channels = s1->metadata.nb_channels; - avctx->sample_rate = sample_rate_tab[s1->metadata.fr_code]; + avctx->channels = s->metadata.nb_channels; + avctx->sample_rate = sample_rate_tab[s->metadata.fr_code]; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; end:

1 0

avcodec/dolby_e_parser: Remove unused ParseContext
by Andreas Rheinhardt 30 Jan '21

30 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Tue Jan 26 14:48:01 2021 +0100| [fa3ab43fecb49d544861a42a03e7432aa829de56] | committer: Andreas Rheinhardt avcodec/dolby_e_parser: Remove unused ParseContext Parsers are not forced to use a ParseContext and the other stuff from parser.h which is just designed to help parsers recombining frames. But this parser does not do this at all, i.e. the ParseContext is unused. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa3ab43fecb49d544… --- libavcodec/dolby_e_parser.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/dolby_e_parser.c b/libavcodec/dolby_e_parser.c index 2c11617906..b7e5db4e6f 100644 --- a/libavcodec/dolby_e_parser.c +++ b/libavcodec/dolby_e_parser.c @@ -18,14 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "parser.h" - #include "dolby_e.h" #include "get_bits.h" #include "put_bits.h" typedef struct DBEParseContext { - ParseContext pc; DBEContext dectx; DolbyEHeaderInfo metadata; @@ -74,5 +71,4 @@ AVCodecParser ff_dolby_e_parser = { .codec_ids = { AV_CODEC_ID_DOLBY_E }, .priv_data_size = sizeof(DBEParseContext), .parser_parse = dolby_e_parse, - .parser_close = ff_parse_close, };

1 0

avfilter/vf_pseudocolor: allow more advanced presets
by Paul B Mahol 29 Jan '21

29 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 29 19:45:21 2021 +0100| [d43a27ab6fc89b402b5c0d650f0387edf828502b] | committer: Paul B Mahol avfilter/vf_pseudocolor: allow more advanced presets > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d43a27ab6fc89b402… --- doc/filters.texi | 2 + libavfilter/vf_pseudocolor.c | 181 ++++++++++++++++++++++++++++++++----------- 2 files changed, 139 insertions(+), 44 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index b5cff39f81..a87f2fb7cc 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16224,6 +16224,8 @@ Available LUTs: @item viridis @item turbo @item cividis +@item range1 +@item range2 @end table @end table diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 21c054adff..192839342b 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -59,48 +59,98 @@ enum var_name { VAR_VARS_NB }; -enum ColorMaps { +enum Curves { MAGMA, INFERNO, PLASMA, VIRIDIS, TURBO, CIVIDIS, - NB_CMAPS, + NB_CURVES, }; -static const double presets[][3][8] = +enum Presets { + PRESET_MAGMA, + PRESET_INFERNO, + PRESET_PLASMA, + PRESET_VIRIDIS, + PRESET_TURBO, + PRESET_CIVIDIS, + PRESET_RANGE1, + PRESET_RANGE2, + NB_PRESETS, +}; + +typedef struct Curve { + double coef[3][8]; +} Curve; + +typedef struct Fill { + float fill[3]; +} Fill; + +typedef struct Range { + int start, end; +} Range; + +typedef struct Preset { + int nb_segments; + const Range *ranges; + const Curve *curves; + const Fill *fills; +} Preset; + +static const Range full_range = {0, 256}; +static const Range spec1_range[] = {{0, 16}, {16, 236}, {236, 256}}; +static const Range spec2_range[] = {{0, 16}, {16, 22}, {22, 226}, {226, 236}, {236, 256}}; + +static const Fill spec1_fills[] = {{0.5f, 0.f, .5f}, {-1.f, -1.f, -1.f}, {1.f, 0.f, 0.f}}; +static const Fill spec2_fills[] = {{0.5f, 0.f, .5f}, {0.f, 1.f, 1.f}, {-1.f, -1.f, -1.f}, {1.f, 1.f, 0.f}, {1.f, 0.f, 0.f}}; + +static const Curve curves[] = { - [MAGMA] = { + [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] = { + }}, + [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] = { + }}, + [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] = { + }}, + [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] = { + }}, + [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] = { + }}, + [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 }, - }, + }}, +}; + +static const Preset presets[] = +{ + [PRESET_MAGMA] = { 1, &full_range, &curves[MAGMA], NULL }, + [PRESET_INFERNO] = { 1, &full_range, &curves[INFERNO], NULL }, + [PRESET_PLASMA] = { 1, &full_range, &curves[PLASMA], NULL }, + [PRESET_VIRIDIS] = { 1, &full_range, &curves[VIRIDIS], NULL }, + [PRESET_TURBO] = { 1, &full_range, &curves[TURBO], NULL }, + [PRESET_CIVIDIS] = { 1, &full_range, &curves[CIVIDIS], NULL }, + [PRESET_RANGE1] = { 3, spec1_range, NULL, spec1_fills }, + [PRESET_RANGE2] = { 5, spec2_range, NULL, spec2_fills }, }; typedef struct PseudoColorContext { @@ -135,14 +185,16 @@ 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" }, + { "p", "set preset", OFFSET(preset), AV_OPT_TYPE_INT, {.i64=-1},-1, NB_PRESETS-1, .flags = FLAGS, "preset" }, + { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=-1}, .flags = FLAGS, "preset" }, + { "magma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_MAGMA}, .flags = FLAGS, "preset" }, + { "inferno", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_INFERNO}, .flags = FLAGS, "preset" }, + { "plasma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_PLASMA}, .flags = FLAGS, "preset" }, + { "viridis", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_VIRIDIS}, .flags = FLAGS, "preset" }, + { "turbo", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_TURBO}, .flags = FLAGS, "preset" }, + { "cividis", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_CIVIDIS}, .flags = FLAGS, "preset" }, + { "range1", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_RANGE1}, .flags = FLAGS, "preset" }, + { "range2", NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_RANGE2}, .flags = FLAGS, "preset" }, { NULL } }; @@ -534,28 +586,69 @@ 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; + int nb_segments = presets[s->preset].nb_segments; + + for (int seg = 0; seg < nb_segments; seg++) { + int start = presets[s->preset].ranges[seg].start; + int end = presets[s->preset].ranges[seg].end; + + for (int i = start; i < end; i++) { + if (!presets[s->preset].curves) { + const Fill fill = presets[s->preset].fills[seg]; + + for (int j = 0; j < factor; j++) { + double r, g, b; + + g = fill.fill[1]; + b = fill.fill[2]; + r = fill.fill[0]; + + if (g >= 0.f && b >= 0.f && r >= 0.f) { + g *= s->max; + b *= s->max; + r *= 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; + } + } else { + const Curve curve = presets[s->preset].curves[seg]; + + for (int j = 0; j < factor; j++) { + const double lf = j / (double)factor; + double r, g, b; + + g = poly_eval(curve.coef[1], i + lf) * s->max; + b = poly_eval(curve.coef[2], i + lf) * s->max; + r = poly_eval(curve.coef[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; + } } - - s->lut[0][i*factor+j] = g; - s->lut[1][i*factor+j] = b; - s->lut[2][i*factor+j] = r; } } }

1 0

avfilter/vf_lut3d: add prism interpolation
by Paul B Mahol 29 Jan '21

29 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 27 18:44:25 2021 +0100| [50dd020f04f73378a2a13ab2f23de0b791ebe079] | committer: Paul B Mahol avfilter/vf_lut3d: add prism interpolation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50dd020f04f73378a… --- doc/filters.texi | 2 ++ libavfilter/vf_lut3d.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 4aef62158f..b5cff39f81 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -13868,6 +13868,8 @@ Interpolate values using the 8 points defining a cube. Interpolate values using a tetrahedron. @item pyramid Interpolate values using a pyramid. +@item prism +Interpolate values using a prism. @end table @end table diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 12eb15fe67..fb33c93c34 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -50,6 +50,7 @@ enum interp_mode { INTERPOLATE_TRILINEAR, INTERPOLATE_TETRAHEDRAL, INTERPOLATE_PYRAMID, + INTERPOLATE_PRISM, NB_INTERP_MODE }; @@ -105,6 +106,7 @@ typedef struct ThreadData { { "trilinear", "interpolate values using the 8 points defining a cube", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_TRILINEAR}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \ { "tetrahedral", "interpolate values using a tetrahedron", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_TETRAHEDRAL}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \ { "pyramid", "interpolate values using a pyramid", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_PYRAMID}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \ + { "prism", "interpolate values using a prism", 0, AV_OPT_TYPE_CONST, {.i64=INTERPOLATE_PRISM}, INT_MIN, INT_MAX, FLAGS, "interp_mode" }, \ { NULL } #define EXPONENT_MASK 0x7F800000 @@ -237,6 +239,51 @@ static inline struct rgbvec interp_pyramid(const LUT3DContext *lut3d, return c; } +static inline struct rgbvec interp_prism(const LUT3DContext *lut3d, + const struct rgbvec *s) +{ + const int lutsize2 = lut3d->lutsize2; + const int lutsize = lut3d->lutsize; + const int prev[] = {PREV(s->r), PREV(s->g), PREV(s->b)}; + const int next[] = {NEXT(s->r), NEXT(s->g), NEXT(s->b)}; + const struct rgbvec d = {s->r - prev[0], s->g - prev[1], s->b - prev[2]}; + const struct rgbvec c000 = lut3d->lut[prev[0] * lutsize2 + prev[1] * lutsize + prev[2]]; + const struct rgbvec c010 = lut3d->lut[prev[0] * lutsize2 + next[1] * lutsize + prev[2]]; + const struct rgbvec c101 = lut3d->lut[next[0] * lutsize2 + prev[1] * lutsize + next[2]]; + const struct rgbvec c111 = lut3d->lut[next[0] * lutsize2 + next[1] * lutsize + next[2]]; + struct rgbvec c; + + if (d.b > d.r) { + const struct rgbvec c001 = lut3d->lut[prev[0] * lutsize2 + prev[1] * lutsize + next[2]]; + const struct rgbvec c011 = lut3d->lut[prev[0] * lutsize2 + next[1] * lutsize + next[2]]; + + c.r = c000.r + (c001.r - c000.r) * d.b + (c101.r - c001.r) * d.r + (c010.r - c000.r) * d.g + + (c000.r - c010.r - c001.r + c011.r) * d.b * d.g + + (c001.r - c011.r - c101.r + c111.r) * d.r * d.g; + c.g = c000.g + (c001.g - c000.g) * d.b + (c101.g - c001.g) * d.r + (c010.g - c000.g) * d.g + + (c000.g - c010.g - c001.g + c011.g) * d.b * d.g + + (c001.g - c011.g - c101.g + c111.g) * d.r * d.g; + c.b = c000.b + (c001.b - c000.b) * d.b + (c101.b - c001.b) * d.r + (c010.b - c000.b) * d.g + + (c000.b - c010.b - c001.b + c011.b) * d.b * d.g + + (c001.b - c011.b - c101.b + c111.b) * d.r * d.g; + } else { + const struct rgbvec c110 = lut3d->lut[next[0] * lutsize2 + next[1] * lutsize + prev[2]]; + const struct rgbvec c100 = lut3d->lut[next[0] * lutsize2 + prev[1] * lutsize + prev[2]]; + + c.r = c000.r + (c101.r - c100.r) * d.b + (c100.r - c000.r) * d.r + (c010.r - c000.r) * d.g + + (c100.r - c110.r - c101.r + c111.r) * d.b * d.g + + (c000.r - c010.r - c100.r + c110.r) * d.r * d.g; + c.g = c000.g + (c101.g - c100.g) * d.b + (c100.g - c000.g) * d.r + (c010.g - c000.g) * d.g + + (c100.g - c110.g - c101.g + c111.g) * d.b * d.g + + (c000.g - c010.g - c100.g + c110.g) * d.r * d.g; + c.b = c000.b + (c101.b - c100.b) * d.b + (c100.b - c000.b) * d.r + (c010.b - c000.b) * d.g + + (c100.b - c110.b - c101.b + c111.b) * d.b * d.g + + (c000.b - c010.b - c100.b + c110.b) * d.r * d.g; + } + + return c; +} + /** * Tetrahedral interpolation. Based on code found in Truelight Software Library paper. * @see http://www.filmlight.ltd.uk/pdf/whitepapers/FL-TL-TN-0057-SoftwareLib.pdf @@ -390,31 +437,37 @@ DEFINE_INTERP_FUNC_PLANAR(nearest, 8, 8) DEFINE_INTERP_FUNC_PLANAR(trilinear, 8, 8) DEFINE_INTERP_FUNC_PLANAR(tetrahedral, 8, 8) DEFINE_INTERP_FUNC_PLANAR(pyramid, 8, 8) +DEFINE_INTERP_FUNC_PLANAR(prism, 8, 8) DEFINE_INTERP_FUNC_PLANAR(nearest, 16, 9) DEFINE_INTERP_FUNC_PLANAR(trilinear, 16, 9) DEFINE_INTERP_FUNC_PLANAR(tetrahedral, 16, 9) DEFINE_INTERP_FUNC_PLANAR(pyramid, 16, 9) +DEFINE_INTERP_FUNC_PLANAR(prism, 16, 9) DEFINE_INTERP_FUNC_PLANAR(nearest, 16, 10) DEFINE_INTERP_FUNC_PLANAR(trilinear, 16, 10) DEFINE_INTERP_FUNC_PLANAR(tetrahedral, 16, 10) DEFINE_INTERP_FUNC_PLANAR(pyramid, 16, 10) +DEFINE_INTERP_FUNC_PLANAR(prism, 16, 10) DEFINE_INTERP_FUNC_PLANAR(nearest, 16, 12) DEFINE_INTERP_FUNC_PLANAR(trilinear, 16, 12) DEFINE_INTERP_FUNC_PLANAR(tetrahedral, 16, 12) DEFINE_INTERP_FUNC_PLANAR(pyramid, 16, 12) +DEFINE_INTERP_FUNC_PLANAR(prism, 16, 12) DEFINE_INTERP_FUNC_PLANAR(nearest, 16, 14) DEFINE_INTERP_FUNC_PLANAR(trilinear, 16, 14) DEFINE_INTERP_FUNC_PLANAR(tetrahedral, 16, 14) DEFINE_INTERP_FUNC_PLANAR(pyramid, 16, 14) +DEFINE_INTERP_FUNC_PLANAR(prism, 16, 14) DEFINE_INTERP_FUNC_PLANAR(nearest, 16, 16) DEFINE_INTERP_FUNC_PLANAR(trilinear, 16, 16) DEFINE_INTERP_FUNC_PLANAR(tetrahedral, 16, 16) DEFINE_INTERP_FUNC_PLANAR(pyramid, 16, 16) +DEFINE_INTERP_FUNC_PLANAR(prism, 16, 16) #define DEFINE_INTERP_FUNC_PLANAR_FLOAT(name, depth) \ static int interp_##name##_pf##depth(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \ @@ -481,6 +534,7 @@ DEFINE_INTERP_FUNC_PLANAR_FLOAT(nearest, 32) DEFINE_INTERP_FUNC_PLANAR_FLOAT(trilinear, 32) DEFINE_INTERP_FUNC_PLANAR_FLOAT(tetrahedral, 32) DEFINE_INTERP_FUNC_PLANAR_FLOAT(pyramid, 32) +DEFINE_INTERP_FUNC_PLANAR_FLOAT(prism, 32) #define DEFINE_INTERP_FUNC(name, nbits) \ static int interp_##nbits##_##name(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \ @@ -535,11 +589,13 @@ DEFINE_INTERP_FUNC(nearest, 8) DEFINE_INTERP_FUNC(trilinear, 8) DEFINE_INTERP_FUNC(tetrahedral, 8) DEFINE_INTERP_FUNC(pyramid, 8) +DEFINE_INTERP_FUNC(prism, 8) DEFINE_INTERP_FUNC(nearest, 16) DEFINE_INTERP_FUNC(trilinear, 16) DEFINE_INTERP_FUNC(tetrahedral, 16) DEFINE_INTERP_FUNC(pyramid, 16) +DEFINE_INTERP_FUNC(prism, 16) #define MAX_LINE_SIZE 512 @@ -1148,6 +1204,7 @@ static int config_input(AVFilterLink *inlink) case INTERPOLATE_TRILINEAR: SET_FUNC(trilinear); break; case INTERPOLATE_TETRAHEDRAL: SET_FUNC(tetrahedral); break; case INTERPOLATE_PYRAMID: SET_FUNC(pyramid); break; + case INTERPOLATE_PRISM: SET_FUNC(prism); break; default: av_assert0(0); }

1 0