X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_remap.c;h=5ab6199d71b2b870fb003ff0f5b4d12e053c3a40;hb=a04ad248a05e7b613abe09b3bb067f555108d794;hp=d24284703b85572a02426221b0af4f4eb8207b71;hpb=64425e005edf3bdd77c34c078c3e74ab5ecef557;p=ffmpeg diff --git a/libavfilter/vf_remap.c b/libavfilter/vf_remap.c index d24284703b8..5ab6199d71b 100644 --- a/libavfilter/vf_remap.c +++ b/libavfilter/vf_remap.c @@ -36,10 +36,12 @@ * Target_frame[y][x] = Source_frame[ ymap[y][x] ][ [xmap[y][x] ]; */ +#include "libavutil/colorspace.h" #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "avfilter.h" +#include "drawutils.h" #include "formats.h" #include "framesync.h" #include "internal.h" @@ -47,27 +49,42 @@ typedef struct RemapContext { const AVClass *class; + int format; + int nb_planes; int nb_components; int step; + uint8_t fill_rgba[4]; + int fill_color[4]; + FFFrameSync fs; - void (*remap)(struct RemapContext *s, const AVFrame *in, - const AVFrame *xin, const AVFrame *yin, - AVFrame *out); + int (*remap_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } RemapContext; #define OFFSET(x) offsetof(RemapContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM static const AVOption remap_options[] = { + { "format", "set output format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "format" }, + { "color", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, .flags = FLAGS, .unit = "format" }, + { "gray", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, .flags = FLAGS, .unit = "format" }, + { "fill", "set the color of the unmapped pixels", OFFSET(fill_rgba), AV_OPT_TYPE_COLOR, {.str="black"}, .flags = FLAGS }, { NULL } }; AVFILTER_DEFINE_CLASS(remap); +typedef struct ThreadData { + AVFrame *in, *xin, *yin, *out; + int nb_planes; + int nb_components; + int step; +} ThreadData; + static int query_formats(AVFilterContext *ctx) { + RemapContext *s = ctx->priv; static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, @@ -77,15 +94,18 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV444P16, - AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P16, + AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48, AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, + AV_PIX_FMT_NONE + }; + static const enum AVPixelFormat gray_pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, - AV_PIX_FMT_GRAY16, + AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, AV_PIX_FMT_NONE }; static const enum AVPixelFormat map_fmts[] = { @@ -95,25 +115,15 @@ static int query_formats(AVFilterContext *ctx) AVFilterFormats *pix_formats = NULL, *map_formats = NULL; int ret; - if (!(pix_formats = ff_make_format_list(pix_fmts)) || - !(map_formats = ff_make_format_list(map_fmts))) { - ret = AVERROR(ENOMEM); - goto fail; - } - if ((ret = ff_formats_ref(pix_formats, &ctx->inputs[0]->out_formats)) < 0 || - (ret = ff_formats_ref(map_formats, &ctx->inputs[1]->out_formats)) < 0 || - (ret = ff_formats_ref(map_formats, &ctx->inputs[2]->out_formats)) < 0 || - (ret = ff_formats_ref(pix_formats, &ctx->outputs[0]->in_formats)) < 0) - goto fail; - return 0; -fail: - if (pix_formats) - av_freep(&pix_formats->formats); - av_freep(&pix_formats); - if (map_formats) - av_freep(&map_formats->formats); - av_freep(&map_formats); - return ret; + pix_formats = ff_make_format_list(s->format ? gray_pix_fmts : pix_fmts); + if ((ret = ff_formats_ref(pix_formats, &ctx->inputs[0]->outcfg.formats)) < 0 || + (ret = ff_formats_ref(pix_formats, &ctx->outputs[0]->incfg.formats)) < 0) + return ret; + + map_formats = ff_make_format_list(map_fmts); + if ((ret = ff_formats_ref(map_formats, &ctx->inputs[1]->outcfg.formats)) < 0) + return ret; + return ff_formats_ref(map_formats, &ctx->inputs[2]->outcfg.formats); } /** @@ -121,67 +131,50 @@ fail: * pixels are copied from source to target using : * Target_frame[y][x] = Source_frame[ ymap[y][x] ][ [xmap[y][x] ]; */ -static void remap_planar(RemapContext *s, const AVFrame *in, - const AVFrame *xin, const AVFrame *yin, - AVFrame *out) -{ - const int xlinesize = xin->linesize[0] / 2; - const int ylinesize = yin->linesize[0] / 2; - int x , y, plane; - - for (plane = 0; plane < s->nb_planes ; plane++) { - uint8_t *dst = out->data[plane]; - const int dlinesize = out->linesize[plane]; - const uint8_t *src = in->data[plane]; - const int slinesize = in->linesize[plane]; - const uint16_t *xmap = (const uint16_t *)xin->data[0]; - const uint16_t *ymap = (const uint16_t *)yin->data[0]; - - for (y = 0; y < out->height; y++) { - for (x = 0; x < out->width; x++) { - if (ymap[x] < in->height && xmap[x] < in->width) { - dst[x] = src[ymap[x] * slinesize + xmap[x]]; - } else { - dst[x] = 0; - } - } - dst += dlinesize; - xmap += xlinesize; - ymap += ylinesize; - } - } +#define DEFINE_REMAP_PLANAR_FUNC(name, bits, div) \ +static int remap_planar##bits##_##name##_slice(AVFilterContext *ctx, void *arg, \ + int jobnr, int nb_jobs) \ +{ \ + RemapContext *s = ctx->priv; \ + const ThreadData *td = arg; \ + const AVFrame *in = td->in; \ + const AVFrame *xin = td->xin; \ + const AVFrame *yin = td->yin; \ + const AVFrame *out = td->out; \ + const int slice_start = (out->height * jobnr ) / nb_jobs; \ + const int slice_end = (out->height * (jobnr+1)) / nb_jobs; \ + const int xlinesize = xin->linesize[0] / 2; \ + const int ylinesize = yin->linesize[0] / 2; \ + int x , y, plane; \ + \ + for (plane = 0; plane < td->nb_planes ; plane++) { \ + const int dlinesize = out->linesize[plane] / div; \ + const uint##bits##_t *src = (const uint##bits##_t *)in->data[plane]; \ + uint##bits##_t *dst = (uint##bits##_t *)out->data[plane] + slice_start * dlinesize; \ + const int slinesize = in->linesize[plane] / div; \ + const uint16_t *xmap = (const uint16_t *)xin->data[0] + slice_start * xlinesize; \ + const uint16_t *ymap = (const uint16_t *)yin->data[0] + slice_start * ylinesize; \ + const int color = s->fill_color[plane]; \ + \ + for (y = slice_start; y < slice_end; y++) { \ + for (x = 0; x < out->width; x++) { \ + if (ymap[x] < in->height && xmap[x] < in->width) { \ + dst[x] = src[ymap[x] * slinesize + xmap[x]]; \ + } else { \ + dst[x] = color; \ + } \ + } \ + dst += dlinesize; \ + xmap += xlinesize; \ + ymap += ylinesize; \ + } \ + } \ + \ + return 0; \ } -static void remap_planar16(RemapContext *s, const AVFrame *in, - const AVFrame *xin, const AVFrame *yin, - AVFrame *out) -{ - const int xlinesize = xin->linesize[0] / 2; - const int ylinesize = yin->linesize[0] / 2; - int x , y, plane; - - for (plane = 0; plane < s->nb_planes ; plane++) { - uint16_t *dst = (uint16_t *)out->data[plane]; - const int dlinesize = out->linesize[plane] / 2; - const uint16_t *src = (const uint16_t *)in->data[plane]; - const int slinesize = in->linesize[plane] / 2; - const uint16_t *xmap = (const uint16_t *)xin->data[0]; - const uint16_t *ymap = (const uint16_t *)yin->data[0]; - - for (y = 0; y < out->height; y++) { - for (x = 0; x < out->width; x++) { - if (ymap[x] < in->height && xmap[x] < in->width) { - dst[x] = src[ymap[x] * slinesize + xmap[x]]; - } else { - dst[x] = 0; - } - } - dst += dlinesize; - xmap += xlinesize; - ymap += ylinesize; - } - } -} +DEFINE_REMAP_PLANAR_FUNC(nearest, 8, 1) +DEFINE_REMAP_PLANAR_FUNC(nearest, 16, 2) /** * remap_packed algorithm expects pixels with both padded bits (step) and @@ -189,88 +182,87 @@ static void remap_planar16(RemapContext *s, const AVFrame *in, * pixels are copied from source to target using : * Target_frame[y][x] = Source_frame[ ymap[y][x] ][ [xmap[y][x] ]; */ -static void remap_packed(RemapContext *s, const AVFrame *in, - const AVFrame *xin, const AVFrame *yin, - AVFrame *out) -{ - uint8_t *dst = out->data[0]; - const uint8_t *src = in->data[0]; - const int dlinesize = out->linesize[0]; - const int slinesize = in->linesize[0]; - const int xlinesize = xin->linesize[0] / 2; - const int ylinesize = yin->linesize[0] / 2; - const uint16_t *xmap = (const uint16_t *)xin->data[0]; - const uint16_t *ymap = (const uint16_t *)yin->data[0]; - const int step = s->step; - int c, x, y; - - for (y = 0; y < out->height; y++) { - for (x = 0; x < out->width; x++) { - for (c = 0; c < s->nb_components; c++) { - if (ymap[x] < in->height && xmap[x] < in->width) { - dst[x * step + c] = src[ymap[x] * slinesize + xmap[x] * step + c]; - } else { - dst[x * step + c] = 0; - } - } - } - dst += dlinesize; - xmap += xlinesize; - ymap += ylinesize; - } +#define DEFINE_REMAP_PACKED_FUNC(name, bits, div) \ +static int remap_packed##bits##_##name##_slice(AVFilterContext *ctx, void *arg, \ + int jobnr, int nb_jobs) \ +{ \ + RemapContext *s = ctx->priv; \ + const ThreadData *td = arg; \ + const AVFrame *in = td->in; \ + const AVFrame *xin = td->xin; \ + const AVFrame *yin = td->yin; \ + const AVFrame *out = td->out; \ + const int slice_start = (out->height * jobnr ) / nb_jobs; \ + const int slice_end = (out->height * (jobnr+1)) / nb_jobs; \ + const int dlinesize = out->linesize[0] / div; \ + const int slinesize = in->linesize[0] / div; \ + const int xlinesize = xin->linesize[0] / 2; \ + const int ylinesize = yin->linesize[0] / 2; \ + const uint##bits##_t *src = (const uint##bits##_t *)in->data[0]; \ + uint##bits##_t *dst = (uint##bits##_t *)out->data[0] + slice_start * dlinesize; \ + const uint16_t *xmap = (const uint16_t *)xin->data[0] + slice_start * xlinesize; \ + const uint16_t *ymap = (const uint16_t *)yin->data[0] + slice_start * ylinesize; \ + const int step = td->step / div; \ + int c, x, y; \ + \ + for (y = slice_start; y < slice_end; y++) { \ + for (x = 0; x < out->width; x++) { \ + for (c = 0; c < td->nb_components; c++) { \ + if (ymap[x] < in->height && xmap[x] < in->width) { \ + dst[x * step + c] = src[ymap[x] * slinesize + xmap[x] * step + c]; \ + } else { \ + dst[x * step + c] = s->fill_color[c]; \ + } \ + } \ + } \ + dst += dlinesize; \ + xmap += xlinesize; \ + ymap += ylinesize; \ + } \ + \ + return 0; \ } -static void remap_packed16(RemapContext *s, const AVFrame *in, - const AVFrame *xin, const AVFrame *yin, - AVFrame *out) -{ - uint16_t *dst = (uint16_t *)out->data[0]; - const uint16_t *src = (const uint16_t *)in->data[0]; - const int dlinesize = out->linesize[0] / 2; - const int slinesize = in->linesize[0] / 2; - const int xlinesize = xin->linesize[0] / 2; - const int ylinesize = yin->linesize[0] / 2; - const uint16_t *xmap = (const uint16_t *)xin->data[0]; - const uint16_t *ymap = (const uint16_t *)yin->data[0]; - const int step = s->step / 2; - int c, x, y; - - for (y = 0; y < out->height; y++) { - for (x = 0; x < out->width; x++) { - for (c = 0; c < s->nb_components; c++) { - if (ymap[x] < in->height && xmap[x] < in->width) { - dst[x * step + c] = src[ymap[x] * slinesize + xmap[x] * step + c]; - } else { - dst[x * step + c] = 0; - } - } - } - dst += dlinesize; - xmap += xlinesize; - ymap += ylinesize; - } -} +DEFINE_REMAP_PACKED_FUNC(nearest, 8, 1) +DEFINE_REMAP_PACKED_FUNC(nearest, 16, 2) static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; RemapContext *s = ctx->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int depth = desc->comp[0].depth; + int is_rgb = !!(desc->flags & AV_PIX_FMT_FLAG_RGB); + int factor = 1 << (depth - 8); + uint8_t rgba_map[4]; + ff_fill_rgba_map(rgba_map, inlink->format); s->nb_planes = av_pix_fmt_count_planes(inlink->format); s->nb_components = desc->nb_components; - if (desc->comp[0].depth == 8) { + if (is_rgb) { + s->fill_color[rgba_map[0]] = s->fill_rgba[0] * factor; + s->fill_color[rgba_map[1]] = s->fill_rgba[1] * factor; + s->fill_color[rgba_map[2]] = s->fill_rgba[2] * factor; + s->fill_color[rgba_map[3]] = s->fill_rgba[3] * factor; + } else { + s->fill_color[0] = RGB_TO_Y_BT709(s->fill_rgba[0], s->fill_rgba[1], s->fill_rgba[2]) * factor; + s->fill_color[1] = RGB_TO_U_BT709(s->fill_rgba[0], s->fill_rgba[1], s->fill_rgba[2], 0) * factor; + s->fill_color[2] = RGB_TO_V_BT709(s->fill_rgba[0], s->fill_rgba[1], s->fill_rgba[2], 0) * factor; + s->fill_color[3] = s->fill_rgba[3] * factor; + } + + if (depth == 8) { if (s->nb_planes > 1 || s->nb_components == 1) { - s->remap = remap_planar; + s->remap_slice = remap_planar8_nearest_slice; } else { - s->remap = remap_packed; + s->remap_slice = remap_packed8_nearest_slice; } } else { if (s->nb_planes > 1 || s->nb_components == 1) { - s->remap = remap_planar16; + s->remap_slice = remap_planar16_nearest_slice; } else { - s->remap = remap_packed16; + s->remap_slice = remap_packed16_nearest_slice; } } @@ -296,14 +288,23 @@ static int process_frame(FFFrameSync *fs) if (!out) return AVERROR(ENOMEM); } else { + ThreadData td; + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) return AVERROR(ENOMEM); av_frame_copy_props(out, in); - s->remap(s, in, xpic, ypic, out); + td.in = in; + td.xin = xpic; + td.yin = ypic; + td.out = out; + td.nb_planes = s->nb_planes; + td.nb_components = s->nb_components; + td.step = s->step; + ctx->internal->execute(ctx, s->remap_slice, &td, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); } - out->pts = av_rescale_q(in->pts, s->fs.time_base, outlink->time_base); + out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); return ff_filter_frame(outlink, out); } @@ -329,7 +330,6 @@ static int config_output(AVFilterLink *outlink) outlink->w = xlink->w; outlink->h = xlink->h; - outlink->time_base = srclink->time_base; outlink->sample_aspect_ratio = srclink->sample_aspect_ratio; outlink->frame_rate = srclink->frame_rate; @@ -353,7 +353,10 @@ static int config_output(AVFilterLink *outlink) s->fs.opaque = s; s->fs.on_event = process_frame; - return ff_framesync_configure(&s->fs); + ret = ff_framesync_configure(&s->fs); + outlink->time_base = s->fs.time_base; + + return ret; } static int activate(AVFilterContext *ctx) @@ -362,7 +365,6 @@ static int activate(AVFilterContext *ctx) return ff_framesync_activate(&s->fs); } - static av_cold void uninit(AVFilterContext *ctx) { RemapContext *s = ctx->priv; @@ -396,7 +398,7 @@ static const AVFilterPad remap_outputs[] = { { NULL } }; -AVFilter ff_vf_remap = { +const AVFilter ff_vf_remap = { .name = "remap", .description = NULL_IF_CONFIG_SMALL("Remap pixels."), .priv_size = sizeof(RemapContext), @@ -406,5 +408,5 @@ AVFilter ff_vf_remap = { .inputs = remap_inputs, .outputs = remap_outputs, .priv_class = &remap_class, - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, };