Unified · Split
| @@ -65,8 +65,6 @@ static av_cold int init(AVFilterContext *context) · 64 unmodified lines | |||
| 65 | return ff_dnn_init(&ctx->dnnctx, DFT_PROCESS_FRAME, context); | 65 | return ff_dnn_init(&ctx->dnnctx, DFT_PROCESS_FRAME, context); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | static int query_formats(AVFilterContext *context) | ||
| 69 | { | ||
| 70 | static const enum AVPixelFormat pix_fmts[] = { | 68 | static const enum AVPixelFormat pix_fmts[] = { |
| 71 | AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, | 69 | AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, |
| 72 | AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAYF32, | 70 | AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAYF32, |
| @@ -75,8 +73,6 @@ static int query_formats(AVFilterContext *context) · 2 unmodified lines | |||
| 75 | AV_PIX_FMT_NV12, | 73 | AV_PIX_FMT_NV12, |
| 76 | AV_PIX_FMT_NONE | 74 | AV_PIX_FMT_NONE |
| 77 | }; | 75 | }; |
| 78 | return ff_set_common_formats_from_list(context, pix_fmts); | ||
| 79 | } | ||
| 80 | 76 | ||
| 81 | #define LOG_FORMAT_CHANNEL_MISMATCH() \ | 77 | #define LOG_FORMAT_CHANNEL_MISMATCH() \ |
| 82 | av_log(ctx, AV_LOG_ERROR, \ | 78 | av_log(ctx, AV_LOG_ERROR, \ |
| @@ -372,7 +368,7 @@ const AVFilter ff_vf_dnn_processing = { · 289 unmodified lines | |||
| 372 | .uninit = uninit, | 368 | .uninit = uninit, |
| 373 | FILTER_INPUTS(dnn_processing_inputs), | 369 | FILTER_INPUTS(dnn_processing_inputs), |
| 374 | FILTER_OUTPUTS(dnn_processing_outputs), | 370 | FILTER_OUTPUTS(dnn_processing_outputs), |
| 375 | FILTER_QUERY_FUNC(query_formats), | 371 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 376 | .priv_class = &dnn_processing_class, | 372 | .priv_class = &dnn_processing_class, |
| 377 | .activate = activate, | 373 | .activate = activate, |
| 378 | }; | 374 | }; |