> -----Ursprüngliche Nachricht----- > Von: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] Im Auftrag > von Sven Dueking > Gesendet: Donnerstag, 22. Oktober 2015 14:03 > An: 'FFmpeg development discussions and patches' > Betreff: Re: [FFmpeg-devel] [PATCH] Added QSV based VPP filter > > > > > -----Ursprüngliche Nachricht----- > > Von: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] Im Auftrag > > von Hendrik Leppkes > > Gesendet: Donnerstag, 22. Oktober 2015 14:00 > > An: FFmpeg development discussions and patches > > Betreff: Re: [FFmpeg-devel] [PATCH] Added QSV based VPP filter > > > > On Thu, Oct 22, 2015 at 1:29 PM, Sven Dueking <s...@nablet.com> > wrote: > > > > > > > > >> -----Ursprüngliche Nachricht----- > > >> Von: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] Im > > Auftrag > > >> von Carl Eugen Hoyos > > >> Gesendet: Mittwoch, 14. Oktober 2015 12:43 > > >> An: FFmpeg development discussions and patches > > >> Betreff: Re: [FFmpeg-devel] [PATCH] Added QSV based VPP filter > > >> > > >> On Wednesday 14 October 2015 10:07:04 am Sven Dueking wrote: > > >> > Hi all, > > >> > > > >> > The attached patches adds the VPP as filter module to FFMpeg. > > >> > Looking forward to get feedback. > > >> > > >> Just a few comments, I expect you will get a comment explaining > > >> what you can't do;-) (Sorry for the partly broken quotation.) > > >> > > >> In any case, please merge both patches, they are not independent. > > >> > > >> > > > >> > Many thanks, > > >> > Sven > > >> > > >> > From d09cff6d868bd2a0fd87e3906f8808638809494b Mon Sep 17 > 00:00:00 > > >> 2001 > > >> > From: Sven Dueking <s...@nablet.com> > > >> > Date: Wed, 14 Oct 2015 08:13:38 +0100 > > >> > Subject: [PATCH 1/2] added QSV based VPP filter > > >> > > > >> > --- > > >> > libavfilter/vf_qsv_vpp.c | 686 > > >> > +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, > > 686 > > >> > insertions(+) > > >> > create mode 100644 libavfilter/vf_qsv_vpp.c > > >> > > > >> > diff --git a/libavfilter/vf_qsv_vpp.c b/libavfilter/vf_qsv_vpp.c > > >> > new file mode 100644 index 0000000..629913e > > >> > --- /dev/null > > >> > +++ b/libavfilter/vf_qsv_vpp.c > > >> > @@ -0,0 +1,686 @@ > > >> > +/* > > >> > + * Intel MediaSDK Quick Sync Video VPP filter > > >> > + * > > >> > + * copyright (c) 2015 Sven Dueking > > >> > + * > > >> > + * This file is part of FFmpeg. > > >> > + * > > >> > + * Libav 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. > > >> > + * > > >> > + * Libav 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 Libav; if not, write to the Free Software > > >> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, > MA > > >> > 02110-1301 USA + */ > > >> > + > > >> > +#include <mfx/mfxvideo.h> > > >> > +#include <mfx/mfxplugin.h> > > >> > + > > >> > +#include "avfilter.h" > > >> > +#include "internal.h" > > >> > +#include "formats.h" > > >> > + > > >> > +#include "libavutil/avassert.h" > > >> > +#include "libavutil/opt.h" > > >> > +#include "libavutil/time.h" > > >> > +#include "libavutil/avstring.h" > > >> > +#include "libavutil/error.h" > > >> > +#include "libavcodec/avcodec.h" > > >> > +#include "libavcodec/qsv_internal.h" > > >> > + > > >> > +#include <stdio.h> > > >> > + > > >> > +#include "avfilter.h" > > >> > +#include "formats.h" > > >> > +#include "internal.h" > > >> > +#include "video.h" > > >> > +#include "libavutil/eval.h" > > >> > +#include "libavutil/avstring.h" > > >> > +#include "libavutil/internal.h" > > >> > +#include "libavutil/libm.h" > > >> > +#include "libavutil/imgutils.h" > > >> > +#include "libavutil/mathematics.h" > > >> > +#include "libavutil/opt.h" > > >> > +#include "libavutil/pixfmt.h" > > >> > > >> Are they all necessary? > > >> > > >> > + > > >> > +/** > > >> > + * ToDo : > > >> > + * > > >> > + * - handle empty extbuffers > > >> > + * - cropping > > >> > + * - allocate number of surfaces depending modules and number > of > > b > > >> > +frames */ > > >> > + > > >> > +#define VPP_ZERO_MEMORY(VAR) { memset(&VAR, 0, > > sizeof(VAR)); > > >> } > > >> > > >> I don't think this is more readable, but that may only be me. > > >> > > >> > +#define VPP_ALIGN16(value) (((value + 15) >> 4) << 4) > > >> // > > >> > round up to a multiple of 16 +#define VPP_ALIGN32(value) > > >> (((value > > >> > + 31) >> 5) << 5) // round up to a multiple of 32 > > +#define > > >> > > >> Isn't this FFALIGN()? > > >> > > >> > VPP_CHECK_POINTER(P, ...) {if (!(P)) {return __VA_ARGS__;}} + > > >> > +// number of video enhancement filters (denoise, procamp, > > >> > +detail, > > >> > video_analysis, image stab) +#define ENH_FILTERS_COUNT > 5 > > >> > + > > >> > +typedef struct { > > >> > + const AVClass *class; > > >> > + > > >> > + AVFilterContext *ctx; > > >> > + > > >> > + mfxSession session; > > >> > + QSVSession internal_qs; > > >> > + > > >> > + AVRational framerate; // target > > >> framerate > > >> > + > > >> > + mfxFrameSurface1 **in_surface; > > >> > + mfxFrameSurface1 **out_surface; > > >> > + > > >> > + mfxFrameAllocRequest req[2]; // [0] - > in, > > [1] > > >> - out > > >> > + > > >> > + int num_surfaces_in; // input > > >> surfaces > > >> > + int num_surfaces_out; // output > > >> surfaces > > >> > + > > >> > + unsigned char * surface_buffers_out; // output > > >> surface > > >> > buffer + > > >> > + char *load_plugins; > > >> > + > > >> > + mfxVideoParam* pVppParam; > > >> > + > > >> > + int cur_out_idx; > > >> > + > > >> > + /* VPP extension */ > > >> > + mfxExtBuffer* pExtBuf[1+ENH_FILTERS_COUNT]; > > >> > + mfxExtVppAuxData extVPPAuxData; > > >> > + > > >> > + /* Video Enhancement Algorithms */ > > >> > + mfxExtVPPDeinterlacing deinterlace_conf; > > >> > + mfxExtVPPFrameRateConversion frc_conf; > > >> > + mfxExtVPPDenoise denoise_conf; > > >> > + mfxExtVPPDetail detail_conf; > > >> > + > > >> > + int out_width; > > >> > + int out_height; > > >> > + > > >> > + int dpic; // destination picture > structure > > >> > + // -1 = unknown > > >> > + // 0 = interlaced top field > first > > >> > + // 1 = progressive > > >> > + // 2 = interlaced bottom field > > >> > + first > > >> > + > > >> > + int deinterlace; // deinterlace mode : 0=off, > > 1=bob, > > >> > 2=advanced + int denoise; // enable denoise > > >> algorithm. > > >> > Level is the optional value from the interval [0; 100] + int > > >> detail; > > >> > // enable detail enhancement algorithm. + > > >> > // level is the optional value from the interval [0; > > >> > 100] > > >> > + > > >> int > > >> > async_depth; // async dept used by encoder > > >> > + int max_b_frames; // maxiumum number of b frames > > used > > >> by > > >> > encoder + > > >> > + int frame_number; > > >> > + > > >> > + int use_frc; // use framerate conversion > > >> > + > > >> > +} VPPContext; > > >> > + > > >> > +#define OFFSET(x) offsetof(VPPContext, x) #define FLAGS > > >> > +AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM > > >> > + > > >> > +static const AVOption vpp_options[] = { > > >> > + { "deinterlace", "deinterlace mode: 0=off, 1=bob, > > 2=advanced", > > >> > OFFSET(deinterlace), AV_OPT_TYPE_INT, {.i64=0}, 0, > > >> > MFX_DEINTERLACING_ADVANCED, .flags = FLAGS }, + { "denoise", > > >> > "denoise level [0, 100]", > > >> OFFSET(denoise), > > >> > AV_OPT_TYPE_INT, {.i64=0}, 0, 100, .flags = FLAGS }, + { > > >> "detail", > > >> > "detail enhancement level [0, 100]", > > >> > OFFSET(detail), AV_OPT_TYPE_INT, {.i64=0}, 0, 100, .flags > = > > >> FLAGS }, > > >> > + { "w", "Output video width", > > >> > OFFSET(out_width), AV_OPT_TYPE_INT, {.i64=0}, 0, 4096, > > .flags > > >> = > > >> > FLAGS }, + { "width", "Output video width", > > >> > OFFSET(out_width), AV_OPT_TYPE_INT, {.i64=0}, 0, > > >> 4096, > > >> > .flags = FLAGS }, + { "h", "Output video height", > > >> > OFFSET(out_height), AV_OPT_TYPE_INT, > > >> {.i64=0}, 0, > > >> > 2304, .flags = FLAGS }, + { "height", "Output video > height > > : > > >> ", > > >> > OFFSET(out_height), > AV_OPT_TYPE_INT, > > >> > {.i64=0}, 0, 2304, .flags = FLAGS }, + { "dpic", "dest > > pic > > >> > struct: 0=tff, 1=progressive [default], 2=bff", OFFSET(dpic), > > >> > AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 2, .flags = FLAGS }, + { > > "fps", > > >> > "A string describing desired output framerate", > > >> > OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, { .str = "0" }, > > .flags > > >> = > > >> > FLAGS }, + { "async_depth", "Maximum processing parallelism > > >> [default = > > >> > 4]", OFFSET(async_depth), AV_OPT_TYPE_INT, { .i64 = > > >> > ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, .flags = FLAGS }, + { > > >> > "max_b_frames","Maximum number of b frames [default = 3]", > > >> > OFFSET(max_b_frames), AV_OPT_TYPE_INT, { .i64 = 3 }, 0, INT_MAX, > > >> .flags = > > >> > FLAGS }, + { NULL } > > >> > +}; > > >> > + > > >> > +AVFILTER_DEFINE_CLASS(vpp); > > >> > + > > >> > +static int get_bpp(unsigned int fourcc) { > > >> > + switch (fourcc) { > > >> > + case MFX_FOURCC_YUY2: > > >> > + return 16; > > >> > + case MFX_FOURCC_RGB4: > > >> > + return 32; > > >> > + default: > > >> > + return 12; > > >> > + } > > >> > > >> > + return 12; > > >> > > >> This is unreachable and there will be a compiler that barks. > > >> Please either remove the line or the default case, same below. > > >> > > >> > +} > > >> > + > > >> > +static int option_id_to_mfx_pic_struct(int id) { > > >> > + switch (id) { > > >> > + case 0: > > >> > + return MFX_PICSTRUCT_FIELD_TFF; > > >> > + case 1: > > >> > + return MFX_PICSTRUCT_PROGRESSIVE; > > >> > + case 2: > > >> > + return MFX_PICSTRUCT_FIELD_BFF; > > >> > + default: > > >> > + return MFX_PICSTRUCT_UNKNOWN; > > >> > + break; > > >> > + } > > >> > + return MFX_PICSTRUCT_UNKNOWN; } > > >> > + > > >> > +static int get_chroma_fourcc(unsigned int fourcc) { > > >> > + switch (fourcc) { > > >> > + case MFX_FOURCC_YUY2: > > >> > + return MFX_CHROMAFORMAT_YUV422; > > >> > + case MFX_FOURCC_RGB4: > > >> > + return MFX_CHROMAFORMAT_YUV444; > > >> > + default: > > >> > + return MFX_CHROMAFORMAT_YUV420; > > >> > + } > > >> > + return MFX_CHROMAFORMAT_YUV420; } > > >> > + > > >> > +static int avframe_id_to_mfx_pic_struct(AVFrame * pic) { > > >> > + if (!pic->interlaced_frame) > > >> > + return MFX_PICSTRUCT_PROGRESSIVE; > > >> > + > > >> > + if (pic->top_field_first == 1) > > >> > + return MFX_PICSTRUCT_FIELD_TFF; > > >> > + > > >> > + return MFX_PICSTRUCT_FIELD_BFF; } > > >> > + > > >> > +static int query_formats(AVFilterContext *ctx) { > > >> > + static const enum AVPixelFormat pix_fmts[] = { > > >> > + AV_PIX_FMT_YUV420P, > > >> > + AV_PIX_FMT_QSV, > > >> > + AV_PIX_FMT_NV12, > > >> > > >> > + AV_PIX_FMT_YUYV422, > > >> > > >> Just looking naively at this, I would expect it to be wrong > > (_YUV422P). > > >> Looking at the filter function below, I am even more convinced... > > >> Did you test it? > > >> > > >> > + AV_PIX_FMT_RGB32 , > > >> > > >> Trailing whitespace that cannot be committed to our repo, please > > >> use tools/patcheck. > > >> Could you confirm that the RGB case really works on the alpha > plane? > > >> And imo, this should be AV_PIX_FMT_RGBA. > > >> (But see below, this can't be right afaict.) > > >> > > >> > + AV_PIX_FMT_NONE > > >> > + }; > > >> > + > > >> > + ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); > > >> > + return 0; > > >> > +} > > >> > + > > >> > +static int init_vpp_param(AVFilterLink *inlink , AVFrame * pic) > { > > >> > + AVFilterContext *ctx = inlink->dst; > > >> > + VPPContext *vpp= ctx->priv; > > >> > + > > >> > + // input data > > >> > + if (inlink->format == AV_PIX_FMT_YUV420P) > > >> > + vpp->pVppParam->vpp.In.FourCC = MFX_FOURCC_YV12; > > >> > + else if (inlink->format == AV_PIX_FMT_YUYV422) > > >> > > >> Same here. > > >> > > >> > + vpp->pVppParam->vpp.In.FourCC = MFX_FOURCC_YUY2; > > >> > + else if (inlink->format == AV_PIX_FMT_NV12) > > >> > + vpp->pVppParam->vpp.In.FourCC = MFX_FOURCC_NV12; > > >> > + else > > >> > + vpp->pVppParam->vpp.In.FourCC = MFX_FOURCC_RGB4; > > >> > + > > >> > + vpp->pVppParam->vpp.In.ChromaFormat = > > >> > get_chroma_fourcc(vpp->pVppParam->vpp.In.FourCC); + > > >> > vpp->pVppParam->vpp.In.CropX = 0; > > >> > + vpp->pVppParam->vpp.In.CropY = 0; > > >> > + vpp->pVppParam->vpp.In.CropW = inlink->w; > > >> > + vpp->pVppParam->vpp.In.CropH = inlink->h; > > >> > + vpp->pVppParam->vpp.In.PicStruct = > > >> avframe_id_to_mfx_pic_struct(pic); > > >> > + vpp->pVppParam->vpp.In.FrameRateExtN = inlink- > > >frame_rate.num; > > >> > + vpp->pVppParam->vpp.In.FrameRateExtD = inlink- > > >frame_rate.den; > > >> > + vpp->pVppParam->vpp.In.BitDepthLuma = 8; > > >> > + vpp->pVppParam->vpp.In.BitDepthChroma = 8; > > >> > + > > >> > + // width must be a multiple of 16 > > >> > + // height must be a multiple of 16 in case of frame picture > > >> > + and > > >> a > > >> > multiple of 32 in case of field picture + vpp->pVppParam- > > >> >vpp.In.Width = > > >> > VPP_ALIGN16(inlink->w); > > >> > + vpp->pVppParam->vpp.In.Height = > > >> > + (MFX_PICSTRUCT_PROGRESSIVE == vpp->pVppParam- > > >> >vpp.In.PicStruct) ? > > >> > + VPP_ALIGN16(inlink->h) : > > >> > + VPP_ALIGN32(inlink->h); > > >> > + > > >> > + // output data > > >> > + vpp->pVppParam->vpp.Out.FourCC = MFX_FOURCC_NV12; > > >> > + vpp->pVppParam->vpp.Out.ChromaFormat = > > MFX_CHROMAFORMAT_YUV420; > > >> > + vpp->pVppParam->vpp.Out.CropX = 0; > > >> > + vpp->pVppParam->vpp.Out.CropY = 0; > > >> > + vpp->pVppParam->vpp.Out.CropW = !vpp->out_width ? inlink->w > : > > >> > vpp->out_width; + vpp->pVppParam->vpp.Out.CropH = !vpp- > > >out_height > > >> ? > > >> > inlink->h : vpp->out_height; + vpp->pVppParam- > > >vpp.Out.PicStruct = > > >> > option_id_to_mfx_pic_struct(vpp->dpic); + > > >> > vpp->pVppParam->vpp.Out.FrameRateExtN = vpp->framerate.num; > > >> > + vpp->pVppParam->vpp.Out.FrameRateExtD = vpp->framerate.den; > > >> > + vpp->pVppParam->vpp.Out.BitDepthLuma = 8; > > >> > + vpp->pVppParam->vpp.Out.BitDepthChroma = 8; > > >> > + > > >> > + if ((vpp->pVppParam->vpp.In.FrameRateExtN / > > >> > vpp->pVppParam->vpp.In.FrameRateExtD) != + > > >> > (vpp->pVppParam->vpp.Out.FrameRateExtN / > > >> > vpp->pVppParam->vpp.Out.FrameRateExtD)) + vpp->use_frc = > 1; > > >> > + else > > >> > + vpp->use_frc = 0; > > >> > + > > >> > + // width must be a multiple of 16 > > >> > + // height must be a multiple of 16 in case of frame picture > > >> > + and > > >> a > > >> > multiple of 32 in case of field picture + vpp->pVppParam- > > >> >vpp.Out.Width > > >> > = VPP_ALIGN16(vpp->pVppParam->vpp.Out.CropW); + > > >> > vpp->pVppParam->vpp.Out.Height = > > >> > + (MFX_PICSTRUCT_PROGRESSIVE == vpp->pVppParam- > > >> >vpp.Out.PicStruct) ? > > >> > + VPP_ALIGN16(vpp->pVppParam->vpp.Out.CropH) : > > >> > + VPP_ALIGN32(vpp->pVppParam->vpp.Out.CropH); > > >> > + > > >> > + vpp->pVppParam->IOPattern = > > >> > + MFX_IOPATTERN_IN_SYSTEM_MEMORY | > > >> > + MFX_IOPATTERN_OUT_SYSTEM_MEMORY; > > >> > + > > >> > + av_log(ctx, AV_LOG_INFO, "In %dx%d %d fps\t Out %dx%d %d > > fps\n", > > >> > + VPP_ALIGN32(vpp->pVppParam->vpp.In.Width), > > >> > + VPP_ALIGN32(vpp->pVppParam->vpp.In.Height), > > >> > + vpp->pVppParam->vpp.In.FrameRateExtN / > > >> > vpp->pVppParam->vpp.In.FrameRateExtD, + > > >> > VPP_ALIGN32(vpp->pVppParam->vpp.Out.Width), > > >> > + VPP_ALIGN32(vpp->pVppParam->vpp.Out.Height), > > >> > + vpp->pVppParam->vpp.Out.FrameRateExtN / > > >> > vpp->pVppParam->vpp.Out.FrameRateExtD); + > > >> > + if (vpp->use_frc == 1) > > >> > + av_log(ctx, AV_LOG_INFO, "Framerate conversion > > >> > + enabled\n"); > > >> > + > > >> > + return 0; > > >> > +} > > >> > + > > >> > +static void init_surface(AVFilterLink *inlink) { > > >> > + AVFilterContext *ctx = inlink->dst; > > >> > + VPPContext *vpp= ctx->priv; > > >> > + > > >> > + int i; > > >> > + unsigned int width = 0; > > >> > + unsigned int height = 0; > > >> > + unsigned int bits_per_pixel = get_bpp(vpp->pVppParam- > > >> >vpp.In.FourCC); > > >> > + unsigned int surface_size = 0; > > >> > + > > >> > + vpp->num_surfaces_in = FFMAX(vpp- > >req[0].NumFrameSuggested, > > >> > vpp->async_depth + vpp->max_b_frames + 1); + vpp- > > >num_surfaces_out > > >> = > > >> > FFMAX(vpp->req[1].NumFrameSuggested, 1); + > > >> > + width = (unsigned int) VPP_ALIGN32(vpp->pVppParam- > > >> >vpp.In.Width); > > >> > + height = (unsigned int) VPP_ALIGN32(vpp->pVppParam- > > >> >vpp.In.Height); > > >> > + surface_size = width * height * bits_per_pixel / 8; > > >> > + > > >> > + vpp->in_surface = av_mallocz(sizeof(mfxFrameSurface1) * > > >> > vpp->num_surfaces_in); + VPP_CHECK_POINTER(vpp->in_surface); > > >> > + for (i = 0; i < vpp->num_surfaces_in; i++) { > > >> > + vpp->in_surface[i] = > > av_mallocz(sizeof(mfxFrameSurface1)); > > >> > + VPP_CHECK_POINTER(vpp->in_surface[i]); > > >> > + memset(vpp->in_surface[i], 0, > sizeof(mfxFrameSurface1)); > > >> > + memcpy(&(vpp->in_surface[i]->Info), > > >> > + &(vpp->pVppParam->vpp.In), > > >> > sizeof(mfxFrameInfo)); + } > > >> > + > > >> > + bits_per_pixel = 12; > > >> > + width = (unsigned int) VPP_ALIGN32(vpp->pVppParam- > > >> >vpp.Out.Width); > > >> > + height = (unsigned int) VPP_ALIGN32(vpp->pVppParam- > > >> >vpp.Out.Height); > > >> > + surface_size = width * height * bits_per_pixel / 8; > > >> > + vpp->surface_buffers_out = av_mallocz(surface_size * > > >> > vpp->num_surfaces_out); + VPP_CHECK_POINTER(vpp- > > >> >surface_buffers_out); > > >> > + > > >> > + vpp->out_surface = av_mallocz(sizeof(mfxFrameSurface1) * > > >> > vpp->num_surfaces_out); + VPP_CHECK_POINTER(vpp- > >out_surface); > > >> > + for (i = 0; i < vpp->num_surfaces_out; i++) { > > >> > + vpp->out_surface[i] = > > >> av_mallocz(sizeof(mfxFrameSurface1)); > > >> > + VPP_CHECK_POINTER(vpp->out_surface[i]); > > >> > + memset(vpp->out_surface[i], 0, > > >> sizeof(mfxFrameSurface1)); > > >> > + memcpy(&(vpp->out_surface[i]->Info), > > >> > &(vpp->pVppParam->vpp.Out), sizeof(mfxFrameInfo)); + > > >> > vpp->out_surface[i]->Data.Y = > > >> > vpp->&vpp->surface_buffers_out[surface_size > > >> * > > >> > vpp->i]; > > >> > + vpp->out_surface[i]->Data.U = vpp->out_surface[i]- > > >> >Data.Y > > >> > + + > > >> > width * height; + vpp->out_surface[i]->Data.V = > > >> > vpp->out_surface[i]->Data.U + 1; + out_surface[i]->Data.PitchLow > > >> > vpp->= width; > > >> > + } > > >> > +} > > >> > + > > >> > +static int config_vpp(AVFilterLink *inlink, AVFrame * pic) { > > >> > + AVFilterContext *ctx = inlink->dst; > > >> > + VPPContext *vpp= ctx->priv; > > >> > + > > >> > + int ret = 0; > > >> > + > > >> > + mfxVideoParam mfxParamsVideo; > > >> > + > > >> > + VPP_ZERO_MEMORY(mfxParamsVideo); > > >> > + vpp->pVppParam = &mfxParamsVideo; > > >> > + > > >> > + init_vpp_param(inlink, pic); > > >> > + > > >> > + vpp->pVppParam->NumExtParam = 0; > > >> > + vpp->frame_number = 0; > > >> > + > > >> > + vpp->pVppParam->ExtParam = (mfxExtBuffer**)vpp->pExtBuf; > > >> > + > > >> > + if (vpp->deinterlace) { > > >> > + memset(&vpp->deinterlace_conf, 0, > > >> sizeof(mfxExtVPPDeinterlacing)); > > >> > + vpp->deinterlace_conf.Header.BufferId = > > >> > MFX_EXTBUFF_VPP_DEINTERLACING; + > > >> > vpp->deinterlace_conf.Header.BufferSz = > > >> > vpp->sizeof(mfxExtVPPDeinterlacing); + > > >> > vpp->deinterlace_conf.Mode = vpp->deinterlace == > 1 > > ? > > >> > > >> Imo, this gets much more readable with "vpp->deinterlace ?" > > >> > > >> > MFX_DEINTERLACING_BOB : MFX_DEINTERLACING_ADVANCED; + > > >> > + vpp->pVppParam->ExtParam[vpp->pVppParam->NumExtParam++] > > >> > + = > > >> > (mfxExtBuffer*)&(vpp->deinterlace_conf); + } > > >> > + > > >> > + if (vpp->use_frc) { > > >> > + memset(&vpp->frc_conf, 0, > > >> sizeof(mfxExtVPPFrameRateConversion)); > > >> > + vpp->frc_conf.Header.BufferId = > > >> > MFX_EXTBUFF_VPP_FRAME_RATE_CONVERSION; + > > >> > vpp->frc_conf.Header.BufferSz = > > >> > vpp->sizeof(mfxExtVPPFrameRateConversion); > > >> + > > >> > vpp->frc_conf.Algorithm = > MFX_FRCALGM_PRESERVE_TIMESTAMP; > > // > > >> make > > >> > optional + > > >> > + vpp->pVppParam->ExtParam[vpp->pVppParam->NumExtParam++] > > >> > + = > > >> > (mfxExtBuffer*)&(vpp->frc_conf); + } > > >> > + > > >> > + if (vpp->denoise) { > > >> > + memset(&vpp->denoise_conf, 0, > sizeof(mfxExtVPPDenoise)); > > >> > + vpp->denoise_conf.Header.BufferId = > > MFX_EXTBUFF_VPP_DENOISE; > > >> > + vpp->denoise_conf.Header.BufferSz = > > >> sizeof(mfxExtVPPDenoise); > > >> > + vpp->denoise_conf.DenoiseFactor = vpp->denoise; > > >> > + > > >> > + vpp->pVppParam->ExtParam[vpp->pVppParam->NumExtParam++] > > >> > + = > > >> > (mfxExtBuffer*)&(vpp->denoise_conf); + } > > >> > + > > >> > + if (vpp->detail) { > > >> > + memset(&vpp->detail_conf, 0, sizeof(mfxExtVPPDetail)); > > >> > + vpp->detail_conf.Header.BufferId = > > MFX_EXTBUFF_VPP_DETAIL; > > >> > + vpp->detail_conf.Header.BufferSz = > > sizeof(mfxExtVPPDetail); > > >> > + vpp->detail_conf.DetailFactor = vpp->detail; > > >> > + > > >> > + vpp->pVppParam->ExtParam[vpp->pVppParam->NumExtParam++] > > >> > + = > > >> > (mfxExtBuffer*)&(vpp->detail_conf); + } > > >> > + > > >> > + ret = MFXVideoVPP_Query(vpp->session, vpp->pVppParam, > > >> > + vpp->pVppParam); > > >> > + > > >> > + if (ret >= MFX_ERR_NONE) { > > >> > + av_log(ctx, AV_LOG_INFO, "MFXVideoVPP_Query returned %d > > >> > + \n", > > >> ret); > > >> > + } else { > > >> > + av_log(ctx, AV_LOG_ERROR, "Error %d querying the VPP > > >> > parameters\n", ret); + return ff_qsv_error(ret); > > >> > + } > > >> > + > > >> > + memset(&vpp->req, 0, sizeof(mfxFrameAllocRequest) * 2); > > >> > + ret = MFXVideoVPP_QueryIOSurf(vpp->session, vpp->pVppParam, > > >> > &vpp->req[0]); + > > >> > + if (ret < 0) { > > >> > + av_log(ctx, AV_LOG_ERROR, "Error querying the VPP IO > > >> surface\n"); > > >> > + return ff_qsv_error(ret); > > >> > + } > > >> > + > > >> > + init_surface(inlink); > > >> > + > > >> > + ret = MFXVideoVPP_Init(vpp->session, vpp->pVppParam); > > >> > + > > >> > + if (MFX_WRN_PARTIAL_ACCELERATION == ret) { > > >> > + av_log(ctx, AV_LOG_WARNING, "VPP will work with partial > > HW > > >> > acceleration\n"); + } else if (ret < 0) { > > >> > + av_log(ctx, AV_LOG_ERROR, "Error initializing the > > VPP\n"); > > >> > + return ff_qsv_error(ret); > > >> > + } > > >> > + > > >> > + return 0; > > >> > +} > > >> > + > > >> > +static void free_surface(AVFilterLink *inlink) { > > >> > + AVFilterContext *ctx = inlink->dst; > > >> > + VPPContext *vpp= ctx->priv; > > >> > + unsigned int i; > > >> > + > > >> > + for (i = 0; i < vpp->num_surfaces_in; i++) > > >> > > >> > + av_free(vpp->in_surface[i]); > > >> > > >> Should be av_freep, same below. > > >> > > >> > + > > >> > + av_free(vpp->in_surface); > > >> > + > > >> > + for (i = 0; i < vpp->num_surfaces_out; i++) > > >> > + av_free(vpp->out_surface[i]); > > >> > + > > >> > + av_free(vpp->out_surface); > > >> > + > > >> > + av_free(vpp->surface_buffers_out); > > >> > + > > >> > + vpp->num_surfaces_in = 0; > > >> > + vpp->num_surfaces_out = 0; > > >> > +} > > >> > + > > >> > +static int config_input(AVFilterLink *inlink) { > > >> > + AVFilterLink *outlink = inlink->dst->outputs[0]; > > >> > + AVFilterContext *ctx = inlink->dst; > > >> > + VPPContext *vpp= ctx->priv; > > >> > + > > >> > + vpp->out_width = VPP_ALIGN16(vpp->out_width); > > >> > + vpp->out_height = (vpp->dpic == 2) ? > > >> > + VPP_ALIGN16(vpp->out_height) : > > >> > + VPP_ALIGN32(vpp->out_height); // force 32 if unknown > > >> > + > > >> > + outlink->w = vpp->out_width; > > >> > + outlink->h = vpp->out_height; > > >> > + > > >> > + if (vpp->framerate.den && vpp->framerate.num) { > > >> > + outlink->frame_rate = vpp->framerate; > > >> > + outlink->time_base = av_inv_q(vpp->framerate); > > >> > + outlink->time_base.den = outlink->time_base.den * 1000; > > >> > + } > > >> > + > > >> > + outlink->format = AV_PIX_FMT_NV12; > > >> > + > > >> > + return 0; > > >> > +} > > >> > + > > >> > +static int get_free_surface_index_in(AVFilterContext *ctx, > > >> > mfxFrameSurface1 ** surface_pool, int pool_size) +{ > > >> > + if (surface_pool) { > > >> > + for (mfxU16 i = 0; i < pool_size; i++) { > > >> > + if (!surface_pool[i]->Data.Locked) > > >> > + return i; > > >> > + } > > >> > + } > > >> > + > > >> > + av_log(ctx, AV_LOG_ERROR, "Error getting a free surface, > > >> > + pool size is > > >> > %d\n", pool_size); + return MFX_ERR_NOT_FOUND; > > >> > +} > > >> > + > > >> > +static int get_free_surface_index_out(AVFilterContext *ctx, > > >> > mfxFrameSurface1 ** surface_pool, int pool_size) +{ > > >> > + VPPContext *vpp = ctx->priv; > > >> > + > > >> > + if (surface_pool) { > > >> > + for (mfxU16 i = 0; i < pool_size; i++) { > > >> > + if (0 == surface_pool[i]->Data.Locked) { > > >> > + if (i == vpp->cur_out_idx) { > > >> > + if (vpp->cur_out_idx == pool_size - 1) > > >> > + vpp->cur_out_idx = 0; > > >> > + else > > >> > + vpp->cur_out_idx ++; > > >> > + > > >> > + return i; > > >> > + } > > >> > + } > > >> > + } > > >> > + } > > >> > + > > >> > + av_log(ctx, AV_LOG_ERROR, "Error getting a free surface, > > >> > + pool size is > > >> > %d\n", pool_size); + return MFX_ERR_NOT_FOUND; > > >> > +} > > >> > + > > >> > +static int filter_frame(AVFilterLink *inlink, AVFrame *picref) > { > > >> > + AVFilterContext *ctx = inlink->dst; > > >> > + VPPContext *vpp = ctx->priv; > > >> > + > > >> > + mfxSyncPoint sync = NULL; > > >> > + int ret = 0; > > >> > + int filter_frame_ret = 0; > > >> > + > > >> > + AVFilterLink *outlink = inlink->dst->outputs[0]; > > >> > + > > >> > + AVFrame *out; > > >> > + > > >> > + int in_idx = 0; > > >> > + int out_idx = 0; > > >> > + > > >> > + if (!vpp->frame_number) > > >> > + config_vpp(inlink, picref); > > >> > + > > >> > + do { > > >> > + in_idx = get_free_surface_index_in(ctx, vpp- > >in_surface, > > >> > vpp->num_surfaces_in); + out_idx = > > >> get_free_surface_index_out(ctx, > > >> > vpp->out_surface, vpp->num_surfaces_out); + > > >> > > >> > + av_assert0(in_idx != MFX_ERR_NOT_FOUND); > > >> > + av_assert0(out_idx != MFX_ERR_NOT_FOUND); > > >> > > >> I didn't check: Is this really impossible? > > >> > > >> > + > > >> > + out = ff_get_video_buffer(outlink, > > >> > + vpp->out_surface[out_idx]- > > >> >Info.Width, > > >> > + vpp->out_surface[out_idx]- > > >> >Info.Height); > > >> > + if (!out) { > > >> > + av_frame_free(&picref); > > >> > + return AVERROR(ENOMEM); > > >> > + } > > >> > + > > >> > + av_frame_copy_props(out, picref); > > >> > + > > >> > + // init in surface > > >> > + if (inlink->format == AV_PIX_FMT_NV12) { > > >> > + vpp->in_surface[in_idx]->Data.Y = picref->data[0]; > > >> > + vpp->in_surface[in_idx]->Data.VU = picref->data[1]; > > >> > + vpp->in_surface[in_idx]->Data.PitchLow = picref- > > >> >linesize[0]; > > >> > + } else if (inlink->format == AV_PIX_FMT_YUV420P) { > > >> > + vpp->in_surface[in_idx]->Data.Y = picref->data[0]; > > >> > + vpp->in_surface[in_idx]->Data.U = picref->data[1]; > > >> > + vpp->in_surface[in_idx]->Data.V = picref->data[2]; > > >> > + vpp->in_surface[in_idx]->Data.PitchLow = > > >> > + picref->linesize[0]; > > >> > > >> > + } else if (inlink->format == AV_PIX_FMT_YUYV422 ) { > > >> > + vpp->in_surface[in_idx]->Data.Y = picref->data[0]; > > >> > + vpp->in_surface[in_idx]->Data.U = picref->data[0] + > > 1; > > >> > + vpp->in_surface[in_idx]->Data.V = picref->data[0] + > > 3; > > >> > + vpp->in_surface[in_idx]->Data.PitchLow = > > >> > + picref->linesize[0]; > > >> > > >> This seems to prove that YUV422P is meant. > > > > > > Hi Carl, > > > > > > Sorry for delayed feedback. > > > > > > According to the documentation > > > > > > AV_PIX_FMT_YUYV422 packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr > > > AV_PIX_FMT_YUV422P planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample > > per 2x1 Y samples) > > > > > > And from Intels header (as expected): > > > > > > MFX_FOURCC_YUY2 = MFX_MAKEFOURCC('Y','U','Y','2'), > > > > > > Which is packed. Did I miss something ? > > > > > > > Passing a packed format using 3 plane pointers is just odd. Did you > > test that format specifically? Does it work like this? > > Maybe it only needs the Y pointer to the packed data? > > > > Hi Henrik, > > Sure, I tested that and it works fine. At least this is the same way as > it´s done in the samples from Intel. > > Best, > Sven
I guess it´s a good idea to be more specify here, please see https://software.intel.com/sites/default/files/mediasdk-man.pdf page 129 Y, U, V, A; R, G, B, A; Y, Cr, Cb, A; Y, CbCr; Y, CrCb; Y, UV; Y, VU; Data pointers to corresponding color channels. The frame buffer pointers must be 16-byte aligned. The application has to specify pointers to all color channels even for packed formats. For example, for YUY2 format the application has to specify Y, U and V This is also the case for RGB32, where PIX_FMT_RGB32 should be used as I did. Will summarize this, update my patch and send it again ASAP. Thanks. Best, Sven > > > - Hendrik > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
