* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <float.h>
+
#include "libavutil/imgutils.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "video.h"
#define OFFSET(x) offsetof(GBlurContext, 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 gblur_options[] = {
{ "sigma", "set sigma", OFFSET(sigma), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0.0, 1024, FLAGS },
int width;
} ThreadData;
+static void postscale_c(float *buffer, int length,
+ float postscale, float min, float max)
+{
+ for (int i = 0; i < length; i++) {
+ buffer[i] *= postscale;
+ buffer[i] = av_clipf(buffer[i], min, max);
+ }
+}
+
static void horiz_slice_c(float *buffer, int width, int height, int steps,
float nu, float bscale)
{
return 0;
}
-
static int filter_postscale(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
{
GBlurContext *s = ctx->priv;
ThreadData *td = arg;
+ const float max = s->flt ? FLT_MAX : (1 << s->depth) - 1;
+ const float min = s->flt ? -FLT_MAX : 0.f;
const int height = td->height;
const int width = td->width;
- const int64_t numpixels = width * (int64_t)height;
- const unsigned slice_start = (numpixels * jobnr ) / nb_jobs;
- const unsigned slice_end = (numpixels * (jobnr+1)) / nb_jobs;
+ const int awidth = FFALIGN(width, 64);
+ const int slice_start = (height * jobnr ) / nb_jobs;
+ const int slice_end = (height * (jobnr+1)) / nb_jobs;
const float postscale = s->postscale * s->postscaleV;
- float *buffer = s->buffer;
- unsigned i;
+ const int slice_size = slice_end - slice_start;
- for (i = slice_start; i < slice_end; i++)
- buffer[i] *= postscale;
+ s->postscale_slice(s->buffer + slice_start * awidth,
+ slice_size * awidth, postscale, min, max);
return 0;
}
AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16,
AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9,
AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10,
+ AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P12,
AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16,
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16,
AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16,
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16,
+ AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32,
+ AV_PIX_FMT_GRAYF32,
AV_PIX_FMT_NONE
};
void ff_gblur_init(GBlurContext *s)
{
s->horiz_slice = horiz_slice_c;
- if (ARCH_X86_64)
+ s->postscale_slice = postscale_c;
+ if (ARCH_X86)
ff_gblur_init_x86(s);
}
GBlurContext *s = inlink->dst->priv;
s->depth = desc->comp[0].depth;
+ s->flt = !!(desc->flags & AV_PIX_FMT_FLAG_FLOAT);
s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w);
s->planewidth[0] = s->planewidth[3] = inlink->w;
s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
s->nb_planes = av_pix_fmt_count_planes(inlink->format);
- s->buffer = av_malloc_array(inlink->w, inlink->h * sizeof(*s->buffer));
+ s->buffer = av_malloc_array(FFALIGN(inlink->w, 64), FFALIGN(inlink->h, 64) * sizeof(*s->buffer));
if (!s->buffer)
return AVERROR(ENOMEM);
continue;
}
- if (s->depth == 8) {
+ if (s->flt) {
+ av_image_copy_plane((uint8_t *)bptr, width * sizeof(float),
+ in->data[plane], in->linesize[plane],
+ width * sizeof(float), height);
+ } else if (s->depth == 8) {
for (y = 0; y < height; y++) {
for (x = 0; x < width; x++) {
bptr[x] = src[x];
gaussianiir2d(ctx, plane);
bptr = s->buffer;
- if (s->depth == 8) {
+ if (s->flt) {
+ av_image_copy_plane(out->data[plane], out->linesize[plane],
+ (uint8_t *)bptr, width * sizeof(float),
+ width * sizeof(float), height);
+ } else if (s->depth == 8) {
for (y = 0; y < height; y++) {
for (x = 0; x < width; x++) {
dst[x] = bptr[x];
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)
-{
- GBlurContext *s = ctx->priv;
- int ret = 0;
-
- if ( !strcmp(cmd, "sigma") || !strcmp(cmd, "sigmaV")
- || !strcmp(cmd, "steps") || !strcmp(cmd, "planes")) {
- av_opt_set(s, cmd, args, 0);
- } else {
- ret = AVERROR(ENOSYS);
- }
-
- return ret;
-}
-
static av_cold void uninit(AVFilterContext *ctx)
{
GBlurContext *s = ctx->priv;
.inputs = gblur_inputs,
.outputs = gblur_outputs,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
- .process_command = process_command,
+ .process_command = ff_filter_process_command,
};