From 429db8aa91a66f19cc7a0d13dcd474ea1014d5fe Mon Sep 17 00:00:00 2001 From: Cosmin Stejerean Date: Tue, 28 Feb 2023 12:33:10 -0800 Subject: [PATCH] fix names for integer funque features after the alignment with float --- .../third_party/funque/integer_funque.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libvmaf/src/feature/third_party/funque/integer_funque.c b/libvmaf/src/feature/third_party/funque/integer_funque.c index 19b95a9fb..2e5764fb3 100644 --- a/libvmaf/src/feature/third_party/funque/integer_funque.c +++ b/libvmaf/src/feature/third_party/funque/integer_funque.c @@ -493,73 +493,73 @@ static int extract(VmafFeatureExtractor *fex, double adm = adm_den > 0 ? adm_num / adm_den : 1.0; err |= vmaf_feature_collector_append_with_dict(feature_collector, - s->feature_name_dict, "FUNQUE_feature_vif_score", + s->feature_name_dict, "FUNQUE_integer_feature_vif_score", vif, index); err |= vmaf_feature_collector_append_with_dict(feature_collector, - s->feature_name_dict, "FUNQUE_feature_vif_scale0_score", + s->feature_name_dict, "FUNQUE_integer_feature_vif_scale0_score", vif_score[0], index); if (s->vif_levels > 1) { err |= vmaf_feature_collector_append_with_dict(feature_collector, - s->feature_name_dict, "FUNQUE_feature_vif_scale1_score", + s->feature_name_dict, "FUNQUE_integer_feature_vif_scale1_score", vif_score[1], index); if (s->vif_levels > 2) { err |= vmaf_feature_collector_append_with_dict(feature_collector, - s->feature_name_dict, "FUNQUE_feature_vif_scale2_score", + s->feature_name_dict, "FUNQUE_integer_feature_vif_scale2_score", vif_score[2], index); if (s->vif_levels > 3) { err |= vmaf_feature_collector_append_with_dict(feature_collector, - s->feature_name_dict, "FUNQUE_feature_vif_scale3_score", + s->feature_name_dict, "FUNQUE_integer_feature_vif_scale3_score", vif_score[3], index); } } } err |= vmaf_feature_collector_append_with_dict(feature_collector, - s->feature_name_dict, "FUNQUE_feature_adm_score", + s->feature_name_dict, "FUNQUE_integer_feature_adm_score", adm, index); err |= vmaf_feature_collector_append_with_dict(feature_collector, - s->feature_name_dict, "FUNQUE_feature_adm_scale0_score", + s->feature_name_dict, "FUNQUE_integer_feature_adm_scale0_score", adm_score[0], index); // if (s->adm_levels > 1) { // // err |= vmaf_feature_collector_append_with_dict(feature_collector, -// s->feature_name_dict, "FUNQUE_feature_adm_scale1_score", +// s->feature_name_dict, "FUNQUE_integer_feature_adm_scale1_score", // adm_score[1], index); // // if (s->adm_levels > 2) { // err |= vmaf_feature_collector_append_with_dict(feature_collector, -// s->feature_name_dict, "FUNQUE_feature_adm_scale2_score", +// s->feature_name_dict, "FUNQUE_integer_feature_adm_scale2_score", // adm_score[2], index); // // if (s->adm_levels > 3) { // err |= vmaf_feature_collector_append_with_dict(feature_collector, -// s->feature_name_dict, "FUNQUE_feature_adm_scale3_score", +// s->feature_name_dict, "FUNQUE_integer_feature_adm_scale3_score", // adm_score[3], index); // } // } // } - err |= vmaf_feature_collector_append(feature_collector, "FUNQUE_feature_ssim_scale0_score", + err |= vmaf_feature_collector_append(feature_collector, "FUNQUE_integer_feature_ssim_scale0_score", ssim_score[0], index); // if (s->ssim_levels > 1) { // err |= vmaf_feature_collector_append_with_dict(feature_collector, -// s->feature_name_dict, "FUNQUE_feature_ssim_scale1_score", +// s->feature_name_dict, "FUNQUE_integer_feature_ssim_scale1_score", // ssim_score[1], index); // // if (s->ssim_levels > 2) { // err |= vmaf_feature_collector_append_with_dict(feature_collector, -// s->feature_name_dict, "FUNQUE_feature_ssim_scale2_score", +// s->feature_name_dict, "FUNQUE_integer_feature_ssim_scale2_score", // ssim_score[2], index); // // if (s->ssim_levels > 3) { // err |= vmaf_feature_collector_append_with_dict(feature_collector, -// s->feature_name_dict, "FUNQUE_feature_ssim_scale3_score", +// s->feature_name_dict, "FUNQUE_integer_feature_ssim_scale3_score", // ssim_score[3], index); // } // }