From patchwork Fri Nov 25 01:30:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948955pzb; Thu, 24 Nov 2022 17:32:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4I7R8kZQMUjjl7/X3Q+JebQR0bb0LXe8yEIWHtWToh49x5mPH7RrYgKzqKsDC1JeW1dwSH X-Received: by 2002:a17:907:a709:b0:79f:cd7c:e861 with SMTP id vw9-20020a170907a70900b0079fcd7ce861mr29074750ejc.339.1669339959793; Thu, 24 Nov 2022 17:32:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339959; cv=none; d=google.com; s=arc-20160816; b=Xe/oDYOzl7m4j4+RJoP1FEam/9g+i5sBFCZHWRZUusgH72WzzCVyizzd5RQ6Avy99P XyUcSbXYxuaOsD4RAZ5hv5Q2k5bG7BRK0ksmhku0LtbDCDPKWL0gF2zImyluwLN08yAB 5EFiTP/L7loX2toqfSdMhxPV19ISp/lm2oDzZOd9T1oSKl1+471ePfRJI+UwsqDn7ubu BLV0zNhqVh8MT6j0o7X3DgN5dI2Mb0qC1nVAy10P8eIDFyvj78qnY6NUU96e/40Yu8Yt tNDJOeZPzNBCpEWCX8fX2Zxus3o8MsJ4enaDCAxMw34UcABxMRx/NaaJH8264Gq4H72g cPVg== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=A1UGMuE8dJ/kx9gYp43Dlkk27BisZNoE0aGblHAeTRA=; b=vEy3qCWAbStd66TRdChpzId6HmmzmYfudvMouCpwzlsJu9J/vgssadznFt4hXw8RC6 JatuO93xKExzglc7LiiHEMEiJdUWicdVFd+Jivxl+3IqoRfp2YRmOw3297p7OPr84NoB U2ZMnTWN/sLmewXxteAHAJNLCaDpi4DCOoqsahiERXvXMYcCWSziafMc667She4hIfoa KNzTENcxsXguV1esRgxddh7DbqaFJiaJmX0OmJipQQz0SiJd84+Lp5osKufTqvN2eRqH 4fHrx9FJr/btDMXo2VaHTfOzJFGs2OUPRYz8QV8Xt2mfC6cl8Sy701JPYc4YQt6F2iY9 GRdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QCFzSL80; 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 k26-20020a05640212da00b00469c41d538bsi2004264edx.180.2022.11.24.17.32.34; Thu, 24 Nov 2022 17:32:39 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QCFzSL80; 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 89F0A68BBE2; Fri, 25 Nov 2022 03:31:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC14E68BB07 for ; Fri, 25 Nov 2022 03:31:01 +0200 (EET) Received: by mail-ed1-f48.google.com with SMTP id s5so4459399edc.12 for ; Thu, 24 Nov 2022 17:31:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6oct+V8mPf3l4jKBQ3gtYdX4r5BJZbkPsD8tlvXu8UQ=; b=QCFzSL80kUebbQ3XIRd0vg+6wwRrpb659scf7kijJ8ALwtob9Z/djJMxxiSpkZcwUv TogGNtJSk8gxd+fp8f49GuSSqHowCfQUD7JLws6KcgaeiVgQncOvgnduVNoi1YgdYWro IJmuwz6UB0Pk2qtSHcK2ktVOaA/M+mXGCrmEH86+x99uu6vlO+DEIjyZxvJDYVbLyZuy OV6XTRsn8wnn8O3f/UR1knesIEP1Dv5UnMp0oLjpAd19mIU9+LH+KfJwhXEDvci80MSi kq9ICVWmiGq8v+2sp11PC3hFoV/pZXXXz5710P8hvPBqmGTCVFoGcWSKPFgR2BYpRF7p VI1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6oct+V8mPf3l4jKBQ3gtYdX4r5BJZbkPsD8tlvXu8UQ=; b=Bi6ZzFE8PN+ZTC+17EIsmCpFyIcVmaYAuByTSGGySyCke+Tr0OmJ7WmqmX/X/07hSQ a8iVJCwXu5CIcI1VuP5vyRR3IKA60SNDaAocen/6UmMPE8sxrCCTb2fxIakLL9fb3/Zr S+LX27WkpQAhuui9O3+nV1+6XZ3OgFxjbx6UDMJ4cnUPY6za5K9uEOwkReCrRLW++vGB FY2rrfkHJvS5+y4kclATBP0bx2lYX2HJbSrSJqerhf0zOirVTRiPqCLCw86ztHYoQB8+ bTpFb/csUxg2UjRdEyMdbFO6VZ81rD+CgcvKelz8136zGJ2646t378uoUO1zwlA+zro8 CFqw== X-Gm-Message-State: ANoB5pkncb2C/EYSdGwE9w2TWUtExjYr5Ayr+oaqQJG85FNEIvqgZNpZ uRCRh9tA3CIrahyoexE4oaBzt1q5YPU= X-Received: by 2002:a05:6402:4516:b0:467:b88c:f3af with SMTP id ez22-20020a056402451600b00467b88cf3afmr15705543edb.24.1669339861562; Thu, 24 Nov 2022 17:31:01 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:01 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:28 +0100 Message-Id: <20221125013046.40904-14-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/31] avfilter/vf_libvmaf: use av_dict_iterate 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LZCRUCvhiLZq --- libavfilter/vf_libvmaf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 8f649c5b02..2586f37d99 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -236,9 +236,9 @@ static int parse_features(AVFilterContext *ctx) for (unsigned i = 0; i < dict_cnt; i++) { char *feature_name = NULL; VmafFeatureDictionary *feature_opts_dict = NULL; - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { if (av_stristr(e->key, "name")) { feature_name = e->value; continue; @@ -295,11 +295,11 @@ static int parse_models(AVFilterContext *ctx) for (unsigned i = 0; i < dict_cnt; i++) { VmafModelConfig model_cfg = { 0 }; - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; char *version = NULL; char *path = NULL; - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { if (av_stristr(e->key, "disable_clip")) { model_cfg.flags |= av_stristr(e->value, "true") ? VMAF_MODEL_FLAG_DISABLE_CLIP : 0; @@ -355,7 +355,7 @@ static int parse_models(AVFilterContext *ctx) goto exit; } - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { VmafFeatureDictionary *feature_opts_dict = NULL; char *feature_opt = NULL;