Skip to content
Snippets Groups Projects
Commit b86bb700 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'frames' into 'master'

use bob.extension.rc instead of None

See merge request !35
parents f42b7f3e eb69ee60
No related branches found
No related tags found
1 merge request!35use bob.extension.rc instead of None
Pipeline #
#!/usr/bin/env python2 #!/usr/bin/env python2
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Used in ReplayMobilePadFile class # Used in ReplayMobilePadFile class
from bob.bio.video import FrameSelector, FrameContainer
from bob.pad.base.database import PadDatabase from bob.pad.base.database import PadDatabase
from bob.pad.face.database import VideoPadFile # Used in ReplayPadFile class from bob.pad.face.database import VideoPadFile # Used in ReplayPadFile class
from bob.pad.face.utils import frames, number_of_frames from bob.pad.face.utils import frames, number_of_frames
from bob.extension import rc
class ReplayPadFile(VideoPadFile): class ReplayPadFile(VideoPadFile):
...@@ -58,8 +57,8 @@ class ReplayPadDatabase(PadDatabase): ...@@ -58,8 +57,8 @@ class ReplayPadDatabase(PadDatabase):
self, self,
# grandtest is the default protocol for this database # grandtest is the default protocol for this database
protocol='grandtest', protocol='grandtest',
original_directory=None, original_directory=rc['bob.db.replay.directory'],
original_extension=None, original_extension='.mov',
**kwargs): **kwargs):
""" """
Parameters Parameters
......
...@@ -7,6 +7,7 @@ from bob.pad.base.database import PadDatabase ...@@ -7,6 +7,7 @@ from bob.pad.base.database import PadDatabase
from bob.pad.face.database import VideoPadFile from bob.pad.face.database import VideoPadFile
from bob.pad.face.utils import frames, number_of_frames from bob.pad.face.utils import frames, number_of_frames
import numpy import numpy
from bob.extension import rc
# documentation imports # documentation imports
import bob.bio.video import bob.bio.video
...@@ -89,8 +90,8 @@ class ReplayMobilePadDatabase(PadDatabase): ...@@ -89,8 +90,8 @@ class ReplayMobilePadDatabase(PadDatabase):
self, self,
# grandtest is the default protocol for this database # grandtest is the default protocol for this database
protocol='grandtest', protocol='grandtest',
original_directory=None, original_directory=rc['bob.db.replaymobile.directory'],
original_extension=None, original_extension='.mov',
**kwargs): **kwargs):
""" """
Parameters Parameters
...@@ -251,7 +252,7 @@ class ReplayMobilePadDatabase(PadDatabase): ...@@ -251,7 +252,7 @@ class ReplayMobilePadDatabase(PadDatabase):
vfilename = padfile.make_path( vfilename = padfile.make_path(
directory=self.original_directory, directory=self.original_directory,
extension=self.original_extension) 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): for frame in frames(vfilename):
frame = numpy.rollaxis(frame, 2, 1) frame = numpy.rollaxis(frame, 2, 1)
if is_not_tablet: if is_not_tablet:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment