From patchwork Sat May 8 01:17:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 27687 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1020792iof; Fri, 7 May 2021 18:17:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmUucbgFAY/Z3prHdPL1WgaR0CDujIBB/1VrrcRoDoQodMTkLmXZMpLcFr3Gu6mMA3SD+i X-Received: by 2002:a17:907:3398:: with SMTP id zj24mr10104199ejb.354.1620436678756; Fri, 07 May 2021 18:17:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620436678; cv=none; d=google.com; s=arc-20160816; b=0ZnHa4Ho0XJLtz+jIBE9OdlurN71J1bb5lbPp7MT+fGNFzfHCfO09D/qofMPfnEh7Z 6k0K61LmCDbx50ErvBxZHG0f+reOFT3wREiteABqfmMbr1tLJsozU3PH0rFTp7dZ7sj6 qka3pYNqxefiviyrmdrREKbX4MOFd56Tqwe4Z6hZcFUlm+0QqpSXBlvK318XUPixlRJZ 8fZLjDmZPFgEDdyIxSokhpwaEy0vrTHo72LkWQqoqJdPHSHD4rWhAzeHT3lowOVIMUrb 5wr2cvnMWf1pnOO5hUlz3Z9psVpyEAK62ah1GtzpjtNMi+B8oG6ngr03c/iMqMT1T0sk BoSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=18LvxWMocetjcRhMg55Kccaw+3Zr3EYf7TrJk3ACbSI=; b=jwN/7l5DtuKFEQuEUxRq9yr3bn4s23Vz7FmrCp5v90NV716jxnKtJnrD4H1bZoaVnt zV20yVlMl5mvf+JisOyW7/MkDK9kxmv7r0cRWhOtnjcpGV9LBKj8dnH9rw8AdxiUHmUP USDZyamEuLChVIP4vSFCqvd17OwoyzfqGHNJnB5UH5NnL92qv+dL/lQRZaWFOfAvNH0R YwKdxxVQAmt/Oni9alViSy6adK4SC2tJvu/QHdLZnURLyToQ7XxaT0paObNzycXjz9HY +Cp5Kq7A8ZGuf4DEgDOxouEJv57HcpnM3f0suIqOwIBtMf7Eeva2ax2cT1XDKY73B9hb XAjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VWE53Zka; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e12si6564692ejk.225.2021.05.07.18.17.57; Fri, 07 May 2021 18:17:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VWE53Zka; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC6946806F8; Sat, 8 May 2021 04:17:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4537680227 for ; Sat, 8 May 2021 04:17:47 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id gq14-20020a17090b104eb029015be008ab0fso6411402pjb.1 for ; Fri, 07 May 2021 18:17:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZMdocYuIvHLgYWz4XLqvlyz2YDbkve5UfMC0GCSS/cg=; b=VWE53ZkahJiiuuCdifeZm7hK9BfssK/fhI6Y/cH2VRArfCqkIFfHIarr44JcN0B39L +jXfN/genB5DPCZ+6ceXX5CAhsta7nniRXJcJ2O+BlL9s6sHeruU4iQ7PaDSZDoHVRbb uZylrvj2KzAS2xAGmKKCIt6WXKm3iYOunzhUmaC++ioro/ZnxlOBEB265IXi1vIxrwLI Pk3hfGKNuEtjNsX8QETQ7RWvMbonrJugkQrZaLcyT8LEPEK6gfPCQpNj6M2OYJxpzNCf Oswrv2JUZ8eNGAEDieOebaxGnNm1qEHx5zqYO6ijfG9E17lr1vgKAdO/SReo2RZS2FKV DMYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZMdocYuIvHLgYWz4XLqvlyz2YDbkve5UfMC0GCSS/cg=; b=Qx60yJcyofAtvRrNQgYmH6CNH7YczBtAPZpPQAA1tDTDbZUm1NZSzycn65c7BprQ4d 3GOh50eXMJphT1mQNiix5+yfmLjPFudX4khkQcOzKiymPs1F065IkH55qCe6I7hiSxYB jPDcLrbV/wUcJtGuBNV8HLmovjKlhJOHaZjERa2ukVE5381aKESRwE/TSboWRxrsvdH+ Q8tQb9cQXjZBhm+S/iUjHQHb5K4XVcP0L6s8O8OXAjONjjMs2CNGRgq/I8dpp0mPbgV1 zEz38r7gS9zWPfG/VtGFRBHRjb74fqR8ApOCsl5orMLHXLcaxhpWfcbIvlgZcTYK/U5o AGTA== X-Gm-Message-State: AOAM531ht9vgDeemgM0oWvd1tLxOD/4sjd1vXd7Cz5TwEmPBLPtwKuag fa9WtrAbwLdruid+qdtk2w1D6WXJ0c0= X-Received: by 2002:a17:90b:300e:: with SMTP id hg14mr13456268pjb.149.1620436665915; Fri, 07 May 2021 18:17:45 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id s184sm5776261pgc.29.2021.05.07.18.17.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 May 2021 18:17:45 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 09:17:35 +0800 Message-Id: <1620436656-18917-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1620350584-21215-1-git-send-email-lance.lmwang@gmail.com> References: <1620350584-21215-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 1/2] avfilter/dnn/dnn_backend_tf: fix cross library usage X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RC4XNj/oSSRs From: Limin Wang duplicate ff_hex_to_data() function from avformat and rename it to hex_to_data() as static function. Signed-off-by: Limin Wang --- libavfilter/dnn/dnn_backend_tf.c | 41 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 03fe310..5980919 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -28,8 +28,8 @@ #include "dnn_backend_native_layer_conv2d.h" #include "dnn_backend_native_layer_depth2space.h" #include "libavformat/avio.h" -#include "libavformat/internal.h" #include "libavutil/avassert.h" +#include "libavutil/avstring.h" #include "../internal.h" #include "dnn_backend_native_layer_pad.h" #include "dnn_backend_native_layer_maximum.h" @@ -195,6 +195,38 @@ static DNNReturnType get_output_tf(void *model, const char *input_name, int inpu return ret; } +#define SPACE_CHARS " \t\r\n" +static int hex_to_data(uint8_t *data, int data_size, const char *p) +{ + int c, len, v; + + len = 0; + v = 1; + for (;;) { + p += strspn(p, SPACE_CHARS); + if (*p == '\0') + break; + c = av_toupper((unsigned char) *p++); + if (c >= '0' && c <= '9') + c = c - '0'; + else if (c >= 'A' && c <= 'F') + c = c - 'A' + 10; + else + break; + v = (v << 4) | c; + if (v & 0x100) { + if (data) { + if (len >= data_size) + return AVERROR(ERANGE); + data[len] = v; + } + len++; + v = 1; + } + } + return len; +} + static DNNReturnType load_tf_model(TFModel *tf_model, const char *model_filename) { TFContext *ctx = &tf_model->ctx; @@ -219,14 +251,17 @@ static DNNReturnType load_tf_model(TFModel *tf_model, const char *model_filename return DNN_ERROR; } config = tf_model->ctx.options.sess_config + 2; - sess_config_length = ff_hex_to_data(NULL, config); + sess_config_length = hex_to_data(NULL, 0, config); sess_config = av_mallocz(sess_config_length + AV_INPUT_BUFFER_PADDING_SIZE); if (!sess_config) { av_log(ctx, AV_LOG_ERROR, "failed to allocate memory\n"); return DNN_ERROR; } - ff_hex_to_data(sess_config, config); + if (hex_to_data(sess_config, sess_config_length, config) < 0) { + av_log(ctx, AV_LOG_ERROR, "failed to convert hex to data\n"); + return DNN_ERROR; + } } graph_def = read_graph(model_filename);