From patchwork Mon Apr 26 10:48:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 27421 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3850666iob; Mon, 26 Apr 2021 03:49:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybV1I6x3oAeVB/KHWNHgpCr5aHVIapAtHYMz114tQDoWc25/sz184zkceqzrYKNeVgq16i X-Received: by 2002:aa7:ca0d:: with SMTP id y13mr19842649eds.242.1619434161434; Mon, 26 Apr 2021 03:49:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619434161; cv=none; d=google.com; s=arc-20160816; b=Qu/oWeJOzFDAIwCdgzZqX4ySXyv00UXazrFq/jLXYv3PQ9n61wNjJuuenZqZBCi5vg O5MQYV0ptvWD2hrgbVVhX+Yy+VInr4p4vuMBvLIhW9rtgwwyKa4QABM4sN/agRoa7VHn P02MmvpVnr0gf/8GMnufdpmWJURtOxgMyNfxjKEuiEtD/FljL2tjEkJGObdZIrtvqbGy 5Q5GEzadZ9OtEfq62Yttb6mnQjXtqg9o3JExz1eepf5a+pVGshgHpO1hYc84w1Tqa3Ma gdNZhhUoVxHlTYvR8lAH97q6xlAbrmwYFc1z/vD9RHb8GG2BV8jR5mi6WyFGHlVYmq0F dfNQ== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=JukDREj4QUOm4kgOPcwUKYGy5QAbjR2awC4sKJm9Go4=; b=iyy1/ryBQ7dWTujm9o0AcCv+Nbumr9s4OkJ1VJcQuPaHg8Jwo0I1LtPmMs5QNblp5R oSRuwTLDfjHwM70R9LMOAzwM7vthWa9GAqSlsTryRWtKeJIC/R9hlNjlhzxMJZ+TNktp kJQ2Hevv4S0v7EcCjx6O+/dLwzJeAzeeglzKBBAULC6Wd2J80f0oEy0aNzhYmmPukVxZ XR4Lor1uxg3XPlTXgKyiM0gLURLgBn8gI5yOtCuXOQnEP/qmL7SLzHqn3PRm6wCwJ4Et e+jUDeQ655hHSI2PtKvmp9GNGCSsP+0rdHeQwQWb/7kFH7F1cW3c0L94uRc/cslwHQ6L a5Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bLKxJFwB; 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 oz10si13609892ejb.8.2021.04.26.03.49.20; Mon, 26 Apr 2021 03:49:21 -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=bLKxJFwB; 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 C9A32689ADA; Mon, 26 Apr 2021 13:49:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC8BA6818DB for ; Mon, 26 Apr 2021 13:49:09 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id m6-20020a17090a8586b02901507e1acf0fso5045880pjn.3 for ; Mon, 26 Apr 2021 03:49:09 -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; bh=M7HHXZwrFkOtvDxX2UXnKNbJFvNWEjaR5a54ZjRWchg=; b=bLKxJFwBM8GtCFGolEdrlfBAXJhBLiDMAz8SLyhFOn+hc9MGfjCwXrjAQ0JuQXUBmM 7/+kzY7kgce7dVuBGD67ZKcrdT6Dg0RjUGPpFL81tHjh+Ybc54/qKSWVCHllCuGk5c7a n2RsRe99op3XfjrzwBYg05tcz5cH/GRsPZDDwdZN9twiPkRlf/XeNlmJ/isKA7hB7kcw 9poz1/aH4cTVAt+DbCBNNYmaaz3PlluNhb3KlgoSVhD4tsq6qzED2+VcxcQ3wO5TDQtO LAFgN4nDDxRCUNDnHAwcCKTJi2lmpHmhCotgjAq6G3MwQvLSnfDEyOOl7gYYI9dJAYVO fCmw== 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; bh=M7HHXZwrFkOtvDxX2UXnKNbJFvNWEjaR5a54ZjRWchg=; b=bILYAdKlhaweL4iIfEQsnK31rDcRxzHDLoHJPVldC2sy/twtIwiKZ6PAkjxUF2pYX8 kpTSgJvotXsBWWZWNYceoUemjMNIWHQ+5iVqYAYSjjXBmzOojpKjWOgcR2fh2V82e+I0 vzDyjW3UyLAHEaeWa8KoJM1XieQgtR2c9xV9/yG5sJpv46/lLDecSP0AqW9v7GZWor+Y L0qnSpBXE5XVK48KXo8YS4lzDKRyBA4e/iSoGB7ZOCsfM76dFW21pCzoN1ecOIgyAj3M YpI7Bwl+/jtI4BCTOAD0olVrlGlOjokpV1DDk5pkNbs4FR5yqKKNlJpUHku4R3o7Zq37 eQAQ== X-Gm-Message-State: AOAM533899I+93qr8Y1O2/p2U2YHezTVhoAjHsgKLiHHTX4qyzT+KZ6Z Ezq3yseeI9/VICcZGag7gf2m6SrNznY= X-Received: by 2002:a17:90b:b03:: with SMTP id bf3mr22118839pjb.223.1619434147707; Mon, 26 Apr 2021 03:49:07 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u14sm1275592pjy.6.2021.04.26.03.49.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Apr 2021 03:49:07 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 18:48:51 +0800 Message-Id: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/6] doc/filters: correct http link 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: Vklk8uJQQ6rC From: Limin Wang Signed-off-by: Limin Wang --- doc/filters.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 67587d9..e99d70a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -9886,7 +9886,7 @@ Native implementation of DNN loading and execution. @item tensorflow TensorFlow backend. To enable this backend you need to install the TensorFlow for C library (see -@url{https://www.tensorflow.org/install/install_c}) and configure FFmpeg with +@url{https://www.tensorflow.org/install/lang_c}) and configure FFmpeg with @code{--enable-libtensorflow} @end table Default value is @samp{native}. @@ -10187,7 +10187,7 @@ Native implementation of DNN loading and execution. @item tensorflow TensorFlow backend. To enable this backend you need to install the TensorFlow for C library (see -@url{https://www.tensorflow.org/install/install_c}) and configure FFmpeg with +@url{https://www.tensorflow.org/install/lang_c}) and configure FFmpeg with @code{--enable-libtensorflow} @item openvino @@ -18893,7 +18893,7 @@ Native implementation of DNN loading and execution. @item tensorflow TensorFlow backend. To enable this backend you need to install the TensorFlow for C library (see -@url{https://www.tensorflow.org/install/install_c}) and configure FFmpeg with +@url{https://www.tensorflow.org/install/lang_c}) and configure FFmpeg with @code{--enable-libtensorflow} @end table From patchwork Mon Apr 26 10:48:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 27424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3850744iob; Mon, 26 Apr 2021 03:49:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVS4Kty5hi2owJFNbZA2F1eHv8KmXJoa7uH9IucCgrabOlf4CmnFgSXUSWCjiMBIJCGuUN X-Received: by 2002:aa7:d98e:: with SMTP id u14mr13562266eds.19.1619434171590; Mon, 26 Apr 2021 03:49:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619434171; cv=none; d=google.com; s=arc-20160816; b=oytddxeLQcPKt7aRqLbzh0B+dzShRWb5dVNGgfovr1vEfT/VCbrJASfjGrjzzRfbvo 72TAjySuR83pQA5Lac8ok2APb/bUoMoy5mmM5rQYBZyh5NSq4ydAZy09+9F0CiuyrtIl bwxdoh99knVyMccxDXrLlZ2r3YCBvN+4ukyHdRvujTy2tKqicw+jeuT1wQn9lpG895ut WRON8VVT+MTDgw72AJQOjYBBGIkTDyPbrV2hC2xO6O48fvLhwBdpv/i3z7wY0/7Q4gIz 7dlT6/CjXJrJ+tGFpW2lJDY8I0UOUpCuieOhWg3EDkTQiQR/egNXqyVuqcZAaIIsV6y9 uZBw== 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=clK/mroGXKPRFMEvSX9XHu6/OD1mwpJy2XodeVkQNgs=; b=0fP1ziW77l60w97O5VTc5daIc/2ZhmZVjBflRixMf20ioG74DJMta8hQ/oKXdjoCvV eJeZlzHsakD2yIPMVbwcsGlaTsQkSyjRW0Y0WJleAAR0jnjmxb6k9DiENvGVO5+PyDnB kgCKriAouhJipGB8xRMxeNcJfw18rGBMKy/STKELpw6I2qNMz8dBP0Ng8wHdNgU5QJtz /YipEy5jyYeEo2WXfbczbuGeGFQMish8a82VGVPBo125jIutSzsKK9cZecJRU/aFSUy9 WQcC5Mu39tXeiYBjaQiwbjpA2Kx8ji5fV+rUzRbvHGzILkI3Gind3Tq3dLdl+7T8jZYx BFwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="s/YHfFGT"; 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 s6si13154689ejc.744.2021.04.26.03.49.31; Mon, 26 Apr 2021 03:49:31 -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="s/YHfFGT"; 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 021D4689B39; Mon, 26 Apr 2021 13:49:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6BF86818DB for ; Mon, 26 Apr 2021 13:49:10 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id e8-20020a17090a7288b029014e51f5a6baso4951008pjg.2 for ; Mon, 26 Apr 2021 03:49:10 -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=mmgt/iQNr/zAL2wJtuOFsX6/UGA2r6mdzIWmlHcsL/E=; b=s/YHfFGT3pDN4zNJ1imqZsGhGi/aE13BUPCPXV3HoG5BG+Pt0ox5iiB3TSmaFVAOHF myCeFC84ujEHxTEkqputsi4ZzshsDqftio4TgAkaCSjJJm++C5s4sxGDrsvybQ+F6Znf sFdRHKMMwQpjo9ggv3MKdgh3+qEnodSk8/z9Vne7bRohjlJHBknLp0cvAcPQPjvmpOfk +9yTWy+9t2xU2IFLzBoZnKhlzRLGW3eJ+zY4R9+3/U4mPBLEQcrM4G+Q6V26j+Dbx5Tg vek+CTjEWpr0dZ2J3qjAVmi73t5Zfr+669jEm56ac762FemmDrtvClpiWVbYa2SqaWTQ cOEg== 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=mmgt/iQNr/zAL2wJtuOFsX6/UGA2r6mdzIWmlHcsL/E=; b=AkLO4S+K35PK1PwQI5dxDnRgFDmb2w9QeWdRrY4HzYvZnOAMCBoq75yybxm12hDgMt ieQuaPdLmPxFmX5e+YsQ4BCyPMh+uTbbcrTt2c94dqiWVyqMweL5PHYy+GHDPNvfJl+9 U0WzcKbl+TEHvLOIIWDXxKycCoXQ7akfytx5UaBImK1fRoldc4BM6BHYcmt82DbApanr oFOF6EMXBFHckLvPuqWGNWBnZPiYw5muFzPwjA+NkFexqkCZvYr5cNtuiL5eOGJJYcJ6 tnpnRhuCsMzTFUrnMJHz+2/A9Up4OFBf/UQGo2SJaHHldx/Aab76J7ETG3GFzCcORr39 il4g== X-Gm-Message-State: AOAM533WF+YFis3tHUPZeCTsHmVyiQLkCP9GMl984vAR7YQoaxZHZmcR lz3lFVbI19KVCRB7zLXj52zPG95CvWE= X-Received: by 2002:a17:90a:c8:: with SMTP id v8mr22150296pjd.18.1619434148978; Mon, 26 Apr 2021 03:49:08 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u14sm1275592pjy.6.2021.04.26.03.49.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Apr 2021 03:49:08 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 18:48:52 +0800 Message-Id: <1619434136-17760-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> References: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/6] avfilter/vf_sr: add options for backend configs 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: n1SANgVbzobJ From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_sr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index 45f941a..282c468 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -55,6 +55,8 @@ static const AVOption sr_options[] = { { "model", "path to model file specifying network architecture and its parameters", OFFSET(dnnctx.model_filename), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "input", "input name of the model", OFFSET(dnnctx.model_inputname), AV_OPT_TYPE_STRING, { .str = "x" }, 0, 0, FLAGS }, { "output", "output name of the model", OFFSET(dnnctx.model_outputname), AV_OPT_TYPE_STRING, { .str = "y" }, 0, 0, FLAGS }, + { "backend_configs", "backend configs", OFFSET(dnnctx.backend_options), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, + { "options", "backend configs", OFFSET(dnnctx.backend_options), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, { NULL } }; From patchwork Mon Apr 26 10:48:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 27422 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3850851iob; Mon, 26 Apr 2021 03:49:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0N6m02vRWtGr5d/PIpBQkDFBnZ1Nrh/KtRaHF7vtL0jzUw6FSVRJQyDfXNoy+7ckC/CXS X-Received: by 2002:a50:bb27:: with SMTP id y36mr13287267ede.365.1619434181379; Mon, 26 Apr 2021 03:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619434181; cv=none; d=google.com; s=arc-20160816; b=qJYIJ5XcLY3mRt6v8SGv9LYUM6+XUacWpPNGRlGXyUf4gG5hz+qnsP7JrdUhAYNFuw hW8M0BNT4U1NAQswgVetRUY7590olApCIUA/tI5hKqNDPmHHck9/ES4FhiNGMeOFXKYe MC0IkcpHIYcrA6tXthKjQ5mfvOiKxeTvyk+1bvUuxINlNJp9y8tFJ0ZbkqqjfC2WeGB2 M2jHluOHcvMicvb1dm85GP7UyZ1PI1UfQbgkBzEXLV2eUwgRZdIqAP7Vr/FZwkg458WB dBuyPSm4+eVkEKeKiy/IrnwdFw7uVMvvv18W5yR+WkFSuAhJFUVJ9umWDQNrUM2yCMYu rfuA== 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=szPs/6WFIFHfZ9mE9VCnC3Bq71ek+Ip2dv0Qp/wz6Dk=; b=mbJ7fXHHmsJVTh05TOhuz0ys7D6T9+s/TB+wVUnaAy0yhUox2TKUyV7p9i3DE0L4rU OuuJZz7ozjWdidHa2FTBwStwOYnYjL8jiZbe+ioDTjaHgJfU4JdbcCQkiRW5p1Jh2kOy h+NkNiqW6GNZoFml/qiewqHVQINLKDwArmeUJOpTFBvLw9T+cimhZVKCeBM0wzdvftJm s8Ew31DjjdsVphmKo0b3juweCPo6h8DxftPbGo9wMfNrMpGNCMFt57xdRhhv8SjvrPVt 9yEgrjvrAMPN8nH71YP5rvjKmMZ+jK7IylKKJIIpuhPytfTNZg2GaprvbPKEsurGWM4N bEjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=dXfEet7K; 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 i13si13917670edc.382.2021.04.26.03.49.41; Mon, 26 Apr 2021 03:49:41 -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=dXfEet7K; 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 0A4AF689BDB; Mon, 26 Apr 2021 13:49:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3E42689AF3 for ; Mon, 26 Apr 2021 13:49:11 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id g16so11856223plq.3 for ; Mon, 26 Apr 2021 03:49:11 -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=K15M3hTZHzjWqmSXfM8Kot2Z5IxQITuuKS8OFdR4GEs=; b=dXfEet7KxnwHzjjo5nsb3LeiQ5vmfC+bfTznooP52Ux77wvQPXn6wwkBYumnag0YNq fPEsQ11MJh3hlUWdG+83MgOXqFyUEXx/50+p8jMzBQ9a+XkjV37UVD4F116lcAp+gGyG GraytqxJz1Fy+txlju2z6DUGPHWXA95QJ04T7q06yUIEcLXNlHniz9xc68x4zK3f3tA/ vNFMViWdJuA8Y6C3JeCfbz12bGcGzgnoGtWbJ9XQROlcQmqMBFSq5TCaP7Wk84RV8Ux2 HXWM49sRRBg7urxfrvQ1iQzBPOw0RiTQdAQjUuKMud+Y9e+XSEiv+DAaib2Ljlkf9qPv eCKQ== 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=K15M3hTZHzjWqmSXfM8Kot2Z5IxQITuuKS8OFdR4GEs=; b=KpkPtfGzKcst/8Rgtr5mp4GYt6aW+MiNiT2oRXeFglWz6Qer5Pokij6IHiYuvLrrEO f34jwRSXViBKtzCoVWhJn3DSIb6PbpS3yWrsykhpRybu6eCIpz12oLWL3LTUD8T0E62i AfUMVaAdp9KtSR1WxmOtRgK0zCncT73KAElGHtiVUcXtJfMOFw+H0Wr+kKFTDpp0y3P+ GZ6cz9lx4Zz6o17CIhvv6OvNg+h71u8Td+rXJHO0U+YfNOouVxUKsFhXKgaTg+ExoMYE GjbE2LXoVgXF8a7TQWYtdzFzhFMpN/CUXOxYi8iviKcZh/pdPD7cynZhAO0BNrYzBZAM /REA== X-Gm-Message-State: AOAM530GxVe/QYYH5+DdgaXVY1oNjUnPXt9iHFsz3fn6JLWkgovRiK9e 60Nd56JZRZaFr860jKhsdjbaJajBqS8= X-Received: by 2002:a17:90a:b10a:: with SMTP id z10mr21979929pjq.161.1619434150192; Mon, 26 Apr 2021 03:49:10 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u14sm1275592pjy.6.2021.04.26.03.49.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Apr 2021 03:49:09 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 18:48:53 +0800 Message-Id: <1619434136-17760-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> References: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/6] doc/filters: documentation to options for backend 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: S/kZ2aKMGLKe From: Limin Wang Signed-off-by: Limin Wang --- doc/filters.texi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index e99d70a..a959127 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10159,6 +10159,7 @@ and the second line is the name of label id 1, etc. The label id is considered as name if the label file is not provided. @item backend_configs +@item options Set the configs to be passed into backend @item async @@ -10214,6 +10215,10 @@ Set the input name of the dnn network. @item output Set the output name of the dnn network. +@item backend_configs +@item options +Set the configs to be passed into backend + @item async use DNN async execution if set (default: set), roll back to sync execution if the backend does not support async. @@ -18905,6 +18910,10 @@ Note that different backends use different file formats. TensorFlow backend can load files for both formats, while native backend can load files for only its format. +@item backend_configs +@item options +Set the configs to be passed into backend + @item scale_factor Set scale factor for SRCNN model. Allowed values are @code{2}, @code{3} and @code{4}. Default value is @code{2}. Scale factor is necessary for SRCNN model, because it accepts From patchwork Mon Apr 26 10:48:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 27423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp3850953iob; Mon, 26 Apr 2021 03:49:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySgQBsVrUaXVBRuiT0SI1FVRo2LSlOksm6vXpLF6D5X9nW55Q/V62cMaF4t7053bovKXD1 X-Received: by 2002:a05:6402:4308:: with SMTP id m8mr20459083edc.209.1619434191008; Mon, 26 Apr 2021 03:49:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619434191; cv=none; d=google.com; s=arc-20160816; b=r46NMI+8sEGHkwpSXxboVRSY9I7qqjBnar3niOLy1ZCTH+QiKRLD3hmMmYhcjQfLp+ VblNd3HObcjPHhqNVfDz947zjQGG/XkO8ZR9v5gDYk1RzK+fWYV3Gm0nAjWalGSBl0Ec /lK6waHEyVDZqBNab+sRrunE/y7mCz94vagdMZh7SoyZjcNJ6NHX/hWtKNTZmMB/15Op VQ3cNglTqUKmLWJp7OsUVZ4fLSU4IfRRR13O+DiCtO23GbElp2OgCodbgVAasRO5N3lR mcBDK8aRf1jRmYNZBaUg1nXjqkPcx6kzl0/sdrEmUwQksBHKgBTYx+JNetILsEFqW6ag q2rw== 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=sZwQ+6SsHFSF/205WwjWFRSmHsvUh8i+GtBg9RH7WoQ=; b=wBoX3IBAlTe+Vf7Nx2hmSzQ2n3KlWVWERtHTNCk43cevRhithAVn/rA1fulvDY4ay6 H97nlupQtaOKFYUA+i+2zbA+Be59Najls968cdRkjtxEyVkqcCfDGPep6HoAruXaGuyY nBF5mqfPH5y35qzsMfAWTsmfFALZv643Xyklt3Nfkyf8kvR8FLcdu4SaZ3nliDDiXKhU Xxc2OCGxB99q1vIijZmLgHFfYswDaGw2YW+IOtEdIp4rQV6Y+NUNoplLJP5R1xDYzjI3 j6vWdXbSA/M4eN32Kiv2QQh5eWHw6XsX0cppKQzqE8pknoQzmaXbxSFrBtoV37QWIIu0 ebZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=M70StwlJ; 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 k18si13055177edv.534.2021.04.26.03.49.50; Mon, 26 Apr 2021 03:49:50 -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=M70StwlJ; 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 0AB9B6818DB; Mon, 26 Apr 2021 13:49:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E310689B7A for ; Mon, 26 Apr 2021 13:49:13 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id p17so2819796plf.12 for ; Mon, 26 Apr 2021 03:49:12 -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=ioFrw0eAyj0lgL0cnNAZG1dHPU8wfASZZK/is0CN/mw=; b=M70StwlJ6w+aanb7W8cgYZO2enhsblxAH6nv+fCSk3s12EUNYcYze/V7/TgEo/A6r5 FeX0I9n7iFcx988x2EoBWd9CEvarAiE3abg2jhAiWswosJInIg2dXovPW0niuiBsAbld yNj1Y65wFmS6xZW/sJ8YC0XrAui0Fc44BnPoU4jxgmfqcENc5TGkbDj/OXx4bDzxLeVu k5Acl5GV3xdZksLkuZrZQsBkC8gUXYwNTeLryZ/6jcO0rxTTX0+m3FNrSSM0zv9dlOET GQtbYAJrz9nOBeNtAZoe3Hyzn2zL7f3xrpQYe0dnYouEFGnLsVsxKKW1j+bJXMrou95w hVTg== 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=ioFrw0eAyj0lgL0cnNAZG1dHPU8wfASZZK/is0CN/mw=; b=NQf+Xzj035hIAQEToBUJulRPDIv97osGyofSXY791/TlXm1B6vUsJmDan8u1Ia8HXu z335f7vjIdHYqKo9G6tI3TIYI/uSxhBeAvP26UgdBPFiq4Fyr8mL79itDGQrMzo8xsBH jYVyaX5MDdTrMHMH7EYVbTncX9DBMhnKa5dImpPRPZhFezOwU3Sx71KXarH7Bwe+6qMo 5Hxo+i8XRZcqpqpKfVnoONhjI5QaPsoe8CPQXY8P99a6cGRfWocZEMYn39Xtz3QLINJG JnP/kNaKW4au2C9mIMM6nupqupT07yGV8Y1xBs1GdgyF5Hh4Z8tfcbQbQc6CrAoQaE+6 skUw== X-Gm-Message-State: AOAM533Qlq5FI59k/aYS+kMWgGLV6JLezJL0jbk6pWLPwcUVvjuS/bDl z9i/3a3Vh5fsT8YIjMqNjSMWh8nWSt8= X-Received: by 2002:a17:902:f212:b029:ec:af98:8350 with SMTP id m18-20020a170902f212b02900ecaf988350mr18010868plc.37.1619434151437; Mon, 26 Apr 2021 03:49:11 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u14sm1275592pjy.6.2021.04.26.03.49.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Apr 2021 03:49:11 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 18:48:54 +0800 Message-Id: <1619434136-17760-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> References: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/6] tools/python: add help script to get sess_config 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: vDmOQMqPoN9r From: Limin Wang Please note the byte order of the hex data is in normal order. Signed-off-by: Limin Wang --- tools/python/tf_sess_config.py | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 tools/python/tf_sess_config.py diff --git a/tools/python/tf_sess_config.py b/tools/python/tf_sess_config.py new file mode 100644 index 0000000..e4e38bd --- /dev/null +++ b/tools/python/tf_sess_config.py @@ -0,0 +1,44 @@ +# Copyright (c) 2021 +# +# This file is part of FFmpeg. +# +# FFmpeg 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. +# +# FFmpeg 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 FFmpeg; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# ============================================================================== + +# verified with Python 3.6.8 on CentOS 7.2 +import tensorflow as tf + +visible_device_list = '0' # use , separator for more GPUs like '0, 1' +per_process_gpu_memory_fraction = 0.9 # avoid out of memory +intra_op_parallelism_threads = 2 # default in tensorflow +inter_op_parallelism_threads = 5 # default in tensorflow + +gpu_options = tf.compat.v1.GPUOptions( + per_process_gpu_memory_fraction = per_process_gpu_memory_fraction, + visible_device_list = visible_device_list, + allow_growth = True) + +config = tf.compat.v1.ConfigProto( + allow_soft_placement = True, + log_device_placement = False, + intra_op_parallelism_threads = intra_op_parallelism_threads, + inter_op_parallelism_threads = inter_op_parallelism_threads, + gpu_options = gpu_options) + +s = config.SerializeToString() +# print(list(map(hex, s))) # print by json if need + +b = ''.join(format(b,'02x') for b in s) +print('0x%s' % b) # print by hex format From patchwork Mon Apr 26 10:48:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 27426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp1891iob; Mon, 26 Apr 2021 04:14:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMq4rBjS+vn0aiH5fWUJu4oa5j7AZe2OttAdKLlQ2szGp/OokbcRNOa8+Hxz5wvu2R8XjX X-Received: by 2002:a17:906:7c82:: with SMTP id w2mr18112655ejo.448.1619435650818; Mon, 26 Apr 2021 04:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619435650; cv=none; d=google.com; s=arc-20160816; b=X8jd+g9fMgvwUSA12qjO33eEYMDJHXUyxOQTQEVTc0mxQj4QHL1Q3sFbcvI/ojxTE4 pu5XsCygovD6U7BxCK7ng6/EK3I95tlhPhO6IicS+jIqMXvPp2MY4csYH409Hjs9vXOq TCWwai6NrejJZofWxedDU/dNBXFroetufDobc+/kWa06Cgve+LGh4OPzrGfrKfSFSA5T U+lUQMECMmmtvCXel/Xa9NFHdLXz0WX0VkCbPOW1h99uPb+BR92AmU9h5rLRjfMxQ+aT WQ+C7ONtb4GGRv9DhIuDOFT2Ka/yNbVa1YOcXobqxbPE9BcisCRjX0sniD4agJlmmuk0 HJxQ== 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=RMAQKBM9m6UnmKdQ3Qtg1mMVgveXl5J8Ep3jqjMiWRE=; b=eMrZzgxGE9s0mhuRlySPCgYmPIJtgtduuFku9D1LWsaC8vlHySJ7+Oi4+6H0K1oXeK JUgJTcNSsWCf3yJArV9SW0h6LdlA6k06w2/yaFYPzUSwY9h6E2xl8EC9ZPb47aUFeBFi bxPilnTykyuYxM1FehAy+YenR6FPAufm2VtalFWmkC2fakN2AunXzZNzH7cuF+A35asC MgBA7pkDGOwFHCe89mkblVE6/JXiLCj8eskI0nJXNXPdGjUMHDTTDw7gW0jJy77k4AfD +hfUZMGjr8W5Uk4eajdEfpy8y2Zkn7rOHg2sQpLKO5WudFDzZLJPa7iFqG7Z0elQ4BDG 4ceg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="UB21Y/1y"; 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 gt40si13089493ejc.577.2021.04.26.04.14.10; Mon, 26 Apr 2021 04:14:10 -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="UB21Y/1y"; 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 13A6F68982F; Mon, 26 Apr 2021 14:14:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E5A7680396 for ; Mon, 26 Apr 2021 14:14:00 +0300 (EEST) Received: by mail-oi1-f175.google.com with SMTP id u16so38778444oiu.7 for ; Mon, 26 Apr 2021 04:14:00 -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=hGCyIPOAQg68+dcu36vw21TmD0oiX/IahsYcKKAPsS0=; b=UB21Y/1ynEwaRNtxBLeqgUB4p1a3zf0tCD7AheOq32T/5h6WC+Q7CZ31EgNLw2NHRg 70IQe8cszWInMtRfNSastadn/+zEiLcEy4PLimMv+kEEH+vwW6cOd7P31jwAcqpnFzvS Z+7V/ToEFyK0eNtpZkYD7ZaGbqplYZAM2DjwRfLoC/C1/Vi6cEcRwYrrCo8CnR7MSSK6 H/Pwon+yFUkwNYk0Hb/zqAP9EaEU50j66sDAKRW0p6Nidt0fNBh0rlQDaaRiKbS0rHsW d0waW49nx9a1RHeXD1k+xQN16meMtogdCKUaq2+BsVjHVkDCKgdhmpYTVGA7T+MUMyty LWGg== 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=hGCyIPOAQg68+dcu36vw21TmD0oiX/IahsYcKKAPsS0=; b=jY6S/XYwvg6b9yYDw9Di0hcS1d1YXVBxr7PkUKOtzcy8P5AySL687gEch+KllwiGJd mAdGCt6l2UCWaDhsMoFhh5bFEpNn07JdQYV48eA6ZRC81RtKKXbhgpEygSX7+u4/QjDi 1hciZmxHNjBBBarR7QNtZv7K+H/wLclWWFaiZdbVMd2MarO4QkZkagk2EYnll60DeoGI A2Y9T4TbwjK+4HQYSRRWoILXHWfaUkzIEIJmRE+S0x9JMrJbJZxNHBO1edF2wVqCwZke rGlrdLJ66IqQkIJr9ht5AzzMvMrjhMcQDMxcTA/I5fMChFhJldfxLD+gGm6XCKuZUgqi TyXw== X-Gm-Message-State: AOAM533m9zz5zUJq9gZGiJp95l1KS4qejq6iia+RKJdGE4F9Q8iaWVX8 axp8jS76vXim1E3nZXohcZTz3f9fw8c= X-Received: by 2002:a17:90a:4410:: with SMTP id s16mr20488275pjg.203.1619434152942; Mon, 26 Apr 2021 03:49:12 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u14sm1275592pjy.6.2021.04.26.03.49.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Apr 2021 03:49:12 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 18:48:55 +0800 Message-Id: <1619434136-17760-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> References: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/6] avfilter/dnn/dnn_backend_tf: simplify the code with ff_hex_to_data 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: 37nQ1oW8+Dpf From: Limin Wang please use tools/python/tf_sess_config.py to get the sess_config after that. note the byte order of session config is the normal order. Signed-off-by: Limin Wang --- libavfilter/dnn/dnn_backend_tf.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index fb799d2..0084157 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -28,6 +28,7 @@ #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 "../internal.h" #include "dnn_backend_native_layer_pad.h" @@ -202,35 +203,21 @@ static DNNReturnType load_tf_model(TFModel *tf_model, const char *model_filename TF_SessionOptions *sess_opts; const TF_Operation *init_op; uint8_t *sess_config = NULL; - int sess_config_length = 0; + int sess_config_length = ff_hex_to_data(NULL, tf_model->ctx.options.sess_config + 2); // prepare the sess config data if (tf_model->ctx.options.sess_config != NULL) { /* tf_model->ctx.options.sess_config is hex to present the serialized proto required by TF_SetConfig below, so we need to first generate the serialized - proto in a python script, the following is a script example to generate - serialized proto which specifies one GPU, we can change the script to add - more options. - - import tensorflow as tf - gpu_options = tf.GPUOptions(visible_device_list='0') - config = tf.ConfigProto(gpu_options=gpu_options) - s = config.SerializeToString() - b = ''.join("%02x" % int(ord(b)) for b in s[::-1]) - print('0x%s' % b) - - the script output looks like: 0xab...cd, and then pass 0xab...cd to sess_config. + proto in a python script, tools/python/tf_sess_config.py is a script example + to generate the configs of sess_config. */ - char tmp[3]; - tmp[2] = '\0'; - if (strncmp(tf_model->ctx.options.sess_config, "0x", 2) != 0) { av_log(ctx, AV_LOG_ERROR, "sess_config should start with '0x'\n"); return DNN_ERROR; } - sess_config_length = strlen(tf_model->ctx.options.sess_config); if (sess_config_length % 2 != 0) { av_log(ctx, AV_LOG_ERROR, "the length of sess_config is not even (%s), " "please re-generate the config.\n", @@ -238,21 +225,12 @@ static DNNReturnType load_tf_model(TFModel *tf_model, const char *model_filename return DNN_ERROR; } - sess_config_length -= 2; //ignore the first '0x' - sess_config_length /= 2; //get the data length in byte - - sess_config = av_malloc(sess_config_length); + 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; } - - for (int i = 0; i < sess_config_length; i++) { - int index = 2 + (sess_config_length - 1 - i) * 2; - tmp[0] = tf_model->ctx.options.sess_config[index]; - tmp[1] = tf_model->ctx.options.sess_config[index + 1]; - sess_config[i] = strtol(tmp, NULL, 16); - } + ff_hex_to_data(sess_config, tf_model->ctx.options.sess_config + 2); } graph_def = read_graph(model_filename); From patchwork Mon Apr 26 10:48:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 27425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp2918iob; Mon, 26 Apr 2021 04:15:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1rtTn48YAawSuY/iCw2tM8ZYGR1Xrb9PJk/cZvL1Dn1VJlPU7fCI/X4uVyBAvdShPx7lL X-Received: by 2002:a17:906:fa18:: with SMTP id lo24mr17872446ejb.125.1619435729119; Mon, 26 Apr 2021 04:15:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619435729; cv=none; d=google.com; s=arc-20160816; b=GZHRhEafNI3fyQIAZctVfeslJmFiTiNQ/P5ZU56hSVNCSUVcihN1MMrMCI6BqnK1/T WnuGlGoWeqpU+2ByM6OOpK45IJ9ulYeYz1cBxius9LOfLlkeMHLatEtH3AxOE9UazY0F soaiQv5624PCA39kFuW+fUMFzoSnIdI/YeMtWunjZSXEU2Kkxt5snLkRGO9Da4yR3m8p jgR1MTod6mD5OlEmd6rmNqSW+m2COnwrzLPfHM0cXYbUZEH1Fn1dLQ649S6ouz2uz7u0 j//phoPwKDzKzlZzfnttz8rGUzOr3HgCOxLEMGsAnEGVTnyofWz5C8VoUifmljL4gytD gzGw== 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=WowZUPklr6v2qHNXsMW9hZ/1Vpig5JKHLqgmPcoYiXM=; b=bE2nwO1lREnHe2rfV7Ph+n3eBKPdK8U5Y5+aKICR2nBVCI7I73md5qH4iH8KnQGCbR XwsnPpHCAHxIze4+y7vDBkRKlYpRn+VI6j2k9ZYunX6ZMUS7dcxFVCH9CLG3K/yRI9cv FErgyJv55OrT10uLb6Lhn8hmCKoM/EX60+METUmv8jRNp487uvt+vSZfT29PPjiOtu3M hp0ROuceytZAcrWOteBTa2WonkpO60Li5HzERQC7FooNuu8a/QqRBVnHIbUy6aVSYPuu tfyCwL+QEzNYkPosiakMz0ywQB6y9LqQOcml9ljLznmMZEmbw6seTL/VJIyjGkowTrl3 W7nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gvQMq801; 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 k9si15780902eje.366.2021.04.26.04.15.28; Mon, 26 Apr 2021 04:15:29 -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=gvQMq801; 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 66AD1689966; Mon, 26 Apr 2021 14:15:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D15A689966 for ; Mon, 26 Apr 2021 14:15:20 +0300 (EEST) Received: by mail-io1-f42.google.com with SMTP id s16so50298533iog.9 for ; Mon, 26 Apr 2021 04:15:20 -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=Nbgw4/6NSjztgpVmd/wb4nW1VlvUvpYVXbc12JNL5FA=; b=gvQMq801SfrcDNM7X6ls0UWWDb5VgNnsn3SelFEBGH6DRaFKKtGgi0Q/KGVcUNuo9T FQtUeU4ZuTdBgyKhuAszK4dIr45aWiMgqr8AiTFL5LTqRw95hQtV4xr3lFzkMny15Iok jpQ2+7JtKGvzF6Ulfvv3h1JDRlmYS5rbhyqKndiOBAbNKXlanVYCG1JWUYeKyF/LIgmr YGGFxnmFZrw7JIXzUdLSeb88vFeE758rBykvwZZNQ42hpU4fuuxAlvO4aY41uG/BvRMx OVDRa7Geo3IA+NQvJdwpqpi6e6kQJWG2u8W9MziTj861LkfFxxpT64/SWsP/Nt6Obi6v joWA== 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=Nbgw4/6NSjztgpVmd/wb4nW1VlvUvpYVXbc12JNL5FA=; b=cz/2b8WvzO/q8eQERf0FeREhnazqf1Io7bg26ASzZPnEElSHY/bEbLRmGQBMn99jbQ vNip//t7PdXKfP99IWgAL1936oWG2zWiH4BaYzXYOYs/NMvFRkF1aSCLmiiuUMA7cIRa 7KVNGTbe/SCqWgNDHmWRP1RctRWZ03FNFNqMbSa8vd1gENlTQd6MYDqQVM8vYwUZ9kul tjNVOxUuo14hnV0ycpNraVp79/80Wz8ZhUWlgyOTQAbyCZz7Ba8eir4m08w+EVNzJuN/ 6CBGNv71Tw40PRxZmEDPPUO8qj2asT8q2dl4manzupr4uO6fwlzDQ5kpzNveBsD8v+9b 8VYQ== X-Gm-Message-State: AOAM530UFjACLnULbPWFc9CnXnEINtCeWU5U0t13BFXJbZq0P1DgbMzy ylS6zNZ2m61Vmd2tBUuaMaXt/lQau1o= X-Received: by 2002:a63:5c19:: with SMTP id q25mr16782396pgb.402.1619434154159; Mon, 26 Apr 2021 03:49:14 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u14sm1275592pjy.6.2021.04.26.03.49.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Apr 2021 03:49:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 18:48:56 +0800 Message-Id: <1619434136-17760-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> References: <1619434136-17760-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/6] doc/filters: Documentation to add sess_config option for tensorflow backend 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: ehDdM9ug7zJz From: Limin Wang Signed-off-by: Limin Wang --- doc/filters.texi | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index a959127..1ee4354 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10162,6 +10162,9 @@ The label id is considered as name if the label file is not provided. @item options Set the configs to be passed into backend +For tensorflow backend, you can set its configs with @option{sess_config} options, +please use tools/python/tf_sess_config.py to get the configs + @item async use DNN async execution if set (default: set), roll back to sync execution if the backend does not support async. @@ -10219,6 +10222,9 @@ Set the output name of the dnn network. @item options Set the configs to be passed into backend +For tensorflow backend, you can set its configs with @option{sess_config} options, +please use tools/python/tf_sess_config.py to get the configs + @item async use DNN async execution if set (default: set), roll back to sync execution if the backend does not support async. @@ -10247,9 +10253,10 @@ Handle the Y channel with srcnn.pb (see @ref{sr} filter) for frame with yuv420p @end example @item -Handle the Y channel with espcn.pb (see @ref{sr} filter), which changes frame size, for format yuv420p (planar YUV formats supported): +Handle the Y channel with espcn.pb (see @ref{sr} filter), which changes frame size, for format yuv420p (planar YUV formats supported), please +use tools/python/tf_sess_config.py to get the configs for your system. @example -./ffmpeg -i 480p.jpg -vf format=yuv420p,dnn_processing=dnn_backend=tensorflow:model=espcn.pb:input=x:output=y -y tmp.espcn.jpg +./ffmpeg -i 480p.jpg -vf format=yuv420p,dnn_processing=dnn_backend=tensorflow:model=espcn.pb:input=x:output=y:options=sess_config=0x10022805320e09cdccccccccccec3f20012a01303801 -y tmp.espcn.jpg @end example @end itemize @@ -18914,6 +18921,9 @@ its format. @item options Set the configs to be passed into backend +For tensorflow backend, you can set its configs with @option{sess_config} options, +please use tools/python/tf_sess_config.py to get the configs. + @item scale_factor Set scale factor for SRCNN model. Allowed values are @code{2}, @code{3} and @code{4}. Default value is @code{2}. Scale factor is necessary for SRCNN model, because it accepts