[FFmpeg-devel,1/5] lavfi: VAAPI VPP common infrastructure.

Submitted by Jun Zhao on Jan. 8, 2018, 8:33 a.m.

Details

Message ID 8cbc73f1-f869-9bed-b91a-b288aef2fe9a@gmail.com
State New
Headers show

Commit Message

Jun Zhao Jan. 8, 2018, 8:33 a.m.
From 17278f448133826593941ac6b105a4e81cc8b255 Mon Sep 17 00:00:00 2001
From: Jun Zhao <jun.zhao@intel.com>
Date: Mon, 8 Jan 2018 15:56:43 +0800
Subject: [PATCH 1/5] lavfi: VAAPI VPP common infrastructure.

Re-work the VA-API common infrastructure.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
---
 libavfilter/vaapi_vpp.c | 366 ++++++++++++++++++++++++++++++++++++++++++++++++
 libavfilter/vaapi_vpp.h |  75 ++++++++++
 2 files changed, 441 insertions(+)
 create mode 100644 libavfilter/vaapi_vpp.c
 create mode 100644 libavfilter/vaapi_vpp.h

Comments

Mark Thompson Jan. 14, 2018, 10:16 p.m.
Whole series generally looks good, specific comments follow for each patch.

Thanks,

- Mark


On 08/01/18 08:33, Jun Zhao wrote:
> From 17278f448133826593941ac6b105a4e81cc8b255 Mon Sep 17 00:00:00 2001
> From: Jun Zhao <jun.zhao@intel.com>
> Date: Mon, 8 Jan 2018 15:56:43 +0800
> Subject: [PATCH 1/5] lavfi: VAAPI VPP common infrastructure.
> 
> Re-work the VA-API common infrastructure.
> 
> Signed-off-by: Jun Zhao <jun.zhao@intel.com>
> ---
>  libavfilter/vaapi_vpp.c | 366 ++++++++++++++++++++++++++++++++++++++++++++++++
>  libavfilter/vaapi_vpp.h |  75 ++++++++++
>  2 files changed, 441 insertions(+)
>  create mode 100644 libavfilter/vaapi_vpp.c
>  create mode 100644 libavfilter/vaapi_vpp.h
> 
> diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c
> new file mode 100644
> index 0000000000..326a716990
> --- /dev/null
> +++ b/libavfilter/vaapi_vpp.c
> @@ -0,0 +1,366 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#include <string.h>
> +
> +#include "libavutil/avassert.h"
> +#include "libavutil/hwcontext.h"
> +#include "libavutil/hwcontext_vaapi.h"
> +
> +#include "avfilter.h"
> +#include "formats.h"
> +#include "vaapi_vpp.h"
> +
> +#include "libavutil/pixdesc.h"

Put libavutil headers before libavfilter ones.

