From patchwork Mon Dec 4 15:58:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Fons Miret X-Patchwork-Id: 44903 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a301:b0:181:818d:5e7f with SMTP id x1csp2863419pzk; Mon, 4 Dec 2023 07:59:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmtOak6a2ceyuN959420EXkejxkUSHrTtneHF2JJnasJ/fSmVtkyN6uSpUgGM6r6GBmvaE X-Received: by 2002:a17:906:2206:b0:a19:a19b:c719 with SMTP id s6-20020a170906220600b00a19a19bc719mr3229083ejs.105.1701705560604; Mon, 04 Dec 2023 07:59:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701705560; cv=none; d=google.com; s=arc-20160816; b=GiG3A8Srt5ZHzTiJ30EBGz56HDtRiTG8jMXWr7bGZvBFfml6hnIaM83TqnefE4pfff YFOfRvVOCP0zcFW3BNzcXAIgXlE8SxrM0YqP6LS0hrV3aM6FveFyGkHCqq8E5AfRRtP9 QXKY2eI2mUZO5W6cy19aAMUN4dr0MOJi4cpO+2ugm1t2/8gZk1ygRjajlK0O4DPaITal kKZNkAW7kpWUYL4dnaqVOMOPpKRoGB9ZpUR/LCXwFVp60WAL/VNGnvyZ1unYJexShlXw t8dtwohftJjyxYwqoPYWkJx8Kd8RN0Xmf2AicDkVkfZ9B3RiUpX8Y3YnV4rxngwwMGoG FHOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:date:mime-version :delivered-to; bh=Ra8HSOMEHY8o8pEivLYhCZqD2VF3KEwDMK2m0p4z6MU=; fh=FPP19+92THmi+EDA2yUHe8UP4PaCJr4+rhEVD18+8YI=; b=w0Mcb+NyvC5iJYLM1+SqwM1llpYQSu8VqinuxL7eUt1mFYTPT9tybYTHQfCzuS3yvM hLcxuxS0sbAZUTqGbxANjidtriXeOYZ9LzX8u6ib05h+IckfcOoYOpKQ3PLDFZ9kdcFj /ITUENnzYzOaZQHXRT14MDejoGSh3iFs5G6sSpdTVLvp9s03or4n48I3SoKFXj9GnHsf yVJKLvlNrcBHe+0+Wzevg6qeonNJHNrEGpuDPGufFpYoD9k+ShG/6KIGv+A96lWEYDIn GHUlMg85QCMFBUh7Lky1zxxfXHeAJF5fO/I76kw6YLFVOHeZHc68a5sB6XBJ4lZfPi2T lRbQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qc22-20020a170906d8b600b00a16f3dcb5cbsi4430260ejb.499.2023.12.04.07.59.20; Mon, 04 Dec 2023 07:59:20 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF13368ABE6; Mon, 4 Dec 2023 17:59:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B1FB68ABE6 for ; Mon, 4 Dec 2023 17:59:10 +0200 (EET) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-1fa26074783so2241771fac.1 for ; Mon, 04 Dec 2023 07:59:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701705548; x=1702310348; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=f2Lk529WdhELOaWgfsH+PQC0Cl2xJ8a9qSoMcbjBzYY=; b=ASR3JWiRvfQEFXeogLvcCQKMVdq5OhWi1SEuYVXnAxyhcxq2/sSSyjxlpB7RKz0IQD 30Hu8Huf13DHPmNNKmmBtSnt/nZ6nLpl/Ug2jlQPxAASf/UCTTFkNOGQblCLs4VpuFXT R7ITQsErJ+qWkWPNP6e5WVnD39w/DDw/RfUpsa7bA8ZUR7oAIy7rIJtEl76GUJT3J1w+ yzB3ovIhjm01uJvb/ncrQ9HCxW0wSQoWGGNG0WTnz0hy5tu2ZRsv9WtI5Gpjk7GYgAoa MVwk4Hsy42tne/QiAUEjOH7ebHSHfrWFDli35qnpJyyfQEryN77vZLcRrHiSeS1YR4bm hIVw== X-Gm-Message-State: AOJu0Ywb8BNHnkogx4Fjhvv2cyf1CRCIJKxMnLoeHmKzGBIkwYPfk9hf mD4pogDvZfZLFsuhycGF+ySakvgn/apcR84Wxvpry9Wene8bmlqXRpQ= X-Received: by 2002:a05:6870:ab8a:b0:1fb:15c3:2884 with SMTP id gs10-20020a056870ab8a00b001fb15c32884mr4694663oab.39.1701705548562; Mon, 04 Dec 2023 07:59:08 -0800 (PST) MIME-Version: 1.0 Date: Mon, 4 Dec 2023 15:58:57 +0000 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avfilter/vf_libvmaf: fix string comparison bug 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: , X-Patchwork-Original-From: Nil Fons Miret via ffmpeg-devel From: Nil Fons Miret Reply-To: FFmpeg development discussions and patches Cc: Nil Fons Miret , Kyle Swanson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SMidOxpB7cvN The libvmaf filter was doing substring checks in place of string equality comparisons. This led to a bug when the user specified the pooling method "harmonic_mean", since "mean" was checked first and the substring comparison returned true. This patch changes all substring comparisons for string equality comparisons. This is both correct and more efficient than the existing method. Signed-off-by: nilfm --- libavfilter/vf_libvmaf.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 12810b7267..46ff8154ef 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -251,7 +251,7 @@ static int parse_features(AVFilterContext *ctx) const AVDictionaryEntry *e = NULL; while (e = av_dict_iterate(dict[i], e)) { - if (av_stristr(e->key, "name")) { + if (!strcmp(e->key, "name")) { feature_name = e->value; continue; } @@ -312,29 +312,29 @@ static int parse_models(AVFilterContext *ctx) char *path = NULL; while (e = av_dict_iterate(dict[i], e)) { - if (av_stristr(e->key, "disable_clip")) { - model_cfg.flags |= av_stristr(e->value, "true") ? + if (!strcmp(e->key, "disable_clip")) { + model_cfg.flags |= !strcmp(e->value, "true") ? VMAF_MODEL_FLAG_DISABLE_CLIP : 0; continue; } - if (av_stristr(e->key, "enable_transform")) { - model_cfg.flags |= av_stristr(e->value, "true") ? + if (!strcmp(e->key, "enable_transform")) { + model_cfg.flags |= !strcmp(e->value, "true") ? VMAF_MODEL_FLAG_ENABLE_TRANSFORM : 0; continue; } - if (av_stristr(e->key, "name")) { + if (!strcmp(e->key, "name")) { model_cfg.name = e->value; continue; } - if (av_stristr(e->key, "version")) { + if (!strcmp(e->key, "version")) { version = e->value; continue; } - if (av_stristr(e->key, "path")) { + if (!strcmp(e->key, "path")) { path = e->value; continue; } @@ -529,13 +529,13 @@ static int activate(AVFilterContext *ctx) static enum VmafOutputFormat log_fmt_map(const char *log_fmt) { if (log_fmt) { - if (av_stristr(log_fmt, "xml")) + if (!strcmp(log_fmt, "xml")) return VMAF_OUTPUT_FORMAT_XML; - if (av_stristr(log_fmt, "json")) + if (!strcmp(log_fmt, "json")) return VMAF_OUTPUT_FORMAT_JSON; - if (av_stristr(log_fmt, "csv")) + if (!strcmp(log_fmt, "csv")) return VMAF_OUTPUT_FORMAT_CSV; - if (av_stristr(log_fmt, "sub")) + if (!strcmp(log_fmt, "sub")) return VMAF_OUTPUT_FORMAT_SUB; } @@ -545,11 +545,11 @@ static enum VmafOutputFormat log_fmt_map(const char *log_fmt) static enum VmafPoolingMethod pool_method_map(const char *pool_method) { if (pool_method) { - if (av_stristr(pool_method, "min")) + if (!strcmp(pool_method, "min")) return VMAF_POOL_METHOD_MIN; - if (av_stristr(pool_method, "mean")) + if (!strcmp(pool_method, "mean")) return VMAF_POOL_METHOD_MEAN; - if (av_stristr(pool_method, "harmonic_mean")) + if (!strcmp(pool_method, "harmonic_mean")) return VMAF_POOL_METHOD_HARMONIC_MEAN; }