From patchwork Sat Nov 26 14:46:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217756pzb; Sat, 26 Nov 2022 06:48:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf49dxfEZ85AQB5tQmnUdYi5l99rEDZiCprZD5vEFXpeP07gNirHkRpV4Uein6hm52XSr+LE X-Received: by 2002:a17:906:a198:b0:7b4:bc42:3b44 with SMTP id s24-20020a170906a19800b007b4bc423b44mr28983280ejy.101.1669474094876; Sat, 26 Nov 2022 06:48:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474094; cv=none; d=google.com; s=arc-20160816; b=y8BCaM1iXk1k0ePl+cPBxGKff/Yu3HHgI7pzGI86KRCcicgoPfWdptYk1t9+XLobNG 6npT9mmh+LO9O+HF8npSrwQCpM8DRw8q09Ey1izbKHM2Ay/pZVxU5WK3W4m4msgAP90C j+A7UKC3ivwMqWn4yuWa0c9qQiGXMuOdR66HO5EgJJKlaTkElI3nLeDPi14dac46ZzsK 2ECTX8FslI7NBtCCkEdc/qBq0kFh42TNIAiDA/UC3iAy8el1QjMa1EFDnEvcrPvNbvBb O7JUt/pLeBgdyrP8A2MSNggQuMwssMOxYWtjScl4BKS/Ppux0yRuVyKmAJYgW6pwCCcQ 863A== 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=ZfUStUE2+OUtNZNb5cQMu6vX1EvYaDWLHu4/cw/1MnDzeeKbIWxsTQwNabUXv6/sfG K6twA2JfxLOn7ed9gxkP9fTqzg5gnc2Lez98O0J9xRuvA4NdMt6p/RHqYwJ4H3zdYM9w nEeBUDtyGcM6rI7PeNSBXN6fU7AZPZ25SHoxaeEV46f+A6HvoSljXT9X+owQnzEHFBn1 bJmWPsefWprj5boqXB3cdHIJddXjqxudxMG5IDYfxdn6vBFd0nVB+hDS1gWKRIc0r9BZ 8ARBn4Wj8suBB/6xfNml82FMADQJiHaTxTAPWH35LpLNh+utS62ewQyiBu6Xycs8bnw+ nOZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AmjPZer8; 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 t20-20020a170906179400b007ad9885d2b1si4381651eje.301.2022.11.26.06.48.14; Sat, 26 Nov 2022 06:48:14 -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=AmjPZer8; 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 41E8468BB84; Sat, 26 Nov 2022 16:47:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 012F368BA40 for ; Sat, 26 Nov 2022 16:47:07 +0200 (EET) Received: by mail-ej1-f41.google.com with SMTP id bj12so16002509ejb.13 for ; Sat, 26 Nov 2022 06:47:07 -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=AmjPZer8nPKBI7iMfDp6GFfM/R5UI6JFpJL7pVEOL0corW6QOFxEIPjitZsVH62Gzh zkPCCnvJPF6lI2bD2GCVam+sLi+jTpUB9+Ydjvh3m0GoL19hDG1Zu/tvqFe1num7OUVR D2xcFu3QuS5VzyJzV9KQm9PqjM/vEsEVJ+/aYPfSstuuq8phaIvOw9l8rTAmOXKsKi9S tyDcwNyftaHqVUhDJ/MfoH5ML0YnbuDd8ilzpEzcUovEWhRvklhbp5fgKTyunNSsPnj9 lv/kNcZb2NKaHz15XK5ddnLYPif9AuPzIYmQ9ywBgiVQRf13P0Tz9x4+T8vemGQ8nMFF MTUg== 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=RlxQCrtdH9q/yME1sVUCgJwj0useTFOnXpSOLj8pWiCgElvJ4x1s9Z+BLifV7MsU99 idjHhi9jkO4VLHLPv7Uncfsm8mnascaytY2hM7wiv8fdddplATg26HwZKHnp99TedxYL 7gaNL/X/Wy9BXI7CVpqj2ZGdAN7/F1EDR9zNWXbAzCbDc1aF0DR/SPzyD72Q1zKwha67 DxAG5SpxkWxOFQaoGOGOX62URi+wV8PvPolIkMkMZNQPfTLcXgotn+T5eb/R7ptxovfU JQQ/1qtc8wlfUq3grXavLPI1uqkKjGcJdSsw/7+kk2D4cfTojdUkj7S2Tac/cb+XqMOi 3o1w== X-Gm-Message-State: ANoB5pm1bURtEIxx3tLthmehi/idXYjo5vojLXU0hLFEgC9GIExGxQiF CgPt4FfPlGzjoncy/M/8eh+k2GmcLZU= X-Received: by 2002:a17:906:34d0:b0:78d:c16e:dfc9 with SMTP id h16-20020a17090634d000b0078dc16edfc9mr37084569ejb.327.1669474027083; Sat, 26 Nov 2022 06:47:07 -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 ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:06 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:30 +0100 Message-Id: <20221126144648.73162-14-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221126144648.73162-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> <20221126144648.73162-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: yGcuQg0q4HeG --- 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;