Merge pull request #7 from WillBrennan/develop

Develop

.travis.yml

 language: python
 
-before_script:
-  - pip install -U pytest
-
 matrix:
   include:
-    - python: "2.6"
     - python: "2.7"
-    - python: "3.2"
-    - python: "3.3"
-    - python: "3.4"
-    - python: "3.5"
-    - python: "3.5-dev"
-    - python: "3.6"
-    - python: "3.6-dev"
-    - python: "3.7"
-    - python: "nightly"
-  allow_failures:
-    - python: "3.2"
-    - python: "3.5-dev"
-    - python: "3.6"
-    - python: "3.6-dev"
-    - python: "3.7"
-    - python: "nightly"
 
-install: "pip install -r requirements.txt"
+before_install:
+    # update aptitude
+    - sudo apt-get update
+    - sudo apt-get install -y python-opencv
+
+    # help python importing cv and/or cv2
+    - export PYTHONPATH=$PYTHONPATH:/usr/lib/pymodules/python$TRAVIS_PYTHON_VERSION
+
+    # verify all requirements were met
+    - INSTALLDIR=$(python -c "import os; import numpy; import cv; import cv2; print(os.path.dirname(cv2.__file__))")
+
+install:
+    - make install
+
 script:
-  - uname -a
-  - pytest --version
+    - make test
\ No newline at end of file
-  - pytest
\ No newline at end of file

FromFile.py

@@ -2,14 +2,11 @@
 # -*- coding: utf-8 -*-
 __author__ = 'Will Brennan'
 
-# Built-in Modules
 import argparse
 import logging
 import os
-
 import cv2
-
-from SkinDetector import SkinDetector, scripts
+import skin_detector
 
 logger = logging.getLogger('main')
 
@@ -50,17 +47,15 @@ if __name__ == '__main__':
         logging.basicConfig(level=logging.INFO)
     logger = logging.getLogger("main")
 
-    detector = SkinDetector(thresh=args.thresh, debug=args.debug)
-
     for image_arg in args.image_paths:
         for image_path in find_images(image_arg):
             logging.info("loading image from {0}".format(image_path))
             img_col = cv2.imread(image_path, 1)
 
-            img_msk = detector.process(img_col)
+            img_msk = skin_detector.process(img_col)
 
             if args.display:
-                scripts.display('img_col', img_col)
-                scripts.display('img_msk', img_msk)
-                scripts.display('img_skn', cv2.bitwise_and(img_col, img_col, mask=img_msk))
+                skin_detector.scripts.display('img_col', img_col)
+                skin_detector.scripts.display('img_msk', img_msk)
+                skin_detector.scripts.display('img_skn', cv2.bitwise_and(img_col, img_col, mask=img_msk))
                 cv2.waitKey(0)

Makefile

+install:
+	pip install -U -r requirements.txt
+
+test:
+	python -m pytest tests/
+
+yapf:
+	find . -type f -name "*.py" | xargs yapf -i

README.md

 # SkinDetector
