diff --git a/facemovie/Facemoviefier.py b/Facemoviefier.py similarity index 100% rename from facemovie/Facemoviefier.py rename to Facemoviefier.py diff --git a/README.markdown b/README.markdown index e081944..57a2665 100644 --- a/README.markdown +++ b/README.markdown @@ -1,7 +1,7 @@ -#Take one picture of yourself a day, automatically generate a movie! +#[Take one picture of yourself a day, automatically generate a movie!](http://jlengrand.github.com/FaceMovie/) -**[FaceMovie](http://www.youtube.com/watch?v=JueOY7EtXrQ)** is a simple project that aims at helping you create videos of yourself over time, using photos as input. +**[FaceMovie](http://www.youtube.com/watch?v=9ZpKnSjvmXo)** is a simple project that aims at helping you create videos of yourself over time, using photos as input. Simply take several pictures of yourself in the same position, and decide when to compile everything into a video. Just indicate the location of your pictures, Facemovie does everything else for you. I see a growing interest for projects where people take one picture of themselves a day for several months (years ?) and compile it into a [video](http://www.youtube.com/watch?v=6B26asyGKDo). @@ -10,8 +10,6 @@ The main difference with everyday is that Facemovie searches automatically for f Due to its general implementation, FaceMovie may be used for faces, but also profiles (for projects showing [women along pregnancy for example](http://www.youtube.com/watch?v=CG_KArKYTq4) or full body([for people workouting](http://www.youtube.com/watch?v=02Pzfv7JV48)). The only limitation comes from you ! -**[You can check out an example here.](http://www.youtube.com/watch?v=2pUHK7Sf23I)**. - ## Installation diff --git a/facemovie/FaceParams.py b/facemovie/FaceParams.py index 8cc3589..1593abd 100644 --- a/facemovie/FaceParams.py +++ b/facemovie/FaceParams.py @@ -9,7 +9,7 @@ import cv import os -from facemovie import training_types +import training_types class FaceParams(object): ''' diff --git a/facemovie/Facemovie.py b/facemovie/Facemovie.py index 5a41707..664eef2 100644 --- a/facemovie/Facemovie.py +++ b/facemovie/Facemovie.py @@ -14,8 +14,8 @@ import sys import cv -from facemovie.lib import exif -from facemovie import Guy +from lib import exif +import Guy class FaceMovie(object): ''' diff --git a/facemovie/haarcascades/__init__.py b/haarcascades/__init__.py similarity index 100% rename from facemovie/haarcascades/__init__.py rename to haarcascades/__init__.py diff --git a/facemovie/haarcascades/haarcascade_eye.xml b/haarcascades/haarcascade_eye.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_eye.xml rename to haarcascades/haarcascade_eye.xml diff --git a/facemovie/haarcascades/haarcascade_eye_tree_eyeglasses.xml b/haarcascades/haarcascade_eye_tree_eyeglasses.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_eye_tree_eyeglasses.xml rename to haarcascades/haarcascade_eye_tree_eyeglasses.xml diff --git a/facemovie/haarcascades/haarcascade_frontalface_alt.xml b/haarcascades/haarcascade_frontalface_alt.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_frontalface_alt.xml rename to haarcascades/haarcascade_frontalface_alt.xml diff --git a/facemovie/haarcascades/haarcascade_frontalface_alt2.xml b/haarcascades/haarcascade_frontalface_alt2.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_frontalface_alt2.xml rename to haarcascades/haarcascade_frontalface_alt2.xml diff --git a/facemovie/haarcascades/haarcascade_frontalface_alt_tree.xml b/haarcascades/haarcascade_frontalface_alt_tree.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_frontalface_alt_tree.xml rename to haarcascades/haarcascade_frontalface_alt_tree.xml diff --git a/facemovie/haarcascades/haarcascade_frontalface_default.xml b/haarcascades/haarcascade_frontalface_default.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_frontalface_default.xml rename to haarcascades/haarcascade_frontalface_default.xml diff --git a/facemovie/haarcascades/haarcascade_fullbody.xml b/haarcascades/haarcascade_fullbody.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_fullbody.xml rename to haarcascades/haarcascade_fullbody.xml diff --git a/facemovie/haarcascades/haarcascade_lefteye_2splits.xml b/haarcascades/haarcascade_lefteye_2splits.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_lefteye_2splits.xml rename to haarcascades/haarcascade_lefteye_2splits.xml diff --git a/facemovie/haarcascades/haarcascade_lowerbody.xml b/haarcascades/haarcascade_lowerbody.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_lowerbody.xml rename to haarcascades/haarcascade_lowerbody.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_eyepair_big.xml b/haarcascades/haarcascade_mcs_eyepair_big.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_eyepair_big.xml rename to haarcascades/haarcascade_mcs_eyepair_big.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_eyepair_small.xml b/haarcascades/haarcascade_mcs_eyepair_small.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_eyepair_small.xml rename to haarcascades/haarcascade_mcs_eyepair_small.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_leftear.xml b/haarcascades/haarcascade_mcs_leftear.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_leftear.xml rename to haarcascades/haarcascade_mcs_leftear.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_lefteye.xml b/haarcascades/haarcascade_mcs_lefteye.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_lefteye.xml rename to haarcascades/haarcascade_mcs_lefteye.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_mouth.xml b/haarcascades/haarcascade_mcs_mouth.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_mouth.xml rename to haarcascades/haarcascade_mcs_mouth.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_nose.xml b/haarcascades/haarcascade_mcs_nose.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_nose.xml rename to haarcascades/haarcascade_mcs_nose.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_rightear.xml b/haarcascades/haarcascade_mcs_rightear.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_rightear.xml rename to haarcascades/haarcascade_mcs_rightear.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_righteye.xml b/haarcascades/haarcascade_mcs_righteye.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_righteye.xml rename to haarcascades/haarcascade_mcs_righteye.xml diff --git a/facemovie/haarcascades/haarcascade_mcs_upperbody.xml b/haarcascades/haarcascade_mcs_upperbody.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_mcs_upperbody.xml rename to haarcascades/haarcascade_mcs_upperbody.xml diff --git a/facemovie/haarcascades/haarcascade_profileface.xml b/haarcascades/haarcascade_profileface.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_profileface.xml rename to haarcascades/haarcascade_profileface.xml diff --git a/facemovie/haarcascades/haarcascade_righteye_2splits.xml b/haarcascades/haarcascade_righteye_2splits.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_righteye_2splits.xml rename to haarcascades/haarcascade_righteye_2splits.xml diff --git a/facemovie/haarcascades/haarcascade_upperbody.xml b/haarcascades/haarcascade_upperbody.xml similarity index 100% rename from facemovie/haarcascades/haarcascade_upperbody.xml rename to haarcascades/haarcascade_upperbody.xml diff --git a/run.sh b/run.sh index 39c9391..f40fedc 100755 --- a/run.sh +++ b/run.sh @@ -2,8 +2,8 @@ echo "Running FaceMovie from Script !" -ROOT="./facemovie" -IN_DATA="data/input/Aurelie" +ROOT="." +IN_DATA="data/input/samples" OUT_DATA="data/output" -python ${ROOT}/Facemoviefier.py -r $ROOT -i $IN_DATA -o $OUT_DATA -t i +python ${ROOT}/Facemoviefier.py -r $ROOT -i $IN_DATA -o $OUT_DATA diff --git a/run_windows.sh b/run_windows.sh deleted file mode 100644 index a0e232f..0000000 --- a/run_windows.sh +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh - -## Used through bash using git bash - -echo "Running FaceMovie from Script !" - -ROOT="./dist" -IN_DATA="data/input/sample" -OUT_DATA="data/output" - -${ROOT}/Facemoviefier.exe -r $ROOT -i $IN_DATA -o $OUT_DATA diff --git a/setup.py b/setup.py index 5442336..abf1749 100644 --- a/setup.py +++ b/setup.py @@ -48,11 +48,11 @@ setup( version = "0.9", author = "Julien Lengrand-Lambert", author_email = "jlengrand@gmail.com", - description = ("An application aiming at creating a video of faces for people taking 'one picture a day' of themselves"), + description = ("Take one picture of yourself a day, automatically generate a movie!"), license = "BSD License", keywords = "image_processing computer_vision one_picture_a_day photography", - url = "https://github.com/jlengrand/FaceMovie", - download_url = "https://github.com/jlengrand/FaceMovie", # FIXME : To be updated + url = "http://jlengrand.github.com/FaceMovie/", + download_url = "http://jlengrand.github.com/FaceMovie/", # FIXME : To be updated packages=['facemovie', 'facemovie.lib', 'facemovie.haarcascades'], long_description=read('README.rst'), classifiers=[ @@ -68,6 +68,6 @@ setup( data_files = haar_files, options = {'py2exe': {'bundle_files': 1, # 3 dont bundle, 2 bundle but python interpreter, 1 bundle everything 'includes': ['numpy'] } }, - console=['facemovie/Facemoviefier.py'], + console=['Facemoviefier.py'], zipfile = None, ) \ No newline at end of file