[FFmpeg-devel] [PATCH V2] dnn/native: add log error message
Guo, Yejun
yejun.guo at intel.com
Tue Aug 18 05:30:40 EEST 2020
> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> On Behalf Of Ting Fu
> Sent: 2020年8月17日 13:35
> To: ffmpeg-devel at ffmpeg.org
> Subject: [FFmpeg-devel] [PATCH V2] dnn/native: add log error message
>
> Signed-off-by: Ting Fu <ting.fu at intel.com>
> ---
> V2:
> Fix the issue in V1: make fate failed
>
> libavfilter/dnn/dnn_backend_native.c | 74 +++++++++++++++----
> libavfilter/dnn/dnn_backend_native.h | 5 ++
> .../dnn/dnn_backend_native_layer_avgpool.c | 2 +-
> .../dnn/dnn_backend_native_layer_avgpool.h | 2 +-
> .../dnn/dnn_backend_native_layer_conv2d.c | 2 +-
> .../dnn/dnn_backend_native_layer_conv2d.h | 2 +-
> .../dnn_backend_native_layer_depth2space.c | 2 +-
> .../dnn_backend_native_layer_depth2space.h | 2 +-
> .../dnn/dnn_backend_native_layer_mathbinary.c | 10 ++-
> .../dnn/dnn_backend_native_layer_mathbinary.h | 2 +-
> .../dnn/dnn_backend_native_layer_mathunary.c | 10 ++-
> .../dnn/dnn_backend_native_layer_mathunary.h | 2 +-
> .../dnn/dnn_backend_native_layer_maximum.c | 2 +-
> .../dnn/dnn_backend_native_layer_maximum.h | 2 +-
> .../dnn/dnn_backend_native_layer_pad.c | 2 +-
> .../dnn/dnn_backend_native_layer_pad.h | 2 +-
> libavfilter/dnn/dnn_backend_native_layers.h | 2 +-
> tests/dnn/dnn-layer-avgpool-test.c | 4 +-
> tests/dnn/dnn-layer-conv2d-test.c | 4 +-
> tests/dnn/dnn-layer-depth2space-test.c | 2 +-
> tests/dnn/dnn-layer-mathbinary-test.c | 6 +-
> tests/dnn/dnn-layer-mathunary-test.c | 2 +-
> tests/dnn/dnn-layer-maximum-test.c | 2 +-
> tests/dnn/dnn-layer-pad-test.c | 6 +-
> 24 files changed, 103 insertions(+), 48 deletions(-)
>
> diff --git a/libavfilter/dnn/dnn_backend_native.c
> b/libavfilter/dnn/dnn_backend_native.c
> index adc652a2c4..6ddffa54af 100644
> --- a/libavfilter/dnn/dnn_backend_native.c
> +++ b/libavfilter/dnn/dnn_backend_native.c
> @@ -28,15 +28,30 @@
> #include "dnn_backend_native_layer_conv2d.h"
> #include "dnn_backend_native_layers.h"
>
> +static const AVClass dnn_native_class = {
> + .class_name = "dnn_native",
> + .item_name = av_default_item_name,
> + .option = NULL,
> + .version = LIBAVUTIL_VERSION_INT,
> + .category = AV_CLASS_CATEGORY_FILTER,
> +};
> +
> +NetworkContext network_ctx = {
> + .class = &dnn_native_class,
> +};
> +
> static DNNReturnType get_input_native(void *model, DNNData *input, const
> char *input_name)
> @@ -128,6 +158,7 @@ DNNModel *ff_dnn_load_model_native(const char
> *model_filename, const char *optio
> int32_t layer;
> DNNLayerType layer_type;
>
> +
don't add extra empty line
> diff --git a/libavfilter/dnn/dnn_backend_native.h
> b/libavfilter/dnn/dnn_backend_native.h
> index b455e44992..954a4187d1 100644
> --- a/libavfilter/dnn/dnn_backend_native.h
> +++ b/libavfilter/dnn/dnn_backend_native.h
> @@ -106,8 +106,13 @@ typedef struct InputParams{
> int height, width, channels;
> } InputParams;
>
> +typedef struct NetworkContext {
> + const AVClass *class;
> +} NetworkContext;
> +
> // Represents simple feed-forward convolutional network.
> typedef struct ConvolutionalNetwork{
> + NetworkContext *log_ctx;
NetworkContext can not only be used for log, but also for options, so rename to ctx from log_ctx.
others LGTM, thanks.
More information about the ffmpeg-devel
mailing list