+[![Build Status](https://travis-ci.org/WillBrennan/SkinDetector.svg?branch=master)](https://travis-ci.org/WillBrennan/SkinDetector)
+
 This is a high-speed python based skin detection system using OpenCV, it is done using adaptive thresholding, reference
 papers can be found below. It is designed for processing VGA sized images in real time for Gesture Control.
 
@@ -10,20 +12,19 @@ However to install the rest of the project dependencies and run the demo script
 ```bash
 # Clone the repo
 git clone https://github.com/WillBrennan/SkinDetector && cd SkinDetector
-# Install requirements
-python setup.py install
-# Run the bot
+make install
 python FromFile.py <directory of images> --display
 ```
+
 ## Usage
 
 ```python
 import cv2
-import SkinDetector
+import skin_detector
 
 img_path = raw_input("Please Enter Image Path")
 image = cv2.imread(img_path)
-mask = SkinDetector.process(image)
+mask = skin_detector.process(image)
 cv2.imshow("input", image)
 cv2.imshow("mask", mask)
 cv2.waitKey(0)

SkinDetector/SkinDetector.py

-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-__author__ = 'Will Brennan'
-
-# Built-in Modules
-import logging
-import time
-
-import cv2
-import numpy
-
-import scripts
-
-logger = logging.getLogger('main')
-
-
-class SkinDetector(object):
-    def __init__(self, thresh=0.5, debug=False):
-        self.debug = debug
-        self.thresh = thresh
-        self.mask = None
-        logger.debug('SkinDetector initialised')
-
-    @staticmethod
-    def assert_image(img, grey=False):
-        logger.debug('Applying assertions...')
-        depth = 3
-        if grey:
-            depth = 2
-        assert isinstance(img, numpy.ndarray), 'image must be a numpy array'
-        assert len(img.shape) == depth, 'skin detection can only work on color images'
-        assert img.size > 100, 'seriously... you thought this would work?'
-
-    def get_mask_hsv(self, img):
-        logger.debug('Applying hsv threshold')
-        self.assert_image(img)
-        lower_thresh = numpy.array([0, 50, 0], dtype=numpy.uint8)
-        upper_thresh = numpy.array([120, 150, 255], dtype=numpy.uint8)
-        img_hsv = cv2.cvtColor(img, cv2.COLOR_RGB2HSV)
-        msk_hsv = cv2.inRange(img_hsv, lower_thresh, upper_thresh)
-        if self.debug:
-            scripts.display('input', img)
-            scripts.display('mask_hsv', msk_hsv)
-        self.add_mask(msk_hsv)
-
-    def get_mask_rgb(self, img):
-        logger.debug('Applying rgb thresholds')
-        lower_thresh = numpy.array([45, 52, 108], dtype=numpy.uint8)
-        upper_thresh = numpy.array([255, 255, 255], dtype=numpy.uint8)
-        mask_a = cv2.inRange(img, lower_thresh, upper_thresh)
-        mask_b = 255 * ((img[:, :, 2] - img[:, :, 1]) / 20)
-        logger.debug('mask_b unique: {0}'.format(numpy.unique(mask_b)))
-        mask_c = 255 * ((numpy.max(img, axis=2) - numpy.min(img, axis=2)) / 20)
-        logger.debug('mask_d unique: {0}'.format(numpy.unique(mask_c)))
-        msk_rgb = cv2.bitwise_and(mask_a, mask_b)
-        msk_rgb = cv2.bitwise_and(mask_c, msk_rgb)
-        if self.debug:
-            scripts.display('input', img)
-            scripts.display('mask_rgb', msk_rgb)
-        self.add_mask(msk_rgb)
-
-    def get_mask_ycrcb(self, img):
-        self.assert_image(img)
-        lower_thresh = numpy.array([90, 100, 130], dtype=numpy.uint8)
-        upper_thresh = numpy.array([230, 120, 180], dtype=numpy.uint8)
-        img_ycrcb = cv2.cvtColor(img, cv2.COLOR_RGB2YCR_CB)
-        msk_ycrcb = cv2.inRange(img_ycrcb, lower_thresh, upper_thresh)
-        if self.debug:
-            scripts.display('input', img)
-            scripts.display('mask_ycrcb', msk_ycrcb)
-        self.add_mask(msk_ycrcb)
-
-    def grab_cut_mask(self, img_col, mask):
-        kernel = numpy.ones((50, 50), numpy.float32) / (50 * 50)
-        dst = cv2.filter2D(mask, -1, kernel)
-        dst[dst != 0] = 255
-        free = numpy.array(cv2.bitwise_not(dst), dtype=numpy.uint8)
-        if self.debug:
-            scripts.display('not skin', free)
-            scripts.display('grabcut input', mask)
-        grab_mask = numpy.zeros(mask.shape, dtype=numpy.uint8)
-        grab_mask[:, :] = 2
-        grab_mask[mask == 255] = 1
-        grab_mask[free == 255] = 0
-        if numpy.unique(grab_mask).tolist() == [0, 1]:
-            logger.debug('conducting grabcut')
-            bgdModel = numpy.zeros((1, 65), numpy.float64)
-            fgdModel = numpy.zeros((1, 65), numpy.float64)
-            if img_col.size != 0:
-                mask, bgdModel, fgdModel = cv2.grabCut(img_col, grab_mask, None, bgdModel, fgdModel, 5,
-                                                       cv2.GC_INIT_WITH_MASK)
-                mask = numpy.where((mask == 2) | (mask == 0), 0, 1).astype('uint8')
-            else:
-                logger.warning('img_col is empty')
-        return mask
-
-    @staticmethod
-    def closing(msk):
-        assert isinstance(msk, numpy.ndarray), 'msk must be a numpy array'
-        assert msk.ndim == 2, 'msk must be a greyscale image'
-        kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (5, 5))
-        msk = cv2.morphologyEx(msk, cv2.MORPH_CLOSE, kernel)
-        kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (3, 3))
-        msk = cv2.morphologyEx(msk, cv2.MORPH_OPEN, kernel, iterations=2)
-        return msk
-
-    def process(self, img):
-        logger.debug('Initialising process')
-        dt = time.time()
-        self.assert_image(img)
-        logger.debug('Generating mean-color image')
-        #img = mean_color.img_mean(img)
-        logger.debug('Conducting thresholding')
-        self.n_mask = 0
-        self.mask = numpy.zeros(img.shape[:2], dtype=numpy.uint8)
-        self.get_mask_hsv(img)
-        self.get_mask_rgb(img)
-        self.get_mask_ycrcb(img)
-        logger.debug('Thresholding sum of masks')
-        self.threshold(self.thresh)
-        if self.debug:
-            scripts.display('skin_mask', self.mask)
-            scripts.display('input_img', img)
-        dt = round(time.time() - dt, 2)
-        hz = round(1 / dt, 2)
-        logger.debug('Conducted processing in {0}s ({1}Hz)'.format(dt, hz))
-        self.mask = self.closing(self.mask)
-        self.mask = self.grab_cut_mask(img, self.mask)
-        return self.mask
-
-    def add_mask(self, img):
-        logger.debug('normalising mask')
-        self.assert_image(img, grey=True)
-        img[img < 128] = 0
-        img[img >= 128] = 1
-        logger.debug('normalisation complete')
-        logger.debug('adding mask to total mask')
-        self.mask += img
-        self.n_mask += 1
-        logger.debug('add mask complete')
-
-    def threshold(self, threshold):
-        assert isinstance(threshold, float), 'threshold must be a float (current type - {0})'.format(type(threshold))
-        assert 0 <= threshold <= 1, 'threshold must be between 0 & 1 (current value - {0})'.format(threshold)
-        assert self.n_mask > 0, 'Number of masks must be greater than 0 [n_mask ({0}) = {1}]'.format(
-            type(self.n_mask), self.n_mask)
-        logger.debug('Threshold Value - {0}%'.format(int(100 * threshold)))
-        logger.debug('Number of Masks - {0}'.format(self.n_mask))
-        self.mask /= self.n_mask
-        self.mask[self.mask < threshold] = 0
-        self.mask[self.mask >= threshold] = 255
-        logger.debug('{0}% of the image is skin'.format(int((100.0 / 255.0) * numpy.sum(self.mask) / (self.mask.size))))
-        return self.mask

WebCam.py

@@ -2,13 +2,10 @@
 # -*- coding: utf-8 -*-
 __author__ = 'Will Brennan'
 
-# Built-in Modules
 import argparse
 import logging
-
 import cv2
-
-from SkinDetector import SkinDetector, scripts
+import skin_detector
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description=__doc__)
@@ -22,18 +19,16 @@ if __name__ == '__main__':
         logging.basicConfig(level=logging.INFO)
     logger = logging.getLogger("main")
 
-    detector = SkinDetector(thresh=args.thresh, debug=args.debug)
-
     cam = cv2.VideoCapture(0)
     logging.info("press any key to exit")
 
     while True:
         ret, img_col = cam.read()
-        img_msk = detector.process(img_col)
+        img_msk = skin_detector.process(img_col)
 
-        scripts.display('img_col', img_col)
-        scripts.display('img_msk', img_msk)
-        scripts.display('img_skn', cv2.bitwise_and(img_col, img_col, mask=img_msk))
+        skin_detector.scripts.display('img_col', img_col)
+        skin_detector.scripts.display('img_msk', img_msk)
+        skin_detector.scripts.display('img_skn', cv2.bitwise_and(img_col, img_col, mask=img_msk))
 
         waitkey = cv2.waitKey(5)
         if waitkey != -1:

setup.py

@@ -14,12 +14,8 @@ setup(
     license='GPL',
     install_requires=["numpy"], )
 
-
-
-
 from setuptools import setup, find_packages
 
-
 with open('README.rst') as f:
     readme = f.read()
 
@@ -38,5 +34,4 @@ setup(
     url='https://github.com/WillBrennan/SkinDetector',
     license=license,
     install_requires=required,
-    packages=find_packages(exclude=('tests', 'docs'))
-)
+    packages=find_packages(exclude=('tests', 'docs')))

SkinDetector/__init__.py → skin_detector/__init__.py

@@ -2,7 +2,9 @@
 # -*- coding: utf-8 -*-
 __author__ = 'willbrennan'
 
-from SkinDetector import SkinDetector
+from skin_detector import *
 from scripts import display
 
-__all__ = ["SkinDetector", "display"]
+__all__ = [
\ No newline at end of file
+    "process", "display", "get_hsv_mask", "get_rgb_mask", "get_ycrcb_mask", "grab_cut_mask", "grab_cut_mask", "closing"
+]

skin_detector/skin_detector.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+__author__ = 'Will Brennan'
+
+# Built-in Modules
+import logging
+import cv2
+import numpy
+import scripts
+
+logger = logging.getLogger('main')
+
+
+def get_hsv_mask(img, debug=False):
+    assert isinstance(img, numpy.ndarray), 'image must be a numpy array'
+    assert img.ndim == 3, 'skin detection can only work on color images'
+    logger.debug('getting hsv mask')
+
+    lower_thresh = numpy.array([0, 50, 0], dtype=numpy.uint8)
+    upper_thresh = numpy.array([120, 150, 255], dtype=numpy.uint8)
+    img_hsv = cv2.cvtColor(img, cv2.COLOR_RGB2HSV)
+    msk_hsv = cv2.inRange(img_hsv, lower_thresh, upper_thresh)
+
+    msk_hsv[msk_hsv < 128] = 0
+    msk_hsv[msk_hsv >= 128] = 1
+
+    if debug:
+        scripts.display('input', img)
+        scripts.display('mask_hsv', msk_hsv)
+
+    return msk_hsv.astype(float)
+
+
+def get_rgb_mask(img, debug=False):
+    assert isinstance(img, numpy.ndarray), 'image must be a numpy array'
+    assert img.ndim == 3, 'skin detection can only work on color images'
+    logger.debug('getting rgb mask')
+
+    lower_thresh = numpy.array([45, 52, 108], dtype=numpy.uint8)
+    upper_thresh = numpy.array([255, 255, 255], dtype=numpy.uint8)
+
+    mask_a = cv2.inRange(img, lower_thresh, upper_thresh)
+    mask_b = 255 * ((img[:, :, 2] - img[:, :, 1]) / 20)
+    mask_c = 255 * ((numpy.max(img, axis=2) - numpy.min(img, axis=2)) / 20)
+
+    msk_rgb = cv2.bitwise_and(mask_c, cv2.bitwise_and(mask_a, mask_b))
+
+    msk_rgb[msk_rgb < 128] = 0
+    msk_rgb[msk_rgb >= 128] = 1
+
+    if debug:
+        scripts.display('input', img)
+        scripts.display('mask_rgb', msk_rgb)
+
+    return msk_rgb.astype(float)
+
+
+def get_ycrcb_mask(img, debug=False):
+    assert isinstance(img, numpy.ndarray), 'image must be a numpy array'
+    assert img.ndim == 3, 'skin detection can only work on color images'
+    logger.debug('getting ycrcb mask')
+
+    lower_thresh = numpy.array([90, 100, 130], dtype=numpy.uint8)
+    upper_thresh = numpy.array([230, 120, 180], dtype=numpy.uint8)
+
+    img_ycrcb = cv2.cvtColor(img, cv2.COLOR_RGB2YCR_CB)
+    msk_ycrcb = cv2.inRange(img_ycrcb, lower_thresh, upper_thresh)
+
+    msk_ycrcb[msk_ycrcb < 128] = 0
+    msk_ycrcb[msk_ycrcb >= 128] = 1
+
+    if debug:
+        scripts.display('input', img)
+        scripts.display('mask_ycrcb', msk_ycrcb)
+
+    return msk_ycrcb.astype(float)
+
+
+def grab_cut_mask(img_col, mask, debug=False):
+    assert isinstance(img_col, numpy.ndarray), 'image must be a numpy array'
+    assert isinstance(mask, numpy.ndarray), 'mask must be a numpy array'
+    assert img_col.ndim == 3, 'skin detection can only work on color images'
+    assert mask.ndim == 2, 'mask must be 2D'
+
+    kernel = numpy.ones((50, 50), numpy.float32) / (50 * 50)
+    dst = cv2.filter2D(mask, -1, kernel)
+    dst[dst != 0] = 255
+    free = numpy.array(cv2.bitwise_not(dst), dtype=numpy.uint8)
+
+    if debug:
+        scripts.display('not skin', free)
+        scripts.display('grabcut input', mask)
+
+    grab_mask = numpy.zeros(mask.shape, dtype=numpy.uint8)
+    grab_mask[:, :] = 2
+    grab_mask[mask == 255] = 1
+    grab_mask[free == 255] = 0
+
+    if numpy.unique(grab_mask).tolist() == [0, 1]:
+        logger.debug('conducting grabcut')
+        bgdModel = numpy.zeros((1, 65), numpy.float64)
+        fgdModel = numpy.zeros((1, 65), numpy.float64)
+
+        if img_col.size != 0:
+            mask, bgdModel, fgdModel = cv2.grabCut(img_col, grab_mask, None, bgdModel, fgdModel, 5,
+                                                   cv2.GC_INIT_WITH_MASK)
+            mask = numpy.where((mask == 2) | (mask == 0), 0, 1).astype(numpy.uint8)
+        else:
+            logger.warning('img_col is empty')
+
+    return mask
+
+
+def closing(mask):
+    assert isinstance(mask, numpy.ndarray), 'mask must be a numpy array'
+    assert mask.ndim == 2, 'mask must be a greyscale image'
+    logger.debug("closing mask of shape {0}".format(mask.shape))
+
+    kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (5, 5))
+    mask = cv2.morphologyEx(mask, cv2.MORPH_CLOSE, kernel)
+    kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (3, 3))
+    mask = cv2.morphologyEx(mask, cv2.MORPH_OPEN, kernel, iterations=2)
+
+    return mask
+
+
+def process(img, thresh=0.5, debug=False):
+    assert isinstance(img, numpy.ndarray), 'image must be a numpy array'
+    assert img.ndim == 3, 'skin detection can only work on color images'
+    logger.debug("processing image of shape {0}".format(img.shape))
+
+    mask_hsv = get_hsv_mask(img, debug=debug)
+    mask_rgb = get_rgb_mask(img, debug=debug)
+    mask_ycrcb = get_ycrcb_mask(img, debug=debug)
+
+    n_masks = 3.0
+    mask = (mask_hsv + mask_rgb + mask_ycrcb) / n_masks
+
+    mask[mask < thresh] = 0.0
+    mask[mask >= thresh] = 255.0
+    logger.debug('{0}% of the image is skin'.format(int((100.0 / 255.0) * numpy.sum(mask) / mask.size)))
+
+    mask = mask.astype(numpy.uint8)
+
+    mask = closing(mask)
+    mask = grab_cut_mask(img, mask, debug=debug)
+
+    return mask

tests/skin_detector/test_unit.py

+import cv2
+import os
+import numpy
+import skin_detector
+
+
+def test_get_hsv_mask():
+    img_path = "tests/test_image.png"
+    img = cv2.imread(img_path)
+    mask = skin_detector.get_hsv_mask(img)
+    assert img.shape[:2] == mask.shape
+
+
+def test_get_rgb_mask():
+    img_path = "tests/test_image.png"
+    img = cv2.imread(img_path)
+    mask = skin_detector.get_rgb_mask(img)
+    assert img.shape[:2] == mask.shape
+
+
+def test_get_ycrcb_mask():
+    img_path = "tests/test_image.png"
+    img = cv2.imread(img_path)
+    mask = skin_detector.get_ycrcb_mask(img)
+    assert img.shape[:2] == mask.shape
+
+
+def test_grab_cut_mask():
+    img_path = "tests/test_image.png"
+    img = cv2.imread(img_path)
+    assert True
+
+
+def test_closing():
+    img_path = "tests/test_image.png"
+    img = cv2.imread(img_path)
+    assert True
+
+
+def test_process():
+    img_path = "tests/test_image.png"
+    img = cv2.imread(img_path)
+    mask = skin_detector.process(img)
+    assert img.shape[:2] == mask.shape

tests/test_unit.py

-import unittest
-
-
-class BasicTestSuite(unittest.TestCase):
-    def test_dummy(self):
-        assert True
-
-
-if __name__ == '__main__':
-    unittest.main()