diff --git a/bob/rppg/cvpr14/script/extract_face_and_bg_signals.py b/bob/rppg/cvpr14/script/extract_face_and_bg_signals.py index 51f5d18c809e51008aa6db0a6377f0da811f86c3..b80106e912369843492c5ed9ddde73ad99ba884c 100644 --- a/bob/rppg/cvpr14/script/extract_face_and_bg_signals.py +++ b/bob/rppg/cvpr14/script/extract_face_and_bg_signals.py @@ -231,14 +231,15 @@ def main(user_input=None): # get the bottom face region average colors face_mask = get_mask(frame, mask_points) - face_color[i] = compute_average_colors_mask(frame, face_mask, plot) + # original algorithm: green only + face_color[i] = compute_average_colors_mask(frame, face_mask, plot)[1] else: face_color[i] = compute_average_colors_wholeface(face, plot) # get the background region average colors bg_mask = numpy.zeros((frame.shape[1], frame.shape[2]), dtype=bool) bg_mask[:100, :100] = True - bg_color[i] = compute_average_colors_mask(frame, bg_mask, plot) + bg_color[i] = compute_average_colors_mask(frame, bg_mask, plot)[1] # saves the data into an HDF5 file with a '.hdf5' extension out_facedir = os.path.dirname(output_face) diff --git a/bob/rppg/cvpr14/script/test.py b/bob/rppg/cvpr14/script/test.py index f2b594798c6fd0435a812e98fb0e2a387d8d09e8..64b4382536ef65da0f07010bf82926ece41b45f2 100644 --- a/bob/rppg/cvpr14/script/test.py +++ b/bob/rppg/cvpr14/script/test.py @@ -160,7 +160,7 @@ def test_compute_average_color(): image[1, :, :] = 128 from bob.rppg.cvpr14.extract_utils import compute_average_colors_mask - mean_green = compute_average_colors_mask(image, mask) + mean_green = compute_average_colors_mask(image, mask)[1] assert mean_green == 128 def test_rectify_illumination(): diff --git a/bob/rppg/cvpr14/script/video2skin.py b/bob/rppg/cvpr14/script/video2skin.py index 3a951e06c004e3018a6a30d05dae11ccb9930a59..26cdcbd245e1ea52a6ef5c5f1659ab6189efd2d9 100644 --- a/bob/rppg/cvpr14/script/video2skin.py +++ b/bob/rppg/cvpr14/script/video2skin.py @@ -173,7 +173,8 @@ def main(user_input=None): pyplot.show() if numpy.count_nonzero(skin_mask) != 0: - skin_colors[i] = compute_average_colors_mask(face, skin_mask) + # green only + skin_colors[i] = compute_average_colors_mask(face, skin_mask)[1] else: logger.warn("No skin pixels detected in frame {0}, using previous value".format(i)) if i == 0: