From 7394c78d90712598e3217d21547fd31a58be6498 Mon Sep 17 00:00:00 2001 From: Kyle Swanson Date: Wed, 24 Jul 2024 23:32:02 -0700 Subject: [PATCH] use data and callback directly from cfg --- libvmaf/src/feature/feature_collector.c | 2 +- libvmaf/src/metadata_handler.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libvmaf/src/feature/feature_collector.c b/libvmaf/src/feature/feature_collector.c index 650d9115d..898965b51 100644 --- a/libvmaf/src/feature/feature_collector.c +++ b/libvmaf/src/feature/feature_collector.c @@ -373,7 +373,7 @@ int vmaf_feature_collector_append(VmafFeatureCollector *feature_collector, .score = score, }; - metadata_iter->callback(metadata_iter->data, &data); + metadata_iter->metadata_cfg.callback(metadata_iter->metadata_cfg.data, &data); model_iter = model_iter->next; } metadata_iter = metadata_iter->next; diff --git a/libvmaf/src/metadata_handler.c b/libvmaf/src/metadata_handler.c index f6e5ff258..99f69c212 100644 --- a/libvmaf/src/metadata_handler.c +++ b/libvmaf/src/metadata_handler.c @@ -48,10 +48,6 @@ int vmaf_metadata_append(VmafCallbackList *metadata, const VmafMetadataConfigura node->metadata_cfg = metadata_cfg; - //FIXME, remove these - node->data = metadata_cfg.data; - node->callback = metadata_cfg.callback; - if (!metadata->head) { metadata->head = node; } else {