> +
> +int vaapi_vpp_query_formats(AVFilterContext *avctx)
> +{
> +    enum AVPixelFormat pix_fmts[] = {
> +        AV_PIX_FMT_VAAPI, AV_PIX_FMT_NONE,
> +    };
> +    int err;
> +
> +    if ((err = ff_formats_ref(ff_make_format_list(pix_fmts),
> +                              &avctx->inputs[0]->out_formats)) < 0)
> +        return err;
> +    if ((err = ff_formats_ref(ff_make_format_list(pix_fmts),
> +                              &avctx->outputs[0]->in_formats)) < 0)
> +        return err;
> +
> +    return 0;
> +}
> +
> +int vaapi_vpp_pipeline_uninit(VAAPIVPPContext *ctx)
> +{
> +    int i;
> +    for (i = 0; i < ctx->nb_filter_buffers; i++) {
> +        if (ctx->filter_buffers[i] != VA_INVALID_ID) {
> +            vaDestroyBuffer(ctx->hwctx->display, ctx->filter_buffers[i]);
> +            ctx->filter_buffers[i] = VA_INVALID_ID;
> +        }
> +    }
> +    ctx->nb_filter_buffers = 0;
> +
> +    if (ctx->va_context != VA_INVALID_ID) {
> +        vaDestroyContext(ctx->hwctx->display, ctx->va_context);
> +        ctx->va_context = VA_INVALID_ID;
> +    }
> +
> +    if (ctx->va_config != VA_INVALID_ID) {
> +        vaDestroyConfig(ctx->hwctx->display, ctx->va_config);
> +        ctx->va_config = VA_INVALID_ID;
> +    }
> +
> +    av_buffer_unref(&ctx->output_frames_ref);
> +    av_buffer_unref(&ctx->device_ref);
> +    ctx->hwctx = 0;

NULL, please.

> +
> +    return 0;
> +}
> +
> +int vaapi_vpp_config_input(AVFilterLink *inlink, VAAPIVPPContext *ctx)
> +{
> +    AVFilterContext *avctx = inlink->dst;
> +
> +    if (ctx->pipeline_uninit)
> +        ctx->pipeline_uninit(avctx);

This function seems to return an error code, should it fail in that case?

> +
> +    if (!inlink->hw_frames_ctx) {
> +        av_log(avctx, AV_LOG_ERROR, "A hardware frames reference is "
> +               "required to associate the processing device.\n");
> +        return AVERROR(EINVAL);
> +    }
> +
> +    ctx->input_frames_ref = av_buffer_ref(inlink->hw_frames_ctx);

Can fail.

> +    ctx->input_frames = (AVHWFramesContext*)ctx->input_frames_ref->data;
> +
> +    return 0;
> +}
> +
> +int vaapi_vpp_config_output(AVFilterLink *outlink, VAAPIVPPContext *ctx)
> +{
> +    AVFilterContext *avctx = outlink->src;
> +    AVVAAPIHWConfig *hwconfig = NULL;
> +    AVHWFramesConstraints *constraints = NULL;
> +    AVVAAPIFramesContext *va_frames;
> +    VAStatus vas;
> +    int err, i;
> +
> +    if (ctx->pipeline_uninit)
> +        ctx->pipeline_uninit(avctx);

As above, should this fail?

> +
> +    av_assert0(ctx->input_frames);
> +    ctx->device_ref = av_buffer_ref(ctx->input_frames->device_ref);

Can fail.

> +    ctx->hwctx = ((AVHWDeviceContext*)ctx->device_ref->data)->hwctx;
> +
> +    av_assert0(ctx->va_config == VA_INVALID_ID);
> +    vas = vaCreateConfig(ctx->hwctx->display, VAProfileNone,
> +                         VAEntrypointVideoProc, 0, 0, &ctx->va_config);

The fourth argument is a pointer, so it should be NULL here.

> +    if (vas != VA_STATUS_SUCCESS) {
> +        av_log(avctx, AV_LOG_ERROR, "Failed to create processing pipeline "
> +               "config: %d (%s).\n", vas, vaErrorStr(vas));
> +        err = AVERROR(EIO);
> +        goto fail;
> +    }
> +
> +    hwconfig = av_hwdevice_hwconfig_alloc(ctx->device_ref);
> +    if (!hwconfig) {
> +        err = AVERROR(ENOMEM);
> +        goto fail;
> +    }
> +    hwconfig->config_id = ctx->va_config;
> +
> +    constraints = av_hwdevice_get_hwframe_constraints(ctx->device_ref,
> +                                                      hwconfig);
> +    if (!constraints) {
> +        err = AVERROR(ENOMEM);
> +        goto fail;
> +    }
> +
> +    if (ctx->output_format == AV_PIX_FMT_NONE)
> +        ctx->output_format = ctx->input_frames->sw_format;
> +    if (constraints->valid_sw_formats) {
> +        for (i = 0; constraints->valid_sw_formats[i] != AV_PIX_FMT_NONE; i++) {
> +            if (ctx->output_format == constraints->valid_sw_formats[i])
> +                break;
> +        }
> +        if (constraints->valid_sw_formats[i] == AV_PIX_FMT_NONE) {
> +            av_log(avctx, AV_LOG_ERROR, "Hardware does not support output "
> +                   "format %s.\n", av_get_pix_fmt_name(ctx->output_format));
> +            err = AVERROR(EINVAL);
> +            goto fail;
> +        }
> +    }
> +
> +    if (ctx->output_width  < constraints->min_width  ||
> +        ctx->output_height < constraints->min_height ||
> +        ctx->output_width  > constraints->max_width  ||
> +        ctx->output_height > constraints->max_height) {
> +        av_log(avctx, AV_LOG_ERROR, "Hardware does not support scaling to "
> +               "size %dx%d (constraints: width %d-%d height %d-%d).\n",
> +               ctx->output_width, ctx->output_height,
> +               constraints->min_width,  constraints->max_width,
> +               constraints->min_height, constraints->max_height);
> +        err = AVERROR(EINVAL);
> +        goto fail;
> +    }
> +
> +    ctx->output_frames_ref = av_hwframe_ctx_alloc(ctx->device_ref);
> +    if (!ctx->output_frames_ref) {
> +        av_log(avctx, AV_LOG_ERROR, "Failed to create HW frame context "
> +               "for output.\n");
> +        err = AVERROR(ENOMEM);
> +        goto fail;
> +    }
> +
> +    ctx->output_frames = (AVHWFramesContext*)ctx->output_frames_ref->data;
> +
> +    ctx->output_frames->format    = AV_PIX_FMT_VAAPI;
> +    ctx->output_frames->sw_format = ctx->output_format;
> +    ctx->output_frames->width     = ctx->output_width;
> +    ctx->output_frames->height    = ctx->output_height;
> +
> +    // The number of output frames we need is determined by what follows
> +    // the filter.  If it's an encoder with complex frame reference
> +    // structures then this could be very high.
> +    ctx->output_frames->initial_pool_size = 10;
> +
> +    err = av_hwframe_ctx_init(ctx->output_frames_ref);
> +    if (err < 0) {
> +        av_log(avctx, AV_LOG_ERROR, "Failed to initialise VAAPI frame "
> +               "context for output: %d\n", err);
> +        goto fail;
> +    }
> +
> +    va_frames = ctx->output_frames->hwctx;
> +
> +    av_assert0(ctx->va_context == VA_INVALID_ID);
> +    vas = vaCreateContext(ctx->hwctx->display, ctx->va_config,
> +                          ctx->output_width, ctx->output_height,
> +                          VA_PROGRESSIVE,
> +                          va_frames->surface_ids, va_frames->nb_surfaces,
> +                          &ctx->va_context);
> +    if (vas != VA_STATUS_SUCCESS) {
> +        av_log(avctx, AV_LOG_ERROR, "Failed to create processing pipeline "
> +               "context: %d (%s).\n", vas, vaErrorStr(vas));
> +        return AVERROR(EIO);
> +    }
> +
> +    outlink->w = ctx->output_width;
> +    outlink->h = ctx->output_height;
> +
> +    if (ctx->build_filter_params) {
> +        err = ctx->build_filter_params(avctx);
> +        if (err < 0)
> +            goto fail;
> +    }
> +
> +    outlink->hw_frames_ctx = av_buffer_ref(ctx->output_frames_ref);
> +    if (!outlink->hw_frames_ctx) {
> +        err = AVERROR(ENOMEM);
> +        goto fail;
> +    }
> +
> +    av_freep(&hwconfig);
> +    av_hwframe_constraints_free(&constraints);
> +    return 0;
> +
> +fail:
> +    av_buffer_unref(&ctx->output_frames_ref);
> +    av_freep(&hwconfig);
> +    av_hwframe_constraints_free(&constraints);
> +    return err;
> +}
> +
> +int vaapi_vpp_colour_standard(enum AVColorSpace av_cs)
> +{
> +    switch(av_cs) {
> +#define CS(av, va) case AVCOL_SPC_ ## av: return VAProcColorStandard ## va;
> +        CS(BT709,     BT709);
> +        CS(BT470BG,   BT601);
> +        CS(SMPTE170M, SMPTE170M);
> +        CS(SMPTE240M, SMPTE240M);
> +#undef CS
> +    default:
> +        return VAProcColorStandardNone;
> +    }
> +}
> +
> +int vaapi_vpp_make_param_buffers(VAAPIVPPContext *ctx,
> +                                int type,
> +                                const void *data,
> +                                size_t size,
> +                                int count)
> +{
> +    VAStatus vas;
> +    VABufferID buffer;
> +
> +    av_assert0(ctx->nb_filter_buffers + 1 <= VAProcFilterCount);
> +
> +    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
> +                         type, size, count, (void*)data, &buffer);
> +    if (vas != VA_STATUS_SUCCESS) {
> +        av_log(ctx, AV_LOG_ERROR, "Failed to create parameter "
> +               "buffer (type %d): %d (%s).\n",
> +               type, vas, vaErrorStr(vas));
> +        return AVERROR(EIO);
> +    }
> +
> +    ctx->filter_buffers[ctx->nb_filter_buffers++] = buffer;
> +
> +    av_log(ctx, AV_LOG_DEBUG, "Param buffer (type %d, %zu bytes, count %d) "
> +           "is %#x.\n", type, size, count, buffer);
> +    return 0;
> +}
> +
> +
> +int vaapi_vpp_render_picture(VAAPIVPPContext *ctx,
> +                             VAProcPipelineParameterBuffer *params,
> +                             VASurfaceID output_surface)
> +{
> +    VABufferID params_id;
> +    VAStatus vas;
> +    int err = 0;
> +
> +    vas = vaBeginPicture(ctx->hwctx->display,
> +                         ctx->va_context, output_surface);
> +    if (vas != VA_STATUS_SUCCESS) {
> +        av_log(ctx, AV_LOG_ERROR, "Failed to attach new picture: "
> +               "%d (%s).\n", vas, vaErrorStr(vas));
> +        err = AVERROR(EIO);
> +        goto fail;
> +    }
> +
> +    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
> +                         VAProcPipelineParameterBufferType,
> +                         sizeof(*params), 1, params, &params_id);
> +    if (vas != VA_STATUS_SUCCESS) {
> +        av_log(ctx, AV_LOG_ERROR, "Failed to create parameter buffer: "
> +               "%d (%s).\n", vas, vaErrorStr(vas));
> +        err = AVERROR(EIO);
> +        goto fail_after_begin;
> +    }
> +    av_log(ctx, AV_LOG_DEBUG, "Pipeline parameter buffer is %#x.\n",
> +           params_id);
> +
> +    vas = vaRenderPicture(ctx->hwctx->display, ctx->va_context,
> +                          &params_id, 1);
> +    if (vas != VA_STATUS_SUCCESS) {
> +        av_log(ctx, AV_LOG_ERROR, "Failed to render parameter buffer: "
> +               "%d (%s).\n", vas, vaErrorStr(vas));
> +        err = AVERROR(EIO);
> +        goto fail_after_begin;
> +    }
> +
> +    vas = vaEndPicture(ctx->hwctx->display, ctx->va_context);
> +    if (vas != VA_STATUS_SUCCESS) {
> +        av_log(ctx, AV_LOG_ERROR, "Failed to start picture processing: "
> +               "%d (%s).\n", vas, vaErrorStr(vas));
> +        err = AVERROR(EIO);
> +        goto fail_after_render;
> +    }
> +
> +    if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks &
> +        AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) {
> +        vas = vaDestroyBuffer(ctx->hwctx->display, params_id);
> +        if (vas != VA_STATUS_SUCCESS) {
> +            av_log(ctx, AV_LOG_ERROR, "Failed to free parameter buffer: "
> +                   "%d (%s).\n", vas, vaErrorStr(vas));
> +            // And ignore.
> +        }
> +    }
> +
> +    return 0;
> +
> +    // We want to make sure that if vaBeginPicture has been called, we also
> +    // call vaRenderPicture and vaEndPicture.  These calls may well fail or
> +    // do something else nasty, but once we're in this failure case there
> +    // isn't much else we can do.
> +fail_after_begin:
> +    vaRenderPicture(ctx->hwctx->display, ctx->va_context, &params_id, 1);
> +fail_after_render:
> +    vaEndPicture(ctx->hwctx->display, ctx->va_context);
> +fail:
> +    return err;
> +}
> +
> +int vaapi_vpp_ctx_init(VAAPIVPPContext *ctx)
> +{
> +    int i;
> +    ctx->va_config     = VA_INVALID_ID;
> +    ctx->va_context    = VA_INVALID_ID;
> +    ctx->valid_ids  = 1;

Funny alignment.

> +
> +    for (i = 0; i < VAProcFilterCount; i++)
> +        ctx->filter_buffers[i] = VA_INVALID_ID;
> +    ctx->nb_filter_buffers = 0;
> +
> +    return 0;
> +}
> +
> +void vaapi_vpp_ctx_uninit(AVFilterContext *avctx, VAAPIVPPContext *ctx)
> +{
> +    if (ctx->valid_ids && ctx->pipeline_uninit)
> +        ctx->pipeline_uninit(avctx);
> +
> +    av_buffer_unref(&ctx->input_frames_ref);
> +    av_buffer_unref(&ctx->output_frames_ref);
> +    av_buffer_unref(&ctx->device_ref);
> +
> +    av_free(ctx);
> +}
> diff --git a/libavfilter/vaapi_vpp.h b/libavfilter/vaapi_vpp.h
> new file mode 100644
> index 0000000000..01eb754011
> --- /dev/null
> +++ b/libavfilter/vaapi_vpp.h
> @@ -0,0 +1,75 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#ifndef AVFILTER_VAAPI_VPP_H
> +#define AVFILTER_VAAPI_VPP_H

