Skip to content

Commit

Permalink
refactor: remove feature name from VmafMetadataConfiguration
Browse files Browse the repository at this point in the history
  • Loading branch information
Yiğithan Yiğit authored and Yiğithan Yiğit committed Feb 2, 2025
1 parent 1246b72 commit a696d7c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion libvmaf/include/libvmaf/libvmaf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion libvmaf/src/feature/feature_collector.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 0 additions & 8 deletions libvmaf/test/test_propagate_metadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ static char* test_propagate_metadata()
};

VmafMetadataConfiguration m = {
.feature_name = "vmaf",
.callback = set_meta,
.data = &meta_data,
};
Expand Down Expand Up @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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,
};
Expand Down Expand Up @@ -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,
};
Expand Down Expand Up @@ -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,
};
Expand Down

0 comments on commit a696d7c

Please sign in to comment.