Merge branch 'replay-attack' into 'master'

Some fixes to allow vulnerability tests with replay-attack and replay-mobile database

See merge request !86

bob/bio/face/config/database/replay.py → bob/bio/face/config/database/replay_licit.py

@@ -7,18 +7,14 @@ from bob.extension import rc
 
 replay_attack_directory = rc["bob.db.replay.directory"]
 
-replay_licit = DatabaseConnector(
+# Licit
+database = DatabaseConnector(
     ReplayBioDatabase(
         original_directory=replay_attack_directory,
         original_extension=".mov",
         protocol="grandtest-licit",
-    )
+    ),
+    annotation_type="bounding-box",
+    fixed_positions=None,
 )
 
-replay_spoof = DatabaseConnector(
-    ReplayBioDatabase(
-        original_directory=replay_attack_directory,
-        original_extension=".mov",
-        protocol="grandtest-spoof",
-    )
-)

bob/bio/face/config/database/replay_spoof.py

+#!/usr/bin/env python
+
+from bob.bio.face.database import ReplayBioDatabase
+from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector
+from bob.extension import rc
+
+
+replay_attack_directory = rc["bob.db.replay.directory"]
+
+database = DatabaseConnector(
+    ReplayBioDatabase(
+        original_directory=replay_attack_directory,
+        original_extension=".mov",
+        protocol="grandtest-spoof",
+    ),
+    annotation_type="bounding-box",
+    fixed_positions=None,
+    # Only compare with spoofs from the same target identity
+    allow_scoring_with_all_biometric_references=False,
+)
+

bob/bio/face/config/database/replaymobile.py → bob/bio/face/config/database/replaymobile_licit.py

@@ -7,18 +7,12 @@ from bob.extension import rc
 
 replay_mobile_directory = rc["bob.db.replay_mobile.directory"]
 
-replaymobile_licit = DatabaseConnector(
+database = DatabaseConnector(
     ReplayMobileBioDatabase(
         original_directory=replay_mobile_directory,
         original_extension=".mov",
         protocol="grandtest-licit",
-    )
-)
-
-replaymobile_spoof = DatabaseConnector(
-    ReplayMobileBioDatabase(
-        original_directory=replay_mobile_directory,
-        original_extension=".mov",
-        protocol="grandtest-spoof",
-    )
+    ),
+    annotation_type="bounding-box",
+    fixed_positions=None,
 )

bob/bio/face/config/database/replaymobile_spoof.py

+#!/usr/bin/env python
+
+from bob.bio.face.database import ReplayMobileBioDatabase
+from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector
+from bob.extension import rc
+
+
+replay_mobile_directory = rc["bob.db.replay_mobile.directory"]
+
+database = DatabaseConnector(
+    ReplayMobileBioDatabase(
+        original_directory=replay_mobile_directory,
+        original_extension=".mov",
+        protocol="grandtest-spoof",
+    ),
+    annotation_type="bounding-box",
+    fixed_positions=None,
+    # Only compare with spoofs from the same target identity
+    allow_scoring_with_all_biometric_references=False,
+)