From patchwork Thu Aug 20 16:39:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Mallon X-Patchwork-Id: 21775 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1402B449E29 for ; Thu, 20 Aug 2020 19:39:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4A07689ABF; Thu, 20 Aug 2020 19:39:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B03836801E0 for ; Thu, 20 Aug 2020 19:39:31 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id l2so2638283wrc.7 for ; Thu, 20 Aug 2020 09:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codex.online; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=oIB2DOo/X3PaKtnlebOxN9H0ygE3kGhXXLYM/Hv7+jg=; b=lCPFh1pWGZiUu3PwJBmrNFa/auGERoRnrtl+Kp3d/KfjN2Lq4kkucnXQjxNlnypqW3 Iaf0GXQgVMqWnOAVdjOasl1ed51cYa2dm85HBk/PLM6kMptCiPYlMzUym8Txjse2bFDj 5VyOHb0R78Jz0aQr9bYP/a2FHFePBY3cU4nfk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oIB2DOo/X3PaKtnlebOxN9H0ygE3kGhXXLYM/Hv7+jg=; b=XWf5kC9x8uY6deUdNq/cgnVxyVHk3Fnj2U4zbf9t7Gshy4h90bNZc1VQvsVY+yZfU3 rN5GD4wi9V5AKwABoPOlEU/Xg6zEuSHhpgkWK0JIKNELnJ+gSED0WnMHQql0M06gmprV 15vCBfVCOv050lsY2peDr5qCbvNm8pUjOuIsEsl6DzH8djSp4vqfLGOh3CevtgRJMGYZ DGX7AX38tIVdiQ/S54TAQNV2J5opEhxyaQxtnVpq2EXPi/KdByNoK+OGpWynt2KQ+cQc ZhkpaXer7QNYz5K5/U8vG1NpajKjad4P0lyqAP1hgvh9jLpE9HxoZGAL9nfZTj8TH7Az 9/tg== X-Gm-Message-State: AOAM533AiidlAy8O2JpyVcsQ6N7QclgI+FHaNEPWXlXEVhpZmfUTMTVb YyIRe/dCh2lx8aM1pdrDrQVKXFzVCKAHsA== X-Google-Smtp-Source: ABdhPJyLB5sNK6mzGZvpQJDAw9l8N27KvwN4osDditKsonJrCxgbhJwegcyIG43QaxgU4Qvt8S3Jlw== X-Received: by 2002:adf:8186:: with SMTP id 6mr3931038wra.62.1597941570742; Thu, 20 Aug 2020 09:39:30 -0700 (PDT) Received: from localhost ([2a01:4b00:8571:3800:7c6a:d69c:56a4:3d6]) by smtp.gmail.com with ESMTPSA id o2sm5518986wrh.70.2020.08.20.09.39.30 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Aug 2020 09:39:30 -0700 (PDT) From: Harry Mallon To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Aug 2020 17:39:27 +0100 Message-Id: <20200820163927.22280-1-harry.mallon@codex.online> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820133851.95782-1-harry.mallon@codex.online> References: <20200820133851.95782-1-harry.mallon@codex.online> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavfilter/vf_libvmaf: document log_fmt = csv X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Harry Mallon --- doc/filters.texi | 2 +- libavfilter/vf_libvmaf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index d8cd45066a..610cb09a8c 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12870,7 +12870,7 @@ Default value: @code{"/usr/local/share/model/vmaf_v0.6.1.pkl"} Set the file path to be used to store logs. @item log_fmt -Set the format of the log file (xml or json). +Set the format of the log file (csv, json or xml). @item enable_transform This option can enable/disable the @code{score_transform} applied to the final predicted VMAF score, diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 14c3216b3a..4d49127efc 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -74,7 +74,7 @@ typedef struct LIBVMAFContext { static const AVOption libvmaf_options[] = { {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, - {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"log_fmt", "Set the format of the log (csv, json or xml).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, {"phone_model", "Invokes the phone model that will generate higher VMAF scores.", OFFSET(phone_model), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, {"psnr", "Enables computing psnr along with vmaf.", OFFSET(psnr), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},