This needs some includes - try "make checkheaders".

> +
> +typedef struct VAAPIVPPContext {
> +    const AVClass *class;

This class member never actually gets set, so the messages don't get attached to any context.

To fix that, can we place this context at the beginning of every private data context, such that the AVClass member is actually the same one?  If the main argument to the functions was made the AVFilterContext as well, that would also allow removing quite a few of the proxy-only functions in later patches (e.g. scale_vaapi_query_formats(), scale_vaapi_config_input(), scale_vaapi_uninit() can all be removed from that filter).

> +
> +    AVVAAPIDeviceContext *hwctx;
> +    AVBufferRef *device_ref;
> +
> +    int valid_ids;
> +    VAConfigID  va_config;
> +    VAContextID va_context;
> +
> +    AVBufferRef       *input_frames_ref;
> +    AVHWFramesContext *input_frames;
> +
> +    AVBufferRef       *output_frames_ref;
> +    AVHWFramesContext *output_frames;
> +
> +    enum AVPixelFormat output_format;
> +    int output_width;   // computed width
> +    int output_height;  // computed height
> +
> +    VABufferID         filter_buffers[VAProcFilterCount];
> +    int                nb_filter_buffers;
> +
> +    int (*build_filter_params)(AVFilterContext *avctx);
> +
> +    int (*pipeline_uninit)(AVFilterContext *avctx);
> +
> +} VAAPIVPPContext;
> +
> +int vaapi_vpp_ctx_init(VAAPIVPPContext *ctx);
> +
> +void vaapi_vpp_ctx_uninit(AVFilterContext *avctx, VAAPIVPPContext *ctx);
> +
> +int vaapi_vpp_query_formats(AVFilterContext *avctx);
> +
> +int vaapi_vpp_pipeline_uninit(VAAPIVPPContext *ctx);
> +
> +int vaapi_vpp_config_input(AVFilterLink *inlink, VAAPIVPPContext *ctx);
> +
> +int vaapi_vpp_config_output(AVFilterLink *outlink, VAAPIVPPContext *ctx);
> +
> +int vaapi_vpp_colour_standard(enum AVColorSpace av_cs);
> +
> +int vaapi_vpp_make_param_buffers(VAAPIVPPContext *ctx,
> +                                 int type,
> +                                 const void *data,
> +                                 size_t size,
> +                                 int count);
> +
> +int vaapi_vpp_render_picture(VAAPIVPPContext *ctx,
> +                             VAProcPipelineParameterBuffer *params,
> +                             VASurfaceID output_surface);
> +
> +#endif /* AVFILTER_VAAPI_VPP_H */
> -- 
> 2.14.1
>
Jun Zhao Jan. 15, 2018, 5:22 a.m.
On 2018/1/15 6:16, Mark Thompson wrote:
> Whole series generally looks good, specific comments follow for each patch.
>
> Thanks,
>
> - Mark
Thanks the great review for whole series patches, Mark, will follow the
comments , Thanks.
>
>
> On 08/01/18 08:33, Jun Zhao wrote:
>> From 17278f448133826593941ac6b105a4e81cc8b255 Mon Sep 17 00:00:00 2001
>> From: Jun Zhao <jun.zhao@intel.com>
>> Date: Mon, 8 Jan 2018 15:56:43 +0800
>> Subject: [PATCH 1/5] lavfi: VAAPI VPP common infrastructure.
>>
>> Re-work the VA-API common infrastructure.
>>
>> Signed-off-by: Jun Zhao <jun.zhao@intel.com>
>> ---
>>  libavfilter/vaapi_vpp.c | 366 ++++++++++++++++++++++++++++++++++++++++++++++++
>>  libavfilter/vaapi_vpp.h |  75 ++++++++++
>>  2 files changed, 441 insertions(+)
>>  create mode 100644 libavfilter/vaapi_vpp.c
>>  create mode 100644 libavfilter/vaapi_vpp.h
>>
>> diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c
>> new file mode 100644
>> index 0000000000..326a716990
>> --- /dev/null
>> +++ b/libavfilter/vaapi_vpp.c
>> @@ -0,0 +1,366 @@
>> +/*
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * FFmpeg is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>> + */
>> +
>> +#include <string.h>
>> +
>> +#include "libavutil/avassert.h"
>> +#include "libavutil/hwcontext.h"
>> +#include "libavutil/hwcontext_vaapi.h"
>> +
>> +#include "avfilter.h"
>> +#include "formats.h"
>> +#include "vaapi_vpp.h"
>> +
>> +#include "libavutil/pixdesc.h"
> Put libavutil headers before libavfilter ones.
>
>> +
>> +int vaapi_vpp_query_formats(AVFilterContext *avctx)
>> +{
>> +    enum AVPixelFormat pix_fmts[] = {
>> +        AV_PIX_FMT_VAAPI, AV_PIX_FMT_NONE,
>> +    };
>> +    int err;
>> +
>> +    if ((err = ff_formats_ref(ff_make_format_list(pix_fmts),
>> +                              &avctx->inputs[0]->out_formats)) < 0)
>> +        return err;
>> +    if ((err = ff_formats_ref(ff_make_format_list(pix_fmts),
>> +                              &avctx->outputs[0]->in_formats)) < 0)
>> +        return err;
>> +
>> +    return 0;
>> +}
>> +
>> +int vaapi_vpp_pipeline_uninit(VAAPIVPPContext *ctx)
>> +{
>> +    int i;
>> +    for (i = 0; i < ctx->nb_filter_buffers; i++) {
>> +        if (ctx->filter_buffers[i] != VA_INVALID_ID) {
>> +            vaDestroyBuffer(ctx->hwctx->display, ctx->filter_buffers[i]);
>> +            ctx->filter_buffers[i] = VA_INVALID_ID;
>> +        }
>> +    }
>> +    ctx->nb_filter_buffers = 0;
>> +
>> +    if (ctx->va_context != VA_INVALID_ID) {
>> +        vaDestroyContext(ctx->hwctx->display, ctx->va_context);
>> +        ctx->va_context = VA_INVALID_ID;
>> +    }
>> +
>> +    if (ctx->va_config != VA_INVALID_ID) {
>> +        vaDestroyConfig(ctx->hwctx->display, ctx->va_config);
>> +        ctx->va_config = VA_INVALID_ID;
>> +    }
>> +
>> +    av_buffer_unref(&ctx->output_frames_ref);
>> +    av_buffer_unref(&ctx->device_ref);
>> +    ctx->hwctx = 0;
> NULL, please.
>
>> +
>> +    return 0;
>> +}
>> +
>> +int vaapi_vpp_config_input(AVFilterLink *inlink, VAAPIVPPContext *ctx)
>> +{
>> +    AVFilterContext *avctx = inlink->dst;
>> +
>> +    if (ctx->pipeline_uninit)
>> +        ctx->pipeline_uninit(avctx);
> This function seems to return an error code, should it fail in that case?
>
>> +
>> +    if (!inlink->hw_frames_ctx) {
>> +        av_log(avctx, AV_LOG_ERROR, "A hardware frames reference is "
>> +               "required to associate the processing device.\n");
>> +        return AVERROR(EINVAL);
>> +    }
>> +
>> +    ctx->input_frames_ref = av_buffer_ref(inlink->hw_frames_ctx);
> Can fail.
>
>> +    ctx->input_frames = (AVHWFramesContext*)ctx->input_frames_ref->data;
>> +
>> +    return 0;
>> +}
>> +
>> +int vaapi_vpp_config_output(AVFilterLink *outlink, VAAPIVPPContext *ctx)
>> +{
>> +    AVFilterContext *avctx = outlink->src;
>> +    AVVAAPIHWConfig *hwconfig = NULL;
>> +    AVHWFramesConstraints *constraints = NULL;
>> +    AVVAAPIFramesContext *va_frames;
>> +    VAStatus vas;
>> +    int err, i;
>> +
>> +    if (ctx->pipeline_uninit)
>> +        ctx->pipeline_uninit(avctx);
> As above, should this fail?
>
>> +
>> +    av_assert0(ctx->input_frames);
>> +    ctx->device_ref = av_buffer_ref(ctx->input_frames->device_ref);
> Can fail.
>
>> +    ctx->hwctx = ((AVHWDeviceContext*)ctx->device_ref->data)->hwctx;
>> +
>> +    av_assert0(ctx->va_config == VA_INVALID_ID);
>> +    vas = vaCreateConfig(ctx->hwctx->display, VAProfileNone,
>> +                         VAEntrypointVideoProc, 0, 0, &ctx->va_config);
> The fourth argument is a pointer, so it should be NULL here.
>
>> +    if (vas != VA_STATUS_SUCCESS) {
>> +        av_log(avctx, AV_LOG_ERROR, "Failed to create processing pipeline "
>> +               "config: %d (%s).\n", vas, vaErrorStr(vas));
>> +        err = AVERROR(EIO);
>> +        goto fail;
>> +    }
>> +
>> +    hwconfig = av_hwdevice_hwconfig_alloc(ctx->device_ref);
>> +    if (!hwconfig) {
>> +        err = AVERROR(ENOMEM);
>> +        goto fail;
>> +    }
>> +    hwconfig->config_id = ctx->va_config;
>> +
>> +    constraints = av_hwdevice_get_hwframe_constraints(ctx->device_ref,
>> +                                                      hwconfig);
>> +    if (!constraints) {
>> +        err = AVERROR(ENOMEM);
>> +        goto fail;
>> +    }
>> +
>> +    if (ctx->output_format == AV_PIX_FMT_NONE)
>> +        ctx->output_format = ctx->input_frames->sw_format;
>> +    if (constraints->valid_sw_formats) {
>> +        for (i = 0; constraints->valid_sw_formats[i] != AV_PIX_FMT_NONE; i++) {
>> +            if (ctx->output_format == constraints->valid_sw_formats[i])
>> +                break;
>> +        }
>> +        if (constraints->valid_sw_formats[i] == AV_PIX_FMT_NONE) {
>> +            av_log(avctx, AV_LOG_ERROR, "Hardware does not support output "
>> +                   "format %s.\n", av_get_pix_fmt_name(ctx->output_format));
>> +            err = AVERROR(EINVAL);
>> +            goto fail;
>> +        }
>> +    }
>> +
>> +    if (ctx->output_width  < constraints->min_width  ||
>> +        ctx->output_height < constraints->min_height ||
>> +        ctx->output_width  > constraints->max_width  ||
>> +        ctx->output_height > constraints->max_height) {
>> +        av_log(avctx, AV_LOG_ERROR, "Hardware does not support scaling to "
>> +               "size %dx%d (constraints: width %d-%d height %d-%d).\n",
>> +               ctx->output_width, ctx->output_height,
>> +               constraints->min_width,  constraints->max_width,
>> +               constraints->min_height, constraints->max_height);
>> +        err = AVERROR(EINVAL);
>> +        goto fail;
>> +    }
>> +
>> +    ctx->output_frames_ref = av_hwframe_ctx_alloc(ctx->device_ref);
>> +    if (!ctx->output_frames_ref) {
>> +        av_log(avctx, AV_LOG_ERROR, "Failed to create HW frame context "
>> +               "for output.\n");
>> +        err = AVERROR(ENOMEM);
>> +        goto fail;
>> +    }
>> +
>> +    ctx->output_frames = (AVHWFramesContext*)ctx->output_frames_ref->data;
>> +
>> +    ctx->output_frames->format    = AV_PIX_FMT_VAAPI;
>> +    ctx->output_frames->sw_format = ctx->output_format;
>> +    ctx->output_frames->width     = ctx->output_width;
>> +    ctx->output_frames->height    = ctx->output_height;
>> +
>> +    // The number of output frames we need is determined by what follows
>> +    // the filter.  If it's an encoder with complex frame reference
>> +    // structures then this could be very high.
>> +    ctx->output_frames->initial_pool_size = 10;
>> +
>> +    err = av_hwframe_ctx_init(ctx->output_frames_ref);
>> +    if (err < 0) {
>> +        av_log(avctx, AV_LOG_ERROR, "Failed to initialise VAAPI frame "
>> +               "context for output: %d\n", err);
>> +        goto fail;
>> +    }
>> +
>> +    va_frames = ctx->output_frames->hwctx;
>> +
>> +    av_assert0(ctx->va_context == VA_INVALID_ID);
>> +    vas = vaCreateContext(ctx->hwctx->display, ctx->va_config,
>> +                          ctx->output_width, ctx->output_height,
>> +                          VA_PROGRESSIVE,
>> +                          va_frames->surface_ids, va_frames->nb_surfaces,
>> +                          &ctx->va_context);
>> +    if (vas != VA_STATUS_SUCCESS) {
>> +        av_log(avctx, AV_LOG_ERROR, "Failed to create processing pipeline "
>> +               "context: %d (%s).\n", vas, vaErrorStr(vas));
>> +        return AVERROR(EIO);
>> +    }
>> +
>> +    outlink->w = ctx->output_width;
>> +    outlink->h = ctx->output_height;
>> +
>> +    if (ctx->build_filter_params) {
>> +        err = ctx->build_filter_params(avctx);
>> +        if (err < 0)
>> +            goto fail;
>> +    }
>> +
>> +    outlink->hw_frames_ctx = av_buffer_ref(ctx->output_frames_ref);
>> +    if (!outlink->hw_frames_ctx) {
>> +        err = AVERROR(ENOMEM);
>> +        goto fail;
>> +    }
>> +
>> +    av_freep(&hwconfig);
>> +    av_hwframe_constraints_free(&constraints);
>> +    return 0;
>> +
>> +fail:
>> +    av_buffer_unref(&ctx->output_frames_ref);
>> +    av_freep(&hwconfig);
>> +    av_hwframe_constraints_free(&constraints);
>> +    return err;
>> +}
>> +
>> +int vaapi_vpp_colour_standard(enum AVColorSpace av_cs)
>> +{
>> +    switch(av_cs) {
>> +#define CS(av, va) case AVCOL_SPC_ ## av: return VAProcColorStandard ## va;
>> +        CS(BT709,     BT709);
>> +        CS(BT470BG,   BT601);
>> +        CS(SMPTE170M, SMPTE170M);
>> +        CS(SMPTE240M, SMPTE240M);
>> +#undef CS
>> +    default:
>> +        return VAProcColorStandardNone;
>> +    }
>> +}
>> +
>> +int vaapi_vpp_make_param_buffers(VAAPIVPPContext *ctx,
>> +                                int type,
>> +                                const void *data,
>> +                                size_t size,
>> +                                int count)
>> +{
>> +    VAStatus vas;
>> +    VABufferID buffer;
>> +
>> +    av_assert0(ctx->nb_filter_buffers + 1 <= VAProcFilterCount);
>> +
>> +    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
>> +                         type, size, count, (void*)data, &buffer);
>> +    if (vas != VA_STATUS_SUCCESS) {
>> +        av_log(ctx, AV_LOG_ERROR, "Failed to create parameter "
>> +               "buffer (type %d): %d (%s).\n",
>> +               type, vas, vaErrorStr(vas));
>> +        return AVERROR(EIO);
>> +    }
>> +
>> +    ctx->filter_buffers[ctx->nb_filter_buffers++] = buffer;
>> +
>> +    av_log(ctx, AV_LOG_DEBUG, "Param buffer (type %d, %zu bytes, count %d) "
>> +           "is %#x.\n", type, size, count, buffer);
>> +    return 0;
>> +}
>> +
>> +
>> +int vaapi_vpp_render_picture(VAAPIVPPContext *ctx,
>> +                             VAProcPipelineParameterBuffer *params,
>> +                             VASurfaceID output_surface)
>> +{
>> +    VABufferID params_id;
>> +    VAStatus vas;
>> +    int err = 0;
>> +
>> +    vas = vaBeginPicture(ctx->hwctx->display,
>> +                         ctx->va_context, output_surface);
>> +    if (vas != VA_STATUS_SUCCESS) {
>> +        av_log(ctx, AV_LOG_ERROR, "Failed to attach new picture: "
>> +               "%d (%s).\n", vas, vaErrorStr(vas));
>> +        err = AVERROR(EIO);
>> +        goto fail;
>> +    }
>> +
>> +    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
>> +                         VAProcPipelineParameterBufferType,
>> +                         sizeof(*params), 1, params, &params_id);
>> +    if (vas != VA_STATUS_SUCCESS) {
>> +        av_log(ctx, AV_LOG_ERROR, "Failed to create parameter buffer: "
>> +               "%d (%s).\n", vas, vaErrorStr(vas));
>> +        err = AVERROR(EIO);
>> +        goto fail_after_begin;
>> +    }
>> +    av_log(ctx, AV_LOG_DEBUG, "Pipeline parameter buffer is %#x.\n",
>> +           params_id);
>> +
>> +    vas = vaRenderPicture(ctx->hwctx->display, ctx->va_context,
>> +                          &params_id, 1);
>> +    if (vas != VA_STATUS_SUCCESS) {
>> +        av_log(ctx, AV_LOG_ERROR, "Failed to render parameter buffer: "
>> +               "%d (%s).\n", vas, vaErrorStr(vas));
>> +        err = AVERROR(EIO);
>> +        goto fail_after_begin;
>> +    }
>> +
>> +    vas = vaEndPicture(ctx->hwctx->display, ctx->va_context);
>> +    if (vas != VA_STATUS_SUCCESS) {
>> +        av_log(ctx, AV_LOG_ERROR, "Failed to start picture processing: "
>> +               "%d (%s).\n", vas, vaErrorStr(vas));
>> +        err = AVERROR(EIO);
>> +        goto fail_after_render;
>> +    }
>> +
>> +    if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks &
>> +        AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) {
>> +        vas = vaDestroyBuffer(ctx->hwctx->display, params_id);
>> +        if (vas != VA_STATUS_SUCCESS) {
>> +            av_log(ctx, AV_LOG_ERROR, "Failed to free parameter buffer: "
>> +                   "%d (%s).\n", vas, vaErrorStr(vas));
>> +            // And ignore.
>> +        }
>> +    }
>> +
>> +    return 0;
>> +
>> +    // We want to make sure that if vaBeginPicture has been called, we also
>> +    // call vaRenderPicture and vaEndPicture.  These calls may well fail or
>> +    // do something else nasty, but once we're in this failure case there
>> +    // isn't much else we can do.
>> +fail_after_begin:
>> +    vaRenderPicture(ctx->hwctx->display, ctx->va_context, &params_id, 1);
>> +fail_after_render:
>> +    vaEndPicture(ctx->hwctx->display, ctx->va_context);
>> +fail:
>> +    return err;
>> +}
>> +
>> +int vaapi_vpp_ctx_init(VAAPIVPPContext *ctx)
>> +{
>> +    int i;
>> +    ctx->va_config     = VA_INVALID_ID;
>> +    ctx->va_context    = VA_INVALID_ID;
>> +    ctx->valid_ids  = 1;
> Funny alignment.
>
>> +
>> +    for (i = 0; i < VAProcFilterCount; i++)
>> +        ctx->filter_buffers[i] = VA_INVALID_ID;
>> +    ctx->nb_filter_buffers = 0;
>> +
>> +    return 0;
>> +}
>> +
>> +void vaapi_vpp_ctx_uninit(AVFilterContext *avctx, VAAPIVPPContext *ctx)
>> +{
>> +    if (ctx->valid_ids && ctx->pipeline_uninit)
>> +        ctx->pipeline_uninit(avctx);
>> +
>> +    av_buffer_unref(&ctx->input_frames_ref);
>> +    av_buffer_unref(&ctx->output_frames_ref);
>> +    av_buffer_unref(&ctx->device_ref);
>> +
>> +    av_free(ctx);
>> +}
>> diff --git a/libavfilter/vaapi_vpp.h b/libavfilter/vaapi_vpp.h
>> new file mode 100644
>> index 0000000000..01eb754011
>> --- /dev/null
>> +++ b/libavfilter/vaapi_vpp.h
>> @@ -0,0 +1,75 @@
>> +/*
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * FFmpeg is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>> + */
>> +
>> +#ifndef AVFILTER_VAAPI_VPP_H
>> +#define AVFILTER_VAAPI_VPP_H
> This needs some includes - try "make checkheaders".
>
>> +
>> +typedef struct VAAPIVPPContext {
>> +    const AVClass *class;
> This class member never actually gets set, so the messages don't get attached to any context.
>
> To fix that, can we place this context at the beginning of every private data context, such that the AVClass member is actually the same one?  If the main argument to the functions was made the AVFilterContext as well, that would also allow removing quite a few of the proxy-only functions in later patches (e.g. scale_vaapi_query_formats(), scale_vaapi_config_input(), scale_vaapi_uninit() can all be removed from that filter).
>
>> +
>> +    AVVAAPIDeviceContext *hwctx;
>> +    AVBufferRef *device_ref;
>> +
>> +    int valid_ids;
>> +    VAConfigID  va_config;
>> +    VAContextID va_context;
>> +
>> +    AVBufferRef       *input_frames_ref;
>> +    AVHWFramesContext *input_frames;
>> +
>> +    AVBufferRef       *output_frames_ref;
>> +    AVHWFramesContext *output_frames;
>> +
>> +    enum AVPixelFormat output_format;
>> +    int output_width;   // computed width
>> +    int output_height;  // computed height
>> +
>> +    VABufferID         filter_buffers[VAProcFilterCount];
>> +    int                nb_filter_buffers;
>> +
>> +    int (*build_filter_params)(AVFilterContext *avctx);
>> +
>> +    int (*pipeline_uninit)(AVFilterContext *avctx);
>> +
>> +} VAAPIVPPContext;
>> +
>> +int vaapi_vpp_ctx_init(VAAPIVPPContext *ctx);
>> +
>> +void vaapi_vpp_ctx_uninit(AVFilterContext *avctx, VAAPIVPPContext *ctx);
>> +
>> +int vaapi_vpp_query_formats(AVFilterContext *avctx);
>> +
>> +int vaapi_vpp_pipeline_uninit(VAAPIVPPContext *ctx);
>> +
>> +int vaapi_vpp_config_input(AVFilterLink *inlink, VAAPIVPPContext *ctx);
>> +
>> +int vaapi_vpp_config_output(AVFilterLink *outlink, VAAPIVPPContext *ctx);
>> +
>> +int vaapi_vpp_colour_standard(enum AVColorSpace av_cs);
>> +
>> +int vaapi_vpp_make_param_buffers(VAAPIVPPContext *ctx,
>> +                                 int type,
>> +                                 const void *data,
>> +                                 size_t size,
>> +                                 int count);
>> +
>> +int vaapi_vpp_render_picture(VAAPIVPPContext *ctx,
>> +                             VAProcPipelineParameterBuffer *params,
>> +                             VASurfaceID output_surface);
>> +
>> +#endif /* AVFILTER_VAAPI_VPP_H */
>> -- 
>> 2.14.1
>>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Patch hide | download patch | download mbox

diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c
new file mode 100644
index 0000000000..326a716990
--- /dev/null
+++ b/libavfilter/vaapi_vpp.c
@@ -0,0 +1,366 @@ 
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <string.h>
+
+#include "libavutil/avassert.h"
+#include "libavutil/hwcontext.h"
+#include "libavutil/hwcontext_vaapi.h"
+
+#include "avfilter.h"
+#include "formats.h"
+#include "vaapi_vpp.h"
+
+#include "libavutil/pixdesc.h"
+
+int vaapi_vpp_query_formats(AVFilterContext *avctx)
+{
+    enum AVPixelFormat pix_fmts[] = {
+        AV_PIX_FMT_VAAPI, AV_PIX_FMT_NONE,
+    };
+    int err;
+
+    if ((err = ff_formats_ref(ff_make_format_list(pix_fmts),
+                              &avctx->inputs[0]->out_formats)) < 0)
+        return err;
+    if ((err = ff_formats_ref(ff_make_format_list(pix_fmts),
+                              &avctx->outputs[0]->in_formats)) < 0)
+        return err;
+
+    return 0;
+}
+
+int vaapi_vpp_pipeline_uninit(VAAPIVPPContext *ctx)
+{
+    int i;
+    for (i = 0; i < ctx->nb_filter_buffers; i++) {
+        if (ctx->filter_buffers[i] != VA_INVALID_ID) {
+            vaDestroyBuffer(ctx->hwctx->display, ctx->filter_buffers[i]);
+            ctx->filter_buffers[i] = VA_INVALID_ID;
+        }
+    }
+    ctx->nb_filter_buffers = 0;
+
+    if (ctx->va_context != VA_INVALID_ID) {
+        vaDestroyContext(ctx->hwctx->display, ctx->va_context);
+        ctx->va_context = VA_INVALID_ID;
+    }
+
+    if (ctx->va_config != VA_INVALID_ID) {
+        vaDestroyConfig(ctx->hwctx->display, ctx->va_config);
+        ctx->va_config = VA_INVALID_ID;
+    }
+
+    av_buffer_unref(&ctx->output_frames_ref);
+    av_buffer_unref(&ctx->device_ref);
+    ctx->hwctx = 0;
+
+    return 0;
+}
+
+int vaapi_vpp_config_input(AVFilterLink *inlink, VAAPIVPPContext *ctx)
+{
+    AVFilterContext *avctx = inlink->dst;
+
+    if (ctx->pipeline_uninit)
+        ctx->pipeline_uninit(avctx);
+
+    if (!inlink->hw_frames_ctx) {
+        av_log(avctx, AV_LOG_ERROR, "A hardware frames reference is "
+               "required to associate the processing device.\n");
+        return AVERROR(EINVAL);
+    }
+
+    ctx->input_frames_ref = av_buffer_ref(inlink->hw_frames_ctx);
+    ctx->input_frames = (AVHWFramesContext*)ctx->input_frames_ref->data;
+
+    return 0;
+}
+
+int vaapi_vpp_config_output(AVFilterLink *outlink, VAAPIVPPContext *ctx)
+{
+    AVFilterContext *avctx = outlink->src;
+    AVVAAPIHWConfig *hwconfig = NULL;
+    AVHWFramesConstraints *constraints = NULL;
+    AVVAAPIFramesContext *va_frames;
+    VAStatus vas;
+    int err, i;
+
+    if (ctx->pipeline_uninit)
+        ctx->pipeline_uninit(avctx);
+
+    av_assert0(ctx->input_frames);
+    ctx->device_ref = av_buffer_ref(ctx->input_frames->device_ref);
+    ctx->hwctx = ((AVHWDeviceContext*)ctx->device_ref->data)->hwctx;
+
+    av_assert0(ctx->va_config == VA_INVALID_ID);
+    vas = vaCreateConfig(ctx->hwctx->display, VAProfileNone,
+                         VAEntrypointVideoProc, 0, 0, &ctx->va_config);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to create processing pipeline "
+               "config: %d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail;
+    }
+
+    hwconfig = av_hwdevice_hwconfig_alloc(ctx->device_ref);
+    if (!hwconfig) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+    hwconfig->config_id = ctx->va_config;
+
+    constraints = av_hwdevice_get_hwframe_constraints(ctx->device_ref,
+                                                      hwconfig);
+    if (!constraints) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    if (ctx->output_format == AV_PIX_FMT_NONE)
+        ctx->output_format = ctx->input_frames->sw_format;
+    if (constraints->valid_sw_formats) {
+        for (i = 0; constraints->valid_sw_formats[i] != AV_PIX_FMT_NONE; i++) {
+            if (ctx->output_format == constraints->valid_sw_formats[i])
+                break;
+        }
+        if (constraints->valid_sw_formats[i] == AV_PIX_FMT_NONE) {
+            av_log(avctx, AV_LOG_ERROR, "Hardware does not support output "
+                   "format %s.\n", av_get_pix_fmt_name(ctx->output_format));
+            err = AVERROR(EINVAL);
+            goto fail;
+        }
+    }
+
+    if (ctx->output_width  < constraints->min_width  ||
+        ctx->output_height < constraints->min_height ||
+        ctx->output_width  > constraints->max_width  ||
+        ctx->output_height > constraints->max_height) {
+        av_log(avctx, AV_LOG_ERROR, "Hardware does not support scaling to "
+               "size %dx%d (constraints: width %d-%d height %d-%d).\n",
+               ctx->output_width, ctx->output_height,
+               constraints->min_width,  constraints->max_width,
+               constraints->min_height, constraints->max_height);
+        err = AVERROR(EINVAL);
+        goto fail;
+    }
+
+    ctx->output_frames_ref = av_hwframe_ctx_alloc(ctx->device_ref);
+    if (!ctx->output_frames_ref) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to create HW frame context "
+               "for output.\n");
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    ctx->output_frames = (AVHWFramesContext*)ctx->output_frames_ref->data;
+
+    ctx->output_frames->format    = AV_PIX_FMT_VAAPI;
+    ctx->output_frames->sw_format = ctx->output_format;
+    ctx->output_frames->width     = ctx->output_width;
+    ctx->output_frames->height    = ctx->output_height;
+
+    // The number of output frames we need is determined by what follows
+    // the filter.  If it's an encoder with complex frame reference
+    // structures then this could be very high.
+    ctx->output_frames->initial_pool_size = 10;
+
+    err = av_hwframe_ctx_init(ctx->output_frames_ref);
+    if (err < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to initialise VAAPI frame "
+               "context for output: %d\n", err);
+        goto fail;
+    }
+
+    va_frames = ctx->output_frames->hwctx;
+
+    av_assert0(ctx->va_context == VA_INVALID_ID);
+    vas = vaCreateContext(ctx->hwctx->display, ctx->va_config,
+                          ctx->output_width, ctx->output_height,
+                          VA_PROGRESSIVE,
+                          va_frames->surface_ids, va_frames->nb_surfaces,
+                          &ctx->va_context);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to create processing pipeline "
+               "context: %d (%s).\n", vas, vaErrorStr(vas));
+        return AVERROR(EIO);
+    }
+
+    outlink->w = ctx->output_width;
+    outlink->h = ctx->output_height;
+
+    if (ctx->build_filter_params) {
+        err = ctx->build_filter_params(avctx);
+        if (err < 0)
+            goto fail;
+    }
+
+    outlink->hw_frames_ctx = av_buffer_ref(ctx->output_frames_ref);
+    if (!outlink->hw_frames_ctx) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    av_freep(&hwconfig);
+    av_hwframe_constraints_free(&constraints);
+    return 0;
+
+fail:
+    av_buffer_unref(&ctx->output_frames_ref);
+    av_freep(&hwconfig);
+    av_hwframe_constraints_free(&constraints);
+    return err;
+}
+
+int vaapi_vpp_colour_standard(enum AVColorSpace av_cs)
+{
+    switch(av_cs) {
+#define CS(av, va) case AVCOL_SPC_ ## av: return VAProcColorStandard ## va;
+        CS(BT709,     BT709);
+        CS(BT470BG,   BT601);
+        CS(SMPTE170M, SMPTE170M);
+        CS(SMPTE240M, SMPTE240M);
+#undef CS
+    default:
+        return VAProcColorStandardNone;
+    }
+}
+
+int vaapi_vpp_make_param_buffers(VAAPIVPPContext *ctx,
+                                int type,
+                                const void *data,
+                                size_t size,
+                                int count)
+{
+    VAStatus vas;
+    VABufferID buffer;
+
+    av_assert0(ctx->nb_filter_buffers + 1 <= VAProcFilterCount);
+
+    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+                         type, size, count, (void*)data, &buffer);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(ctx, AV_LOG_ERROR, "Failed to create parameter "
+               "buffer (type %d): %d (%s).\n",
+               type, vas, vaErrorStr(vas));
+        return AVERROR(EIO);
+    }
+
+    ctx->filter_buffers[ctx->nb_filter_buffers++] = buffer;
+
+    av_log(ctx, AV_LOG_DEBUG, "Param buffer (type %d, %zu bytes, count %d) "
+           "is %#x.\n", type, size, count, buffer);
+    return 0;
+}
+
+
+int vaapi_vpp_render_picture(VAAPIVPPContext *ctx,
+                             VAProcPipelineParameterBuffer *params,
+                             VASurfaceID output_surface)
+{
+    VABufferID params_id;
+    VAStatus vas;
+    int err = 0;
+
+    vas = vaBeginPicture(ctx->hwctx->display,
+                         ctx->va_context, output_surface);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(ctx, AV_LOG_ERROR, "Failed to attach new picture: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail;
+    }
+
+    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+                         VAProcPipelineParameterBufferType,
+                         sizeof(*params), 1, params, &params_id);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(ctx, AV_LOG_ERROR, "Failed to create parameter buffer: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail_after_begin;
+    }
+    av_log(ctx, AV_LOG_DEBUG, "Pipeline parameter buffer is %#x.\n",
+           params_id);
+
+    vas = vaRenderPicture(ctx->hwctx->display, ctx->va_context,
+                          &params_id, 1);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(ctx, AV_LOG_ERROR, "Failed to render parameter buffer: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail_after_begin;
+    }
+
+    vas = vaEndPicture(ctx->hwctx->display, ctx->va_context);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(ctx, AV_LOG_ERROR, "Failed to start picture processing: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail_after_render;
+    }
+
+    if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks &
+        AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) {
+        vas = vaDestroyBuffer(ctx->hwctx->display, params_id);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(ctx, AV_LOG_ERROR, "Failed to free parameter buffer: "
+                   "%d (%s).\n", vas, vaErrorStr(vas));
+            // And ignore.
+        }
+    }
+
+    return 0;
+
+    // We want to make sure that if vaBeginPicture has been called, we also
+    // call vaRenderPicture and vaEndPicture.  These calls may well fail or
+    // do something else nasty, but once we're in this failure case there
+    // isn't much else we can do.
+fail_after_begin:
+    vaRenderPicture(ctx->hwctx->display, ctx->va_context, &params_id, 1);
+fail_after_render:
+    vaEndPicture(ctx->hwctx->display, ctx->va_context);
+fail:
+    return err;
+}
+
+int vaapi_vpp_ctx_init(VAAPIVPPContext *ctx)
+{
+    int i;
+    ctx->va_config     = VA_INVALID_ID;
+    ctx->va_context    = VA_INVALID_ID;
+    ctx->valid_ids  = 1;
+
+    for (i = 0; i < VAProcFilterCount; i++)
+        ctx->filter_buffers[i] = VA_INVALID_ID;
+    ctx->nb_filter_buffers = 0;
+
+    return 0;
+}
+
+void vaapi_vpp_ctx_uninit(AVFilterContext *avctx, VAAPIVPPContext *ctx)
+{
+    if (ctx->valid_ids && ctx->pipeline_uninit)
+        ctx->pipeline_uninit(avctx);
+
+    av_buffer_unref(&ctx->input_frames_ref);
+    av_buffer_unref(&ctx->output_frames_ref);
+    av_buffer_unref(&ctx->device_ref);
+
+    av_free(ctx);
+}
diff --git a/libavfilter/vaapi_vpp.h b/libavfilter/vaapi_vpp.h
new file mode 100644
index 0000000000..01eb754011
--- /dev/null
+++ b/libavfilter/vaapi_vpp.h
@@ -0,0 +1,75 @@ 
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_VAAPI_VPP_H
+#define AVFILTER_VAAPI_VPP_H
+
+typedef struct VAAPIVPPContext {
+    const AVClass *class;
+
+    AVVAAPIDeviceContext *hwctx;
+    AVBufferRef *device_ref;
+
+    int valid_ids;
+    VAConfigID  va_config;
+    VAContextID va_context;
+
+    AVBufferRef       *input_frames_ref;
+    AVHWFramesContext *input_frames;
+
+    AVBufferRef       *output_frames_ref;
+    AVHWFramesContext *output_frames;
+
+    enum AVPixelFormat output_format;
+    int output_width;   // computed width
+    int output_height;  // computed height
+
+    VABufferID         filter_buffers[VAProcFilterCount];
+    int                nb_filter_buffers;
+
+    int (*build_filter_params)(AVFilterContext *avctx);
+
+    int (*pipeline_uninit)(AVFilterContext *avctx);
+
+} VAAPIVPPContext;
+
+int vaapi_vpp_ctx_init(VAAPIVPPContext *ctx);
+
+void vaapi_vpp_ctx_uninit(AVFilterContext *avctx, VAAPIVPPContext *ctx);
+
+int vaapi_vpp_query_formats(AVFilterContext *avctx);
+
+int vaapi_vpp_pipeline_uninit(VAAPIVPPContext *ctx);
+
+int vaapi_vpp_config_input(AVFilterLink *inlink, VAAPIVPPContext *ctx);
+
+int vaapi_vpp_config_output(AVFilterLink *outlink, VAAPIVPPContext *ctx);
+
+int vaapi_vpp_colour_standard(enum AVColorSpace av_cs);
+
+int vaapi_vpp_make_param_buffers(VAAPIVPPContext *ctx,
+                                 int type,
+                                 const void *data,
+                                 size_t size,
+                                 int count);
+
+int vaapi_vpp_render_picture(VAAPIVPPContext *ctx,
+                             VAProcPipelineParameterBuffer *params,
+                             VASurfaceID output_surface);
+
+#endif /* AVFILTER_VAAPI_VPP_H */