From a696d7cb22a54568c97c9f0562b6c34142a89acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fithan=20Yi=C4=9Fit?= Date: Sat, 1 Feb 2025 22:48:33 +0300 Subject: [PATCH] refactor: remove feature name from VmafMetadataConfiguration --- libvmaf/include/libvmaf/libvmaf.h | 1 - libvmaf/src/feature/feature_collector.c | 1 - libvmaf/test/test_propagate_metadata.c | 8 -------- 3 files changed, 10 deletions(-) diff --git a/libvmaf/include/libvmaf/libvmaf.h b/libvmaf/include/libvmaf/libvmaf.h index 11d0d1190..6e489f8e3 100644 --- a/libvmaf/include/libvmaf/libvmaf.h +++ b/libvmaf/include/libvmaf/libvmaf.h @@ -280,7 +280,6 @@ typedef struct VmafMetadata { * @param data User data to pass to the callback. */ typedef struct VmafMetadataConfiguration { - char *feature_name; void (*callback)(void *data, VmafMetadata *metadata); void *data; } VmafMetadataConfiguration; diff --git a/libvmaf/src/feature/feature_collector.c b/libvmaf/src/feature/feature_collector.c index e06c850e8..4b0efdcc2 100644 --- a/libvmaf/src/feature/feature_collector.c +++ b/libvmaf/src/feature/feature_collector.c @@ -291,7 +291,6 @@ int vmaf_feature_collector_register_metadata(VmafFeatureCollector *feature_colle VmafMetadataConfiguration metadata_cfg) { if (!feature_collector) return -EINVAL; - if (!metadata_cfg.feature_name) return -EINVAL; if (!metadata_cfg.callback) return -EINVAL; VmafCallbackList *metadata = feature_collector->metadata; diff --git a/libvmaf/test/test_propagate_metadata.c b/libvmaf/test/test_propagate_metadata.c index 384b7405f..d81fdf168 100644 --- a/libvmaf/test/test_propagate_metadata.c +++ b/libvmaf/test/test_propagate_metadata.c @@ -128,7 +128,6 @@ static char* test_propagate_metadata() }; VmafMetadataConfiguration m = { - .feature_name = "vmaf", .callback = set_meta, .data = &meta_data, }; @@ -167,7 +166,6 @@ static char* test_propagate_metadata() vmaf_feature_collector_destroy(feature_collector); m.data = NULL; - m.feature_name = "vmaf"; err = vmaf_feature_collector_init(&feature_collector); mu_assert("problem during vmaf_feature_collector_init", !err); @@ -183,7 +181,6 @@ static char* test_propagate_metadata() vmaf_feature_collector_destroy(feature_collector); m.callback = NULL; - m.feature_name = "vmaf"; err = vmaf_feature_collector_init(&feature_collector); mu_assert("problem during vmaf_feature_collector_init", !err); @@ -213,7 +210,6 @@ static char *test_propagate_metadata_non_monotonic() }; VmafMetadataConfiguration m = { - .feature_name = strdup("vmaf"), .callback = test_non_monotonic_callback, .data = &meta_data, }; @@ -318,13 +314,11 @@ static char *test_multiple_callbacks() }; VmafMetadataConfiguration m1 = { - .feature_name = "vmaf", .callback = multi_callback, .data = &cb_data1, }; VmafMetadataConfiguration m2 = { - .feature_name = "vmaf", .callback = multi_callback, .data = &cb_data2, }; @@ -397,13 +391,11 @@ static char *test_multiple_callbacks_non_monotonic() }; VmafMetadataConfiguration m1 = { - .feature_name = "vmaf", .callback = multi_callback, .data = &cb_data1, }; VmafMetadataConfiguration m2 = { - .feature_name = "vmaf", .callback = multi_callback, .data = &cb_data2, };