diff --git a/doc/sflphone_video/abstract.odt b/doc/sflphone_video/abstract.odt
new file mode 100644
index 0000000000000000000000000000000000000000..e9263f9cff27f087345e37418b363eba096349b0
Binary files /dev/null and b/doc/sflphone_video/abstract.odt differ
diff --git a/doc/sflphone_video/ressources.odt b/doc/sflphone_video/ressources.odt
new file mode 100644
index 0000000000000000000000000000000000000000..1c9cfed4cc410d060e1f4fc2bc4b959ccf66764b
Binary files /dev/null and b/doc/sflphone_video/ressources.odt differ
diff --git a/src/video/COPYING b/src/video/COPYING
new file mode 100644
index 0000000000000000000000000000000000000000..623b6258a134210f0b0ada106fdaab7f0370d9c5
--- /dev/null
+++ b/src/video/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/src/video/README b/src/video/README
new file mode 100644
index 0000000000000000000000000000000000000000..ee5d23dd39c550f95a4a137ab637efb402a409ac
--- /dev/null
+++ b/src/video/README
@@ -0,0 +1,23 @@
+##############################################################
+Pour compiler: faire 'make'
+gcc gui-openGL/display.c -lglut -ljpeg -o stream_video
+make clean : to remove the .o files
+##############################################################
+
+
+##############################################################
+Executable: stream_video
+
+Lit le flux video de la webcam (device video0), et l'affiche avec openGL comme une texture.
+Driver: video4linux2
+##############################################################
+
+
+################################################################
+Raccourcis clavier:
+
+'q', 'Q' ou 'echap pour quitter l'application
+pad numérique:  1 - taille initiale (de la résolution supportée par la caméra)
+		2 - double la taille d'affichage
+		3 - triple la taille d'affichage  
+####################################################################
diff --git a/src/video/abstract.odt b/src/video/abstract.odt
new file mode 100644
index 0000000000000000000000000000000000000000..e9263f9cff27f087345e37418b363eba096349b0
Binary files /dev/null and b/src/video/abstract.odt differ
diff --git a/src/video/gui-openGL/display.c b/src/video/gui-openGL/display.c
new file mode 100755
index 0000000000000000000000000000000000000000..6d456be2e52ad504b97eb41439bc0b5c6a75c815
--- /dev/null
+++ b/src/video/gui-openGL/display.c
@@ -0,0 +1,167 @@
+/*
+ *  Copyright (C) 2006-2007 Savoir-Faire Linux inc. 
+ *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <GL/gl.h>
+#include <GL/glut.h>
+#include <jpeglib.h>
+#include <jerror.h>
+
+#include "../v4l2/capture_v4l2.c"
+
+unsigned char* pix;
+camera_v4l2* camera;
+// video resolution
+int RES_X;
+int RES_Y; 
+// window size
+int WIDTH = 512;
+int HEIGHT = 512;
+// texture size
+int x_t;
+int y_t;
+
+
+/*
+ * Sets up appropriate viewport coordinates for 2D
+ */
+void reshape(int w, int h)
+{
+	glViewport(0, 0, w, h);
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0, w, h, 0, -1, 1);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+}
+
+void makeQuad(){
+
+	// centrer la video dans la fenetre
+	int x1,y1,x2,y2,x3,y3,x4,y4;
+	x1 = (WIDTH - x_t) / 2;
+	y1 = (HEIGHT - y_t) / 2;
+	x2 = x_t + x1;
+	y2 = y1;
+	x3 = x2;
+	y3 = y1 + y_t;
+	x4 = x1;	
+	y4 = y3;
+
+	glBegin(GL_QUADS);
+
+	glTexCoord3i(0,0,0);
+        glVertex3i(x1,y1,0);
+        glTexCoord3i(1,0,0);
+        glVertex3i(x2,y2,0);
+        glTexCoord3i(1,1,0);
+        glVertex3i(x3,y3,0);
+        glTexCoord3i(0,1,0);
+        glVertex3i(x4,y4,0);
+
+
+
+
+	glEnd();
+}
+
+
+/*
+ *  display callback function
+ */
+void display(void){
+	
+	pix = v4l2_grab_data(camera);
+	
+	glClear(GL_COLOR_BUFFER_BIT);
+	makeQuad();
+	glTexImage2D(GL_TEXTURE_2D,0,GL_RGB,RES_X,RES_Y,0,GL_RGB,GL_UNSIGNED_BYTE,pix);
+	glutSwapBuffers();
+
+}
+
+void keyboard(unsigned char c, int x, int y){
+	switch(c)
+	{
+	case 27:
+	case 'q':
+	case 'Q':
+		exit(1);
+		break;
+	case '1':
+		x_t = RES_X;
+		y_t = RES_Y;
+		break;
+	case '2':
+		x_t = RES_X*2;
+                y_t = RES_Y*2;
+                break;
+	case '3':
+                x_t = RES_X*3;
+                y_t = RES_Y*3;
+                break;
+	}
+}	
+
+
+void idle( void )
+{
+	glutPostRedisplay();
+}
+
+
+int main (int argc, char **argv) {
+	// init webcam
+	camera = v4l2_init_camera("/dev/video0");
+	// set video resolution
+	RES_X = camera->width;	
+	RES_Y = camera->height;	
+	// set texture resolution
+	x_t = RES_X;	
+	y_t = RES_Y;
+
+	glutInit (&argc, argv);
+	glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE) ;
+	glutInitWindowSize (WIDTH,HEIGHT);
+	glutInitWindowPosition (300,200);
+	glutCreateWindow ("SFLphone Video Prototype");
+	
+	// OpenGL texture paramaters
+	glEnable(GL_TEXTURE_2D);
+	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+	//printf("Texture initialization done...........");
+	//glTexImage2D(GL_TEXTURE_2D,0,GL_RGB,WIDTH,HEIGHT,0,GL_RGB,GL_UNSIGNED_BYTE,pix);
+
+	// Callback functions
+	glutDisplayFunc (display);	
+	glutReshapeFunc(reshape);
+	glutIdleFunc(idle);
+	glutKeyboardFunc(keyboard);	
+
+
+	glEnable(GL_DEPTH_TEST);
+
+	// main loop
+	glutMainLoop ();
+	//return 0;
+}
diff --git a/src/video/ressources.odt b/src/video/ressources.odt
new file mode 100644
index 0000000000000000000000000000000000000000..1c9cfed4cc410d060e1f4fc2bc4b959ccf66764b
Binary files /dev/null and b/src/video/ressources.odt differ
diff --git a/src/video/stream_video b/src/video/stream_video
new file mode 100755
index 0000000000000000000000000000000000000000..d3d3a8525c3a4171a6fb5c18e91e4a631778fa73
Binary files /dev/null and b/src/video/stream_video differ
diff --git a/src/video/utils/convert.c b/src/video/utils/convert.c
new file mode 100644
index 0000000000000000000000000000000000000000..14cf21ed7bde4bb2ac3276964ee28383e56c7e08
--- /dev/null
+++ b/src/video/utils/convert.c
@@ -0,0 +1,150 @@
+/*
+ *      Copyright (C) 2006-2007 Savoir-Faire Linux inc.
+ *      Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com
+ *        
+ *      This program is free software; you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation; either version 3 of the License, or
+ *      (at your option) any later version.
+ *      
+ *      This program is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *      
+ *      You should have received a copy of the GNU General Public License
+ *      along with this program; if not, write to the Free Software
+ *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/videodev.h>
+
+
+#define CLIP 320
+#define RED_NULL 128
+#define BLUE_NULL 128
+#define LUN_MUL 256
+#define RED_MUL 512
+#define BLUE_MUL 512
+
+
+#define GREEN1_MUL  (-RED_MUL/2)
+#define GREEN2_MUL  (-BLUE_MUL/6)
+#define RED_ADD     (-RED_NULL  * RED_MUL)
+#define BLUE_ADD    (-BLUE_NULL * BLUE_MUL)
+#define GREEN1_ADD  (-RED_ADD/2)
+#define GREEN2_ADD  (-BLUE_ADD/6)
+
+/* lookup tables */
+static unsigned int  ng_yuv_gray[256];
+static unsigned int  ng_yuv_red[256];
+static unsigned int  ng_yuv_blue[256];
+static unsigned int  ng_yuv_g1[256];
+static unsigned int  ng_yuv_g2[256];
+static unsigned int  ng_clip[256 + 2 * CLIP];
+
+#define GRAY(val)               ng_yuv_gray[val]
+#define RED(gray,red)           ng_clip[ CLIP + gray + ng_yuv_red[red] ]
+#define GREEN(gray,red,blue)    ng_clip[ CLIP + gray + ng_yuv_g1[red] + \
+	ng_yuv_g2[blue] ]
+#define BLUE(gray,blue)         ng_clip[ CLIP + gray + ng_yuv_blue[blue] ]
+
+#define clip(x) ( (x)<0 ? 0 : ( (x)>255 ? 255 : (x) ) )
+/******************************************************************************/
+
+void YUV2RGB_init(void)
+{
+	int i;
+
+	/* init Lookup tables */
+	for (i = 0; i < 256; i++) {
+		ng_yuv_gray[i] = i * LUN_MUL >> 8;
+		ng_yuv_red[i]  = (RED_ADD    + i * RED_MUL)    >> 8;
+		ng_yuv_blue[i] = (BLUE_ADD   + i * BLUE_MUL)   >> 8;
+		ng_yuv_g1[i]   = (GREEN1_ADD + i * GREEN1_MUL) >> 8;
+		ng_yuv_g2[i]   = (GREEN2_ADD + i * GREEN2_MUL) >> 8;
+	}
+	for (i = 0; i < CLIP; i++)
+		ng_clip[i] = 0;
+	for (; i < CLIP + 256; i++)
+		ng_clip[i] = i - CLIP;
+	for (; i < 2 * CLIP + 256; i++)
+		ng_clip[i] = 255;
+}
+
+
+void write_rgb(unsigned char **out, int Y, int U, int V)
+{
+	int R,G,B;
+	R=(76284*Y+104595*V)>>16;
+	G=(76284*Y -25625*U-53281*V)>>16;
+	B=(76284*Y+132252*U)>>16;
+
+	*(*out)=clip(R);
+	*(*out+1)=clip(G);
+	*(*out+2)=clip(B);
+	*out+=3;
+}
+
+
+void yuv420_rgb (unsigned char *out, unsigned char *in, int width, int height)
+{
+	unsigned char *u,*u1,*v,*v1;
+	int Y=0,U=0,V=0,i,j;
+
+	u=in+width*height;
+	v=u+(width*height)/4;
+
+	for(i=0;i<height;i++) {
+		u1=u;
+		v1=v;
+		for(j=0;j<width;j++) {
+			Y=(*in++)-16;
+			if((j&1)==0) {
+				U=(*u++)-128;
+				V=(*v++)-128;
+			}
+			write_rgb(&out,Y,U,V);
+		}
+		if((i&1)==0) { u=u1; v=v1; }
+	}
+}
+
+void yuyv_rgb (unsigned char *out, unsigned char *in, int width, int height)
+{
+	unsigned char *u,*u1,*v,*v1;
+	int Y=0,U=0,V=0,i,j;
+
+	u=in+1; v=in+3;
+	for(i=0;i<width*height;i++) {
+		Y=(*in)-16;
+		U=(*u)-128;
+		V=(*v)-128;
+		write_rgb(&out,Y,U,V);
+		in+=2;
+		if((i&1)==1) { u+=4; v+=4; }
+	}
+}
+
+
+void format_conversion(int format, char* in, char* out, int width, int height){
+
+	YUV2RGB_init();
+
+	switch(format){
+		case V4L2_PIX_FMT_YUV420:
+			yuv420_rgb(out,in,width,height);
+			break;
+		case V4L2_PIX_FMT_YUYV:
+                        yuyv_rgb(out,in,width,height);
+                        break;
+	}
+}
+
+
+
diff --git a/src/video/v4l2/capture_v4l2.c b/src/video/v4l2/capture_v4l2.c
new file mode 100755
index 0000000000000000000000000000000000000000..c5b8882695624da73efa743161a35c4f08c8b790
--- /dev/null
+++ b/src/video/v4l2/capture_v4l2.c
@@ -0,0 +1,197 @@
+/*
+ *  Copyright (C) 2006-2007 Savoir-Faire Linux inc.
+ *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com
+ *    
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *  
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ * 
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ **/
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <jpeglib.h>
+
+#include "capture_v4l2.h"
+#include "../utils/convert.c"
+
+#define DEVICE "/dev/video0"
+
+
+/******************************************************************/
+
+camera_v4l2* v4l2_init_camera( char* device_name ){
+
+	// initialization of the struct fields
+	camera_v4l2* webcam;
+	webcam = (camera_v4l2*)malloc(sizeof(camera_v4l2));
+
+	memset(&(webcam->cap),0,sizeof(webcam->cap));
+	memset(&(webcam->format),0,sizeof(webcam->format));
+
+	webcam->device = device_name;
+
+	printf("Checking device /dev/video0.......\n");
+	int n = query_camera(webcam);
+	webcam->addr = n;
+
+	if(n==0){	
+		printf("Failed - query_camera()\n");
+		return 0;
+	}
+
+	printf("Query webcam done....\n");
+
+	// we use the fmt.pix.sizeimage field of the v4l2_pix_format struct
+	// fmt.pix.sizeimage contains the total size of the buffer to hold a complete image, in bytes.
+	webcam->raw_data = malloc(webcam->format.fmt.pix.sizeimage);		
+	if (webcam->raw_data == NULL){
+		printf("Error, can't alloc memory for data buffer\n");
+		return 0;
+	}
+
+	// set the resolution of the camera
+	webcam->width = webcam->format.fmt.pix.width;
+	webcam->height = webcam->format.fmt.pix.height;
+
+	// memory allocation for the buffer that will contain the RGB information
+	// 3 values per pixels 
+	webcam->img_data = malloc(webcam->width*webcam->height*3*sizeof(unsigned char));
+	
+	if(webcam==NULL){
+                printf("INIT FAILED!\n");
+                return NULL;
+         }
+
+	info_device(webcam);
+
+	return webcam;
+}
+
+int query_camera(camera_v4l2* const camera){
+
+	int fd;
+
+	char* device = camera->device;
+	struct v4l2_capability* cap = &(camera->cap);
+	struct v4l2_format* format = &(camera->format);
+
+	// open the webcam device, like a file, return a file descriptor
+	fd = open(device, O_RDONLY);
+
+	if(fd < 0){
+		printf("error, can't open device %s\n", device);	
+		return 0;	
+	}
+
+	// fill the v4l2_capabilities struct by a ioctl call (control device)
+	// VIDIOC_QUERYCAP (V4L2 API Specification) 
+	if(ioctl(fd, VIDIOC_QUERYCAP,cap)==-1){
+		printf("error, can't query device's capabilities\n");
+		return 0;
+	}
+
+	format->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	if(ioctl(fd, VIDIOC_G_FMT, format)==-1){
+		printf("error, can't set the capture image format\n");
+		return 0;
+	}
+	format->fmt.pix.pixelformat = V4L2_PIX_FMT_YUV420;
+
+	// return the file descriptor of the device
+	return fd;
+}
+
+
+char* v4l2_grab_data(camera_v4l2* const camera){
+
+	int fd = camera->addr;	
+	int n = read( fd, 
+			camera->raw_data, 
+			camera->format.fmt.pix.sizeimage);
+	if(n==-1){
+		printf("Error, can't read the webcam\n");
+		return 0;
+	}
+	
+	// launch image format conversion
+	format_conversion(camera->format.fmt.pix.pixelformat, camera->raw_data, camera->img_data, camera->width, camera->height);	 
+
+
+	//return camera->raw_data;
+	return camera->img_data;
+}
+
+void v4l2_free_data(camera_v4l2* cam){
+
+	free(cam->device);
+	free(cam->raw_data);
+	free(cam->img_data);
+	free(cam);
+}
+
+void info_device(camera_v4l2* cam){
+	
+	int format = cam->format.fmt.pix.pixelformat;
+	
+	printf("****************** SPECS CAMERA ********************\n");
+        printf("Image resolution = %ix%i\n",cam->width,cam->height);
+        printf("Image size = %i bytes\n", cam->format.fmt.pix.sizeimage);
+        printf("Pixels format = ");
+	switch(format){
+		case V4L2_PIX_FMT_RGB332:
+                        printf("RGB332\n");
+                        break;
+                case V4L2_PIX_FMT_RGB555:
+                        printf("RGB555\n");
+                        break;
+                case V4L2_PIX_FMT_RGB565:
+                        printf("RGB565\n");
+                        break;
+                case V4L2_PIX_FMT_BGR24:
+                        printf("BGR24\n");
+                        break;
+                case V4L2_PIX_FMT_RGB24:
+                        printf("RGB24\n");
+                	break;
+		case V4L2_PIX_FMT_BGR32:
+                        printf("BGR32\n");
+                        break;
+                case V4L2_PIX_FMT_RGB32:
+                        printf("RGB32\n");
+                        break;
+                case V4L2_PIX_FMT_YUV410:
+                        printf("YUV410\n");
+                        break;
+                case V4L2_PIX_FMT_YUV420:
+                        printf("YUV420\n");
+                        break;
+                case V4L2_PIX_FMT_YUYV:
+                        printf("YUYV\n");
+                        break;
+                case V4L2_PIX_FMT_UYVY:
+                        printf("UYVY\n");
+                        break;
+                default:
+                        printf("TODO: Implement support for V4L2_PIX_FMT 0x%X\n",
+                                                format);
+                        exit(1);
+        }
+
+}
+
diff --git a/src/video/v4l2/capture_v4l2.h b/src/video/v4l2/capture_v4l2.h
new file mode 100755
index 0000000000000000000000000000000000000000..13d98d19b805c708f8c3d63a961167dc658a4351
--- /dev/null
+++ b/src/video/v4l2/capture_v4l2.h
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (C) 2006-2007 Savoir-Faire Linux inc.
+ *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ **/
+
+#ifndef CAPTURE_V4L2_H
+#define CAPTURE_V4L2_H
+
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/videodev.h>
+
+/*********************************
+ * struct camera_v4l2
+ */
+
+ typedef struct {
+	char* device; 				//device name (/dev/video0 for the webcam)
+	struct v4l2_capability cap;		//info on the device's capture capability (ex: type, name, ...)
+	struct v4l2_format format;		//to handle multimedia data
+	char* raw_data;				//buffer for the captured data
+	int addr;				//file descriptor of the device
+	char* img_data;
+	int width;
+	int height;	
+}camera_v4l2;  
+
+/***********************************
+
+/***********************************
+ * Methods
+ */
+
+// initialization of a new camera_v4l2 struct
+camera_v4l2* v4l2_init_camera( char* device_name );
+
+// grab frames
+char* v4l2_grab_data(camera_v4l2* const camera);
+
+//free the allocated buffers
+void v4l2_free_data(camera_v4l2* camera);
+
+void info_device(camera_v4l2* camera);
+
+#endif