From eb69ee6001cc5d7bc6ac8f113aaeb88cb308b373 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 4 Dec 2017 18:06:59 +0100
Subject: [PATCH] use bob.extension.rc instead of None
---
bob/pad/face/database/replay.py | 7 +++----
bob/pad/face/database/replay_mobile.py | 7 ++++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bob/pad/face/database/replay.py b/bob/pad/face/database/replay.py
index b5ef5061..e144511e 100644
--- a/bob/pad/face/database/replay.py
+++ b/bob/pad/face/database/replay.py
@@ -1,12 +1,11 @@
#!/usr/bin/env python2
# -*- coding: utf-8 -*-
-
# Used in ReplayMobilePadFile class
-from bob.bio.video import FrameSelector, FrameContainer
from bob.pad.base.database import PadDatabase
from bob.pad.face.database import VideoPadFile # Used in ReplayPadFile class
from bob.pad.face.utils import frames, number_of_frames
+from bob.extension import rc
class ReplayPadFile(VideoPadFile):
@@ -58,8 +57,8 @@ class ReplayPadDatabase(PadDatabase):
self,
# grandtest is the default protocol for this database
protocol='grandtest',
- original_directory=None,
- original_extension=None,
+ original_directory=rc['bob.db.replay.directory'],
+ original_extension='.mov',
**kwargs):
"""
Parameters
diff --git a/bob/pad/face/database/replay_mobile.py b/bob/pad/face/database/replay_mobile.py
index e32b975a..ce56b280 100644
--- a/bob/pad/face/database/replay_mobile.py
+++ b/bob/pad/face/database/replay_mobile.py
@@ -7,6 +7,7 @@ from bob.pad.base.database import PadDatabase
from bob.pad.face.database import VideoPadFile
from bob.pad.face.utils import frames, number_of_frames
import numpy
+from bob.extension import rc
# documentation imports
import bob.bio.video
@@ -89,8 +90,8 @@ class ReplayMobilePadDatabase(PadDatabase):
self,
# grandtest is the default protocol for this database
protocol='grandtest',
- original_directory=None,
- original_extension=None,
+ original_directory=rc['bob.db.replaymobile.directory'],
+ original_extension='.mov',
**kwargs):
"""
Parameters
@@ -251,7 +252,7 @@ class ReplayMobilePadDatabase(PadDatabase):
vfilename = padfile.make_path(
directory=self.original_directory,
extension=self.original_extension)
- is_not_tablet = not padfile._f.is_tablet()
+ is_not_tablet = not padfile.f.is_tablet()
for frame in frames(vfilename):
frame = numpy.rollaxis(frame, 2, 1)
if is_not_tablet:
--
GitLab