Em sex., 27 de dez. de 2019 às 05:42, Guo, Yejun <yejun....@intel.com> escreveu: > > do not request AVFrame's format in vf_ddn_processing with 'fmt', > but to add another filter for the format. > > command examples: > ./ffmpeg -i input.jpg -vf > format=bgr24,dnn_processing=model=halve_first_channel.model:input=dnn_in:output=dnn_out:dnn_backend=native > -y out.native.png > ./ffmpeg -i input.jpg -vf > format=rgb24,dnn_processing=model=halve_first_channel.model:input=dnn_in:output=dnn_out:dnn_backend=native > -y out.native.png > > Signed-off-by: Guo, Yejun <yejun....@intel.com> > --- > doc/filters.texi | 17 +++++--- > libavfilter/vf_dnn_processing.c | 95 > +++++++++++++++++++++-------------------- > 2 files changed, 60 insertions(+), 52 deletions(-) > > diff --git a/doc/filters.texi b/doc/filters.texi > index 8c5d3a5..f467378 100644 > --- a/doc/filters.texi > +++ b/doc/filters.texi > @@ -9030,8 +9030,8 @@ ffmpeg -i INPUT -f lavfi -i > nullsrc=hd720,geq='r=128+80*(sin(sqrt((X-W/2)*(X-W/2 > > @section dnn_processing > > -Do image processing with deep neural networks. Currently only AVFrame with > RGB24 > -and BGR24 are supported, more formats will be added later. > +Do image processing with deep neural networks. It works together with > another filter > +which converts the pixel format of the Frame to what the dnn network > requires. > > The filter accepts the following options: > > @@ -9066,12 +9066,17 @@ Set the input name of the dnn network. > @item output > Set the output name of the dnn network. > > -@item fmt > -Set the pixel format for the Frame. Allowed values are > @code{AV_PIX_FMT_RGB24}, and @code{AV_PIX_FMT_BGR24}. > -Default value is @code{AV_PIX_FMT_RGB24}. > - > @end table > > +@itemize > +@item > +Halve the red channle of the frame with format rgb24: > +@example > +ffmpeg -i input.jpg -vf > format=rgb24,dnn_processing=model=halve_first_channel.model:input=dnn_in:output=dnn_out:dnn_backend=native > out.native.png > +@end example > + > +@end itemize > + > @section drawbox > > Draw a colored box on the input image. > diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c > index ce976ec..4a6b900 100644 > --- a/libavfilter/vf_dnn_processing.c > +++ b/libavfilter/vf_dnn_processing.c > @@ -37,7 +37,6 @@ typedef struct DnnProcessingContext { > > char *model_filename; > DNNBackendType backend_type; > - enum AVPixelFormat fmt; > char *model_inputname; > char *model_outputname; > > @@ -60,7 +59,6 @@ static const AVOption dnn_processing_options[] = { > { "model", "path to model file", OFFSET(model_filename), > AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, > { "input", "input name of the model", OFFSET(model_inputname), > AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, > { "output", "output name of the model", OFFSET(model_outputname), > AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, > - { "fmt", "AVPixelFormat of the frame", OFFSET(fmt), > AV_OPT_TYPE_PIXEL_FMT, { .i64=AV_PIX_FMT_RGB24 }, AV_PIX_FMT_NONE, > AV_PIX_FMT_NB - 1, FLAGS }, > { NULL } > }; > > @@ -69,23 +67,6 @@ AVFILTER_DEFINE_CLASS(dnn_processing); > static av_cold int init(AVFilterContext *context) > { > DnnProcessingContext *ctx = context->priv; > - int supported = 0; > - // as the first step, only rgb24 and bgr24 are supported > - const enum AVPixelFormat supported_pixel_fmts[] = { > - AV_PIX_FMT_RGB24, > - AV_PIX_FMT_BGR24, > - }; > - for (int i = 0; i < sizeof(supported_pixel_fmts) / sizeof(enum > AVPixelFormat); ++i) { > - if (supported_pixel_fmts[i] == ctx->fmt) { > - supported = 1; > - break; > - } > - } > - if (!supported) { > - av_log(context, AV_LOG_ERROR, "pixel fmt %s not supported yet\n", > - av_get_pix_fmt_name(ctx->fmt)); > - return AVERROR(AVERROR_INVALIDDATA); > - } > > if (!ctx->model_filename) { > av_log(ctx, AV_LOG_ERROR, "model file for network is not > specified\n"); > @@ -121,14 +102,52 @@ static av_cold int init(AVFilterContext *context) > > static int query_formats(AVFilterContext *context) > { > - AVFilterFormats *formats; > - DnnProcessingContext *ctx = context->priv; > - enum AVPixelFormat pixel_fmts[2]; > - pixel_fmts[0] = ctx->fmt; > - pixel_fmts[1] = AV_PIX_FMT_NONE; > + static const enum AVPixelFormat pix_fmts[] = { > + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, > + AV_PIX_FMT_NONE > + }; > + AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); > + return ff_set_common_formats(context, fmts_list); > +} > + > +static int check_modelinput_inlink(const DNNData *model_input, const > AVFilterLink *inlink) > +{ > + AVFilterContext *ctx = inlink->dst; > + enum AVPixelFormat fmt = inlink->format; > + > + // the design is to add explicit scale filter before this filter > + if (model_input->height != -1 && model_input->height != inlink->h) { > + av_log(ctx, AV_LOG_ERROR, "the model requires frame height %d but > got %d\n", > + model_input->height, inlink->h); > + return AVERROR(EIO); > + } > + if (model_input->width != -1 && model_input->width != inlink->w) { > + av_log(ctx, AV_LOG_ERROR, "the model requires frame width %d but got > %d\n", > + model_input->width, inlink->w); > + return AVERROR(EIO); > + } > > - formats = ff_make_format_list(pixel_fmts); > - return ff_set_common_formats(context, formats); > + switch (fmt) { > + case AV_PIX_FMT_RGB24: > + case AV_PIX_FMT_BGR24: > + if (model_input->channels != 3) { > + av_log(ctx, AV_LOG_ERROR, "the frame's input format %s does not > match " > + "the model input channels %d\n", > + av_get_pix_fmt_name(fmt), > + model_input->channels); > + return AVERROR(EIO); > + } > + if (model_input->dt != DNN_FLOAT && model_input->dt != DNN_UINT8) { > + av_log(ctx, AV_LOG_ERROR, "only support dnn models with input > data type as float32 and uint8.\n"); > + return AVERROR(EIO); > + } > + break; > + default: > + av_log(ctx, AV_LOG_ERROR, "%s not supported.\n", > av_get_pix_fmt_name(fmt)); > + return AVERROR(EIO); > + } > + > + return 0; > } > > static int config_input(AVFilterLink *inlink) > @@ -137,6 +156,7 @@ static int config_input(AVFilterLink *inlink) > DnnProcessingContext *ctx = context->priv; > DNNReturnType result; > DNNData model_input; > + int check; > > result = ctx->model->get_input(ctx->model->model, &model_input, > ctx->model_inputname); > if (result != DNN_SUCCESS) { > @@ -144,26 +164,9 @@ static int config_input(AVFilterLink *inlink) > return AVERROR(EIO); > } > > - // the design is to add explicit scale filter before this filter > - if (model_input.height != -1 && model_input.height != inlink->h) { > - av_log(ctx, AV_LOG_ERROR, "the model requires frame height %d but > got %d\n", > - model_input.height, inlink->h); > - return AVERROR(EIO); > - } > - if (model_input.width != -1 && model_input.width != inlink->w) { > - av_log(ctx, AV_LOG_ERROR, "the model requires frame width %d but got > %d\n", > - model_input.width, inlink->w); > - return AVERROR(EIO); > - } > - > - if (model_input.channels != 3) { > - av_log(ctx, AV_LOG_ERROR, "the model requires input channels %d\n", > - model_input.channels); > - return AVERROR(EIO); > - } > - if (model_input.dt != DNN_FLOAT && model_input.dt != DNN_UINT8) { > - av_log(ctx, AV_LOG_ERROR, "only support dnn models with input data > type as float32 and uint8.\n"); > - return AVERROR(EIO); > + check = check_modelinput_inlink(&model_input, inlink); > + if (check != 0) { > + return check; > } > > ctx->input.width = inlink->w; > -- > 2.7.4 > LGTM, pushed thanks.
> _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".