Add PSNR-HVS as third-party feature extractor.

Author: li-zhi

libvmaf/src/feature/feature_extractor.c

@@ -36,6 +36,7 @@ extern VmafFeatureExtractor vmaf_fex_float_ssim;
 extern VmafFeatureExtractor vmaf_fex_float_ms_ssim;
 extern VmafFeatureExtractor vmaf_fex_ciede;
 extern VmafFeatureExtractor vmaf_fex_psnr;
+extern VmafFeatureExtractor vmaf_fex_psnr_hvs;
 extern VmafFeatureExtractor vmaf_fex_integer_adm;
 extern VmafFeatureExtractor vmaf_fex_integer_motion;
 extern VmafFeatureExtractor vmaf_fex_integer_vif;
@@ -53,6 +54,7 @@ static VmafFeatureExtractor *feature_extractor_list[] = {
     &vmaf_fex_float_ssim,
     &vmaf_fex_ciede,
     &vmaf_fex_psnr,
+    &vmaf_fex_psnr_hvs,
     &vmaf_fex_integer_adm,
     &vmaf_fex_integer_motion,
     &vmaf_fex_integer_vif,

libvmaf/src/feature/third_party/xiph/psnr_hvs.c

@@ -218,6 +218,7 @@ vmaf_include = include_directories(
 libvmaf_feature_sources = [
     feature_src_dir + 'picture_copy.c',
     feature_src_dir + 'integer_psnr.c',
+    feature_src_dir + 'third_party/xiph/psnr_hvs.c',
     feature_src_dir + 'feature_extractor.c',
     feature_src_dir + 'alias.c',
     feature_src_dir + 'integer_adm.c',

libvmaf/src/meson.build

@@ -0,0 +1,45 @@
+import unittest
+
+import numpy as np
+
+from test.testutil import set_default_576_324_videos_for_testing
+from vmaf.third_party.xiph.vmafexec_feature_extractor import PsnrhvsFeatureExtractor
+
+
+class FeatureExtractorTest(unittest.TestCase):
+
+    def setUp(self):
+        self.verificationErrors = []
+        self.maxDiff = None
+
+    def tearDown(self):
+        if hasattr(self, 'fextractor'):
+            self.fextractor.remove_results()
+        pass
+        self.assertEqual([], self.verificationErrors)
+
+    def test_run_psnrhvs_fextractor(self):
+        ref_path, dis_path, asset, asset_original = set_default_576_324_videos_for_testing()
+        self.fextractor = PsnrhvsFeatureExtractor(
+            [asset, asset_original],
+            None, fifo_mode=False,
+            result_store=None
+        )
+        self.fextractor.run(parallelize=True)
+        results = self.fextractor.results
+        try: self.assertAlmostEqual(results[0]['PSNRHVS_feature_psnr_hvs_score'], 31.33044560416667, places=4)
+        except AssertionError as e: self.verificationErrors.append(str(e))
+        try: self.assertAlmostEqual(results[0]['PSNRHVS_feature_psnr_hvs_y_score'], 30.578766166666668, places=4)
+        except AssertionError as e: self.verificationErrors.append(str(e))
+        try: self.assertAlmostEqual(results[0]['PSNRHVS_feature_psnr_hvs_cb_score'], 37.25849772916666, places=4)
+        except AssertionError as e: self.verificationErrors.append(str(e))
+        try: self.assertAlmostEqual(results[0]['PSNRHVS_feature_psnr_hvs_cr_score'], 38.2002601875, places=4)
+        except AssertionError as e: self.verificationErrors.append(str(e))
+        try: self.assertAlmostEqual(results[1]['PSNRHVS_feature_psnr_hvs_score'], np.float('inf'), places=4)
+        except AssertionError as e: self.verificationErrors.append(str(e))
+        try: self.assertAlmostEqual(results[1]['PSNRHVS_feature_psnr_hvs_y_score'], np.float('inf'), places=4)
+        except AssertionError as e: self.verificationErrors.append(str(e))
+        try: self.assertAlmostEqual(results[1]['PSNRHVS_feature_psnr_hvs_cb_score'], np.float('inf'), places=4)
+        except AssertionError as e: self.verificationErrors.append(str(e))
+        try: self.assertAlmostEqual(results[1]['PSNRHVS_feature_psnr_hvs_cr_score'], np.float('inf'), places=4)
+        except AssertionError as e: self.verificationErrors.append(str(e))

python/test/third_party/xiph/vmafexec_feature_extractor_test.py

@@ -0,0 +1,34 @@
+from vmaf import ExternalProgramCaller
+from vmaf.core.feature_extractor import VmafexecFeatureExtractorMixin, FeatureExtractor
+
+
+class PsnrhvsFeatureExtractor(VmafexecFeatureExtractorMixin, FeatureExtractor):
+
+    TYPE = 'PSNRHVS_feature'
+    VERSION = "1.0"
+
+    ATOM_FEATURES = ['psnr_hvs', 'psnr_hvs_y', 'psnr_hvs_cb', 'psnr_hvs_cr']
+
+    ATOM_FEATURES_TO_VMAFEXEC_KEY_DICT = {
+        'psnr_hvs': 'psnr_hvs',
+        'psnr_hvs_y': 'psnr_hvs_y',
+        'psnr_hvs_cb': 'psnr_hvs_cb',
+        'psnr_hvs_cr': 'psnr_hvs_cr',
+    }
+
+    def _generate_result(self, asset):
+        # routine to call the command-line executable and generate quality
+        # scores in the log file.
+
+        quality_width, quality_height = asset.quality_width_height
+        log_file_path = self._get_log_file_path(asset)
+
+        yuv_type=self._get_workfile_yuv_type(asset)
+        ref_path=asset.ref_procfile_path
+        dis_path=asset.dis_procfile_path
+        w=quality_width
+        h=quality_height
+        logger = self.logger
+
+        ExternalProgramCaller.call_vmafexec_single_feature('psnr_hvs', yuv_type, ref_path, dis_path, w, h,
+                                                           log_file_path, logger, options=self.optional_dict)