X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fv4l%2Fv4l.c;h=6ea1bc4fe8c449f807d4486e619c20395818faab;hb=4f15591e47d52903b559507bdac13e1f5176de45;hp=8767ad9a78252f011319fb2e67abb4400fc739e1;hpb=323dfafae8386d9d08f10a22d5be02db4e933a5b;p=vlc

diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l/v4l.c
index 8767ad9a78..6ea1bc4fe8 100644
--- a/modules/access/v4l/v4l.c
+++ b/modules/access/v4l/v4l.c
@@ -1,12 +1,13 @@
 /*****************************************************************************
  * v4l.c : Video4Linux input module for vlc
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: v4l.c,v 1.28 2003/11/06 00:12:17 gbazin Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
  *
  * Author: Laurent Aimar <fenrir@via.ecp.fr>
  *         Paul Forgey <paulf at aphrodite dot com>
- *         Gildas Bazin <gbazin@netcourrier.com>
+ *         Gildas Bazin <gbazin@videolan.org>
+ *         Benjamin Pracht <bigben at videolan dot org>
  *
  * 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
@@ -20,7 +21,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -41,69 +42,169 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <errno.h>
-
 #include <fcntl.h>
+
+/* From GStreamer's v4l plugin:
+ * Because of some really cool feature in video4linux1, also known as
+ * 'not including sys/types.h and sys/time.h', we had to include it
+ * ourselves. In all their intelligence, these people decided to fix
+ * this in the next version (video4linux2) in such a cool way that it
+ * breaks all compilations of old stuff...
+ * The real problem is actually that linux/time.h doesn't use proper
+ * macro checks before defining types like struct timeval. The proper
+ * fix here is to either fuck the kernel header (which is what we do
+ * by defining _LINUX_TIME_H, an innocent little hack) or by fixing it
+ * upstream, which I'll consider doing later on. If you get compiler
+ * errors here, check your linux/time.h && sys/time.h header setup.
+*/
+#define _LINUX_TIME_H
+
 #include <linux/videodev.h>
 #include "videodev_mjpeg.h"
 
 #include <sys/soundcard.h>
 
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int  AccessOpen  ( vlc_object_t * );
-static void AccessClose ( vlc_object_t * );
-static int  Read        ( input_thread_t *, byte_t *, size_t );
-
-static void ParseMRL    ( input_thread_t * );
-static int  OpenVideoDev( input_thread_t *, char * );
-static int  OpenAudioDev( input_thread_t *, char * );
-
-static int  DemuxOpen  ( vlc_object_t * );
-static void DemuxClose ( vlc_object_t * );
-static int  Demux      ( input_thread_t * );
-
 /*****************************************************************************
  * Module descriptior
  *****************************************************************************/
+static int  Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for v4l streams. This " \
-    "value should be set in miliseconds units." )
+    "Caching value for V4L captures. This " \
+    "value should be set in milliseconds." )
 #define VDEV_TEXT N_("Video device name")
 #define VDEV_LONGTEXT N_( \
-    "Specify the name of the video device that will be used. " \
+    "Name of the video device to use. " \
     "If you don't specify anything, no video device will be used.")
 #define ADEV_TEXT N_("Audio device name")
 #define ADEV_LONGTEXT N_( \
-    "Specify the name of the audio device that will be used. " \
-    "If you don't specify anything, no video device will be used.")
+    "Name of the audio device to use. " \
+    "If you don't specify anything, no audio device will be used.")
+#define CHROMA_TEXT N_("Video input chroma format")
+#define CHROMA_LONGTEXT N_( \
+    "Force the Video4Linux video device to use a specific chroma format " \
+    "(eg. I420 (default), RV24, etc.)")
+#define FREQUENCY_TEXT N_( "Frequency" )
+#define FREQUENCY_LONGTEXT N_( \
+    "Frequency to capture (in kHz), if applicable." )
+#define CHANNEL_TEXT N_( "Channel" )
+#define CHANNEL_LONGTEXT N_( \
+    "Channel of the card to use (Usually, 0 = tuner, " \
+    "1 = composite, 2 = svideo)." )
+#define NORM_TEXT N_( "Norm" )
+#define NORM_LONGTEXT N_( \
+    "Norm of the stream (Automatic, SECAM, PAL, or NTSC)." )
+#define AUDIO_TEXT N_( "Audio Channel" )
+#define AUDIO_LONGTEXT N_( \
+    "Audio Channel to use, if there are several audio inputs." )
+#define WIDTH_TEXT N_( "Width" )
+#define WIDTH_LONGTEXT N_( "Width of the stream to capture " \
+    "(-1 for autodetect)." )
+#define HEIGHT_TEXT N_( "Height" )
+#define HEIGHT_LONGTEXT N_( "Height of the stream to capture " \
+    "(-1 for autodetect)." )
+#define BRIGHTNESS_TEXT N_( "Brightness" )
+#define BRIGHTNESS_LONGTEXT N_( \
+    "Brightness of the video input." )
+#define HUE_TEXT N_( "Hue" )
+#define HUE_LONGTEXT N_( \
+    "Hue of the video input." )
+#define COLOUR_TEXT N_( "Color" )
+#define COLOUR_LONGTEXT N_( \
+    "Color of the video input." )
+#define CONTRAST_TEXT N_( "Contrast" )
+#define CONTRAST_LONGTEXT N_( \
+    "Contrast of the video input." )
+#define TUNER_TEXT N_( "Tuner" )
+#define TUNER_LONGTEXT N_( "Tuner to use, if there are several ones." )
+#define SAMPLERATE_TEXT N_( "Samplerate" )
+#define SAMPLERATE_LONGTEXT N_( \
+    "Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100)" )
+#define STEREO_TEXT N_( "Stereo" )
+#define STEREO_LONGTEXT N_( \
+    "Capture the audio stream in stereo." )
+#define MJPEG_TEXT N_( "MJPEG" )
+#define MJPEG_LONGTEXT N_(  \
+    "Set this option if the capture device outputs MJPEG" )
+#define DECIMATION_TEXT N_( "Decimation" )
+#define DECIMATION_LONGTEXT N_( \
+    "Decimation level for MJPEG streams" )
+#define QUALITY_TEXT N_( "Quality" )
+#define QUALITY_LONGTEXT N_( "Quality of the stream." )
+#define FPS_TEXT N_( "Framerate" )
+#define FPS_LONGTEXT N_( "Framerate to capture, if applicable " \
+    "(-1 for autodetect)." )
+
+static int i_norm_list[] =
+    { VIDEO_MODE_AUTO, VIDEO_MODE_SECAM, VIDEO_MODE_PAL, VIDEO_MODE_NTSC };
+static char *psz_norm_list_text[] =
+    { N_("Automatic"), N_("SECAM"), N_("PAL"),  N_("NTSC") };
 
 vlc_module_begin();
+    set_shortname( _("Video4Linux") );
     set_description( _("Video4Linux input") );
-    add_category_hint( N_("v4l"), NULL, VLC_TRUE );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_ACCESS );
+
     add_integer( "v4l-caching", DEFAULT_PTS_DELAY / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-    add_shortcut( "v4l" );
-    set_capability( "access", 10 );
-    set_callbacks( AccessOpen, AccessClose );
-
     add_string( "v4l-vdev", "/dev/video", 0, VDEV_TEXT, VDEV_LONGTEXT,
                 VLC_FALSE );
     add_string( "v4l-adev", "/dev/dsp", 0, ADEV_TEXT, ADEV_LONGTEXT,
                 VLC_FALSE );
+    add_string( "v4l-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
+                VLC_TRUE );
+    add_float( "v4l-fps", -1.0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_TRUE );
+    add_integer( "v4l-samplerate", 44100, NULL, SAMPLERATE_TEXT,
+                SAMPLERATE_LONGTEXT, VLC_TRUE );
+    add_integer( "v4l-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT,
+                VLC_TRUE );
+    add_integer( "v4l-tuner", -1, NULL, TUNER_TEXT, TUNER_LONGTEXT, VLC_TRUE );
+    add_integer( "v4l-norm", VIDEO_MODE_AUTO, NULL, NORM_TEXT, NORM_LONGTEXT,
+                VLC_FALSE );
+        change_integer_list( i_norm_list, psz_norm_list_text, 0 );
+    add_integer( "v4l-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT,
+                VLC_FALSE );
+    add_integer( "v4l-audio", -1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, VLC_TRUE );
+    add_bool( "v4l-stereo", VLC_TRUE, NULL, STEREO_TEXT, STEREO_LONGTEXT,
+            VLC_TRUE );
+    add_integer( "v4l-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE );
+    add_integer( "v4l-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT,
+                VLC_TRUE );
+    add_integer( "v4l-brightness", -1, NULL, BRIGHTNESS_TEXT,
+                BRIGHTNESS_LONGTEXT, VLC_TRUE );
+    add_integer( "v4l-colour", -1, NULL, COLOUR_TEXT, COLOUR_LONGTEXT,
+                VLC_TRUE );
+    add_integer( "v4l-hue", -1, NULL, HUE_TEXT, HUE_LONGTEXT, VLC_TRUE );
+    add_integer( "v4l-contrast", -1, NULL, CONTRAST_TEXT, CONTRAST_LONGTEXT,
+                VLC_TRUE );
+    add_bool( "v4l-mjpeg", VLC_FALSE, NULL, MJPEG_TEXT, MJPEG_LONGTEXT,
+            VLC_TRUE );
+    add_integer( "v4l-decimation", 1, NULL, DECIMATION_TEXT,
+            DECIMATION_LONGTEXT, VLC_TRUE );
+    add_integer( "v4l-quality", 100, NULL, QUALITY_TEXT, QUALITY_LONGTEXT,
+            VLC_TRUE );
 
-    add_submodule();
-        set_description( _("Video4Linux demuxer") );
-        add_shortcut( "v4l" );
-        set_capability( "demux", 200 );
-        set_callbacks( DemuxOpen, DemuxClose );
+    add_shortcut( "v4l" );
+    set_capability( "access_demux", 10 );
+    set_callbacks( Open, Close );
 vlc_module_end();
 
+/*****************************************************************************
+ * Access: local prototypes
+ *****************************************************************************/
+static int Demux  ( demux_t * );
+static int Control( demux_t *, int, va_list );
+
+static void ParseMRL    ( demux_t * );
+static int  OpenVideoDev( demux_t *, char * );
+static int  OpenAudioDev( demux_t *, char * );
+
+static block_t *GrabAudio( demux_t * );
+static block_t *GrabVideo( demux_t * );
 
-/****************************************************************************
- * I. Access Part
- ****************************************************************************/
 #define MJPEG_BUFFER_SIZE (256*1024)
 
 struct quicktime_mjpeg_app1
@@ -120,7 +221,32 @@ struct quicktime_mjpeg_app1
     uint32_t    i_data_offset;          /* following SOS marker data */
 };
 
-struct access_sys_t
+static struct
+{
+    int i_v4l;
+    int i_fourcc;
+
+} v4lchroma_to_fourcc[] =
+{
+    { VIDEO_PALETTE_GREY, VLC_FOURCC( 'G', 'R', 'E', 'Y' ) },
+    { VIDEO_PALETTE_HI240, VLC_FOURCC( 'I', '2', '4', '0' ) },
+    { VIDEO_PALETTE_RGB565, VLC_FOURCC( 'R', 'V', '1', '6' ) },
+    { VIDEO_PALETTE_RGB555, VLC_FOURCC( 'R', 'V', '1', '5' ) },
+    { VIDEO_PALETTE_RGB24, VLC_FOURCC( 'R', 'V', '2', '4' ) },
+    { VIDEO_PALETTE_RGB32, VLC_FOURCC( 'R', 'V', '3', '2' ) },
+    { VIDEO_PALETTE_YUV422, VLC_FOURCC( 'I', '4', '2', '2' ) },
+    { VIDEO_PALETTE_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', 'V' ) },
+    { VIDEO_PALETTE_UYVY, VLC_FOURCC( 'U', 'Y', 'V', 'Y' ) },
+    { VIDEO_PALETTE_YUV420, VLC_FOURCC( 'I', '4', '2', 'N' ) },
+    { VIDEO_PALETTE_YUV411, VLC_FOURCC( 'I', '4', '1', 'N' ) },
+    { VIDEO_PALETTE_RAW, VLC_FOURCC( 'G', 'R', 'A', 'W' ) },
+    { VIDEO_PALETTE_YUV422P, VLC_FOURCC( 'I', '4', '2', '2' ) },
+    { VIDEO_PALETTE_YUV420P, VLC_FOURCC( 'I', '4', '2', '0' ) },
+    { VIDEO_PALETTE_YUV411P, VLC_FOURCC( 'I', '4', '1', '1' ) },
+    { 0, 0 }
+};
+
+struct demux_sys_t
 {
     /* Devices */
     char *psz_device;         /* Main device from MRL, can be video or audio */
@@ -143,6 +269,11 @@ struct access_sys_t
     int i_width;
     int i_height;
 
+    int i_brightness;
+    int i_hue;
+    int i_colour;
+    int i_contrast;
+
     float f_fps;            /* <= 0.0 mean to grab at full rate */
     mtime_t i_video_pts;    /* only used when f_fps > 0 */
 
@@ -160,126 +291,139 @@ struct access_sys_t
     struct video_mmap   vid_mmap;
     struct video_picture vid_picture;
 
-    uint8_t *p_video_frame;
-    int     i_video_frame_size;
-    int     i_video_frame_size_allocated;
+    int          i_video_frame_size;
+    es_out_id_t  *p_es_video;
 
     /* Audio properties */
     vlc_fourcc_t i_acodec_raw;
     int          i_sample_rate;
     vlc_bool_t   b_stereo;
-
-    uint8_t *p_audio_frame;
-    int     i_audio_frame_size;
-    int     i_audio_frame_size_allocated;
-
-    /* header */
-    int     i_streams;
-    int     i_header_size;
-    int     i_header_pos;
-    uint8_t *p_header;      // at lest 8 bytes allocated
-
-    /* data */
-    int     i_data_size;
-    int     i_data_pos;
-    uint8_t *p_data;        // never allocated
-
+    int          i_audio_max_frame_size;
+    block_t      *p_block_audio;
+    es_out_id_t  *p_es_audio;
 };
 
-/*
- * header:
- *  fcc  ".v4l"
- *  u32    stream count
- *      fcc "auds"|"vids"       0
- *      fcc codec               4
- *      if vids
- *          u32 width           8
- *          u32 height          12
- *          u32 padding         16
- *      if auds
- *          u32 channels        12
- *          u32 samplerate      8
- *          u32 samplesize      16
- *
- * data:
- *  u32     stream number
- *  u32     data size
- *  u8      data
- */
-
-static void SetDWBE( uint8_t *p, uint32_t dw )
-{
-    p[0] = (dw >> 24)&0xff;
-    p[1] = (dw >> 16)&0xff;
-    p[2] = (dw >>  8)&0xff;
-    p[3] = (dw      )&0xff;
-}
-
-static void SetQWBE( uint8_t *p, uint64_t qw )
-{
-    SetDWBE( p,     (qw >> 32)&0xffffffff );
-    SetDWBE( &p[4], qw&0xffffffff);
-}
-
 /*****************************************************************************
- * AccessOpen: opens v4l device
+ * Open: opens v4l device
  *****************************************************************************
  *
  * url: <video device>::::
  *
  *****************************************************************************/
-static int AccessOpen( vlc_object_t *p_this )
+static int Open( vlc_object_t *p_this )
 {
-    input_thread_t *p_input = (input_thread_t *)p_this;
-    access_sys_t   *p_sys;
-    vlc_value_t    val;
+    demux_t     *p_demux = (demux_t*)p_this;
+    demux_sys_t *p_sys;
+    vlc_value_t val;
+
+    /* Only when selected */
+    if( *p_demux->psz_access == '\0' )
+        return VLC_EGENERIC;
+
+    /* Set up p_demux */
+    p_demux->pf_demux = Demux;
+    p_demux->pf_control = Control;
+    p_demux->info.i_update = 0;
+    p_demux->info.i_title = 0;
+    p_demux->info.i_seekpoint = 0;
+    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    memset( p_sys, 0, sizeof( demux_sys_t ) );
+
+    var_Create( p_demux, "v4l-audio", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-audio", &val );
+    p_sys->i_audio          = val.i_int;
+
+    var_Create( p_demux, "v4l-channel", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-channel", &val );
+    p_sys->i_channel        = val.i_int;
 
-    /* create access private data */
-    p_input->p_access_data = p_sys = malloc( sizeof( access_sys_t ) );
-    memset( p_sys, 0, sizeof( access_sys_t ) );
+    var_Create( p_demux, "v4l-norm", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-norm", &val );
+    p_sys->i_norm           = val.i_int;
 
-    p_sys->i_audio          = -1;
-    p_sys->i_norm           = VIDEO_MODE_AUTO;    // auto
-    p_sys->i_tuner          = -1;
-    p_sys->i_frequency      = -1;
+    var_Create( p_demux, "v4l-tuner", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-tuner", &val );
+    p_sys->i_tuner          = val.i_int;
+
+    var_Create( p_demux, "v4l-frequency",
+                                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-frequency", &val );
+    p_sys->i_frequency      = val.i_int;
+
+    var_Create( p_demux, "v4l-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-fps", &val );
+    p_sys->f_fps            = val.f_float;
+
+    var_Create( p_demux, "v4l-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-width", &val );
+    p_sys->i_width          = val.i_int;
+
+    var_Create( p_demux, "v4l-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-height", &val );
+    p_sys->i_height         = val.i_int;
 
-    p_sys->f_fps            = -1.0;
     p_sys->i_video_pts      = -1;
 
-    p_sys->b_mjpeg     = VLC_FALSE;
-    p_sys->i_decimation = 1;
-    p_sys->i_quality = 100;
+    var_Create( p_demux, "v4l-brightness", VLC_VAR_INTEGER |
+                                                        VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-brightness", &val );
+    p_sys->i_brightness     = val.i_int;
+
+    var_Create( p_demux, "v4l-hue", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-hue", &val );
+    p_sys->i_hue            = -1;
+
+    var_Create( p_demux, "v4l-colour", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-colour", &val );
+    p_sys->i_colour         = val.i_int;
 
-    p_sys->i_video_frame_size_allocated = 0;
-    p_sys->i_frame_pos = 0;
+    var_Create( p_demux, "v4l-contrast", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-contrast", &val );
+    p_sys->i_contrast       = val.i_int;
 
-    p_sys->p_audio_frame  = 0;
-    p_sys->i_sample_rate  = 44100;
-    p_sys->b_stereo       = VLC_TRUE;
+    var_Create( p_demux, "v4l-mjpeg", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-mjpeg", &val );
+    p_sys->b_mjpeg     = val.b_bool;
 
-    p_sys->p_header    = NULL;
-    p_sys->i_data_size = 0;
-    p_sys->i_data_pos  = 0;
-    p_sys->p_data      = NULL;
+    var_Create( p_demux, "v4l-decimation", VLC_VAR_INTEGER |
+                                                            VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-decimation", &val );
+    p_sys->i_decimation = val.i_int;
+
+    var_Create( p_demux, "v4l-quality", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-quality", &val );
+    p_sys->i_quality = val.i_int;
+
+    var_Create( p_demux, "v4l-samplerate",
+                                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-samplerate", &val );
+    p_sys->i_sample_rate  = val.i_int;
+
+    var_Create( p_demux, "v4l-stereo", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "v4l-stereo", &val );
+    p_sys->b_stereo       = val.b_bool;
 
     p_sys->psz_device = p_sys->psz_vdev = p_sys->psz_adev = NULL;
     p_sys->fd_video = -1;
     p_sys->fd_audio = -1;
 
-    ParseMRL( p_input );
+    p_sys->p_es_video = p_sys->p_es_audio = 0;
+    p_sys->p_block_audio = 0;
+
+    ParseMRL( p_demux );
 
     /* Find main device (video or audio) */
     if( p_sys->psz_device && *p_sys->psz_device )
     {
-        msg_Dbg( p_input, "main device=`%s'", p_sys->psz_device );
+        msg_Dbg( p_demux, "main device=`%s'", p_sys->psz_device );
 
         /* Try to open as video device */
-        p_sys->fd_video = OpenVideoDev( p_input, p_sys->psz_device );
+        p_sys->fd_video = OpenVideoDev( p_demux, p_sys->psz_device );
 
         if( p_sys->fd_video < 0 )
         {
             /* Try to open as audio device */
-            p_sys->fd_audio = OpenAudioDev( p_input, p_sys->psz_device );
+            p_sys->fd_audio = OpenAudioDev( p_demux, p_sys->psz_device );
             if( p_sys->fd_audio >= 0 )
             {
                 if( p_sys->psz_adev ) free( p_sys->psz_adev );
@@ -298,10 +442,9 @@ static int AccessOpen( vlc_object_t *p_this )
     /* If no device opened, only continue if the access was forced */
     if( p_sys->fd_video < 0 && p_sys->fd_audio < 0 )
     {
-        if( !p_input->psz_access ||
-            strcmp( p_input->psz_access, "v4l" ) )
+        if( strcmp( p_demux->psz_access, "v4l" ) )
         {
-            AccessClose( p_this );
+            Close( p_this );
             return VLC_EGENERIC;
         }
     }
@@ -311,17 +454,13 @@ static int AccessOpen( vlc_object_t *p_this )
     {
         if( !p_sys->psz_vdev || !*p_sys->psz_vdev )
         {
-            var_Create( p_input, "v4l-vdev",
-                        VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-            var_Get( p_input, "v4l-vdev", &val );
-
             if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
-            p_sys->psz_vdev = val.psz_string;
+            p_sys->psz_vdev = var_CreateGetString( p_demux, "v4l-vdev" );;
         }
 
         if( p_sys->psz_vdev && *p_sys->psz_vdev )
         {
-            p_sys->fd_video = OpenVideoDev( p_input, p_sys->psz_vdev );
+            p_sys->fd_video = OpenVideoDev( p_demux, p_sys->psz_vdev );
         }
     }
 
@@ -330,101 +469,180 @@ static int AccessOpen( vlc_object_t *p_this )
     {
         if( !p_sys->psz_adev || !*p_sys->psz_adev )
         {
-            var_Create( p_input, "v4l-adev",
-                        VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-            var_Get( p_input, "v4l-adev", &val );
-
             if( p_sys->psz_adev ) free( p_sys->psz_adev );
-            p_sys->psz_adev = val.psz_string;
+            p_sys->psz_adev = var_CreateGetString( p_demux, "v4l-adev" );;
         }
 
         if( p_sys->psz_adev && *p_sys->psz_adev )
         {
-            p_sys->fd_audio = OpenAudioDev( p_input, p_sys->psz_adev );
+            p_sys->fd_audio = OpenAudioDev( p_demux, p_sys->psz_adev );
         }
     }
 
     if( p_sys->fd_video < 0 && p_sys->fd_audio < 0 )
     {
-        AccessClose( p_this );
+        Close( p_this );
         return VLC_EGENERIC;
     }
 
-    p_input->pf_read        = Read;
-    p_input->pf_seek        = NULL;
-    p_input->pf_set_area    = NULL;
-    p_input->pf_set_program = NULL;
+    msg_Dbg( p_demux, "v4l grabbing started" );
+
+    /* Declare elementary streams */
+    if( p_sys->fd_video >= 0 )
+    {
+        es_format_t fmt;
+        es_format_Init( &fmt, VIDEO_ES, p_sys->i_fourcc );
+        fmt.video.i_width  = p_sys->i_width;
+        fmt.video.i_height = p_sys->i_height;
+        fmt.video.i_aspect = 4 * VOUT_ASPECT_FACTOR / 3;
+
+        /* Setup rgb mask for RGB formats */
+        if( p_sys->i_fourcc == VLC_FOURCC('R','V','2','4') )
+        {
+            /* This is in BGR format */
+            fmt.video.i_bmask = 0x00ff0000;
+            fmt.video.i_gmask = 0x0000ff00;
+            fmt.video.i_rmask = 0x000000ff;
+        }
+
+        msg_Dbg( p_demux, "added new video es %4.4s %dx%d",
+                 (char*)&fmt.i_codec, fmt.video.i_width, fmt.video.i_height );
+        p_sys->p_es_video = es_out_Add( p_demux->out, &fmt );
+    }
+
+    if( p_sys->fd_audio >= 0 )
+    {
+        es_format_t fmt;
+        es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC('a','r','a','w') );
+
+        fmt.audio.i_channels = p_sys->b_stereo ? 2 : 1;
+        fmt.audio.i_rate = p_sys->i_sample_rate;
+        fmt.audio.i_bitspersample = 16; // FIXME ?
+        fmt.audio.i_blockalign = fmt.audio.i_channels *
+            fmt.audio.i_bitspersample / 8;
+        fmt.i_bitrate = fmt.audio.i_channels * fmt.audio.i_rate *
+            fmt.audio.i_bitspersample;
+
+        msg_Dbg( p_demux, "new audio es %d channels %dHz",
+                 fmt.audio.i_channels, fmt.audio.i_rate );
 
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    p_input->stream.b_pace_control = 0;
-    p_input->stream.b_seekable = 0;
-    p_input->stream.p_selected_area->i_size = 0;
-    p_input->stream.p_selected_area->i_tell = 0;
-    p_input->stream.i_method = INPUT_METHOD_FILE;
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
+        p_sys->p_es_audio = es_out_Add( p_demux->out, &fmt );
+    }
 
     /* Update default_pts to a suitable value for access */
-    var_Create( p_input, "v4l-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-    var_Get( p_input, "v4l-caching", &val );
-    p_input->i_pts_delay = val.i_int * 1000;
+    var_Create( p_demux, "v4l-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 
-    msg_Info( p_input, "v4l grabbing started" );
+    return VLC_SUCCESS;
+}
 
-    /* create header */
-    p_sys->i_streams     = 0;
-    p_sys->i_header_size = 8;
-    p_sys->i_header_pos  = 8;
-    p_sys->p_header      = malloc( p_sys->i_header_size );
+/*****************************************************************************
+ * Close: close device, free resources
+ *****************************************************************************/
+static void Close( vlc_object_t *p_this )
+{
+    demux_t     *p_demux = (demux_t *)p_this;
+    demux_sys_t *p_sys   = p_demux->p_sys;
+
+    if( p_sys->psz_device ) free( p_sys->psz_device );
+    if( p_sys->psz_vdev )   free( p_sys->psz_vdev );
+    if( p_sys->psz_adev )   free( p_sys->psz_adev );
+    if( p_sys->fd_video >= 0 ) close( p_sys->fd_video );
+    if( p_sys->fd_audio >= 0 ) close( p_sys->fd_audio );
+    if( p_sys->p_block_audio ) block_Release( p_sys->p_block_audio );
 
-    memcpy( p_sys->p_header, ".v4l", 4 );
+    if( p_sys->b_mjpeg )
+    {
+        int i_noframe = -1;
+        ioctl( p_sys->fd_video, MJPIOC_QBUF_CAPT, &i_noframe );
+    }
 
-    if( p_sys->fd_video >= 0 )
+    if( p_sys->p_video_mmap && p_sys->p_video_mmap != MAP_FAILED )
     {
-        p_sys->i_header_size += 20;
-        p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header_size );
+        if( p_sys->b_mjpeg )
+            munmap( p_sys->p_video_mmap, p_sys->mjpeg_buffers.size *
+                    p_sys->mjpeg_buffers.count );
+        else
+            munmap( p_sys->p_video_mmap, p_sys->vid_mbuf.size );
+    }
 
-        SetDWBE( &p_sys->p_header[4], ++p_sys->i_streams );
+    free( p_sys );
+}
 
-        memcpy(  &p_sys->p_header[p_sys->i_header_pos], "vids", 4 );
-        memcpy(  &p_sys->p_header[p_sys->i_header_pos+4],
-                 &p_sys->i_fourcc, 4 );
-        SetDWBE( &p_sys->p_header[p_sys->i_header_pos+8], p_sys->i_width );
-        SetDWBE( &p_sys->p_header[p_sys->i_header_pos+12], p_sys->i_height );
-        SetDWBE( &p_sys->p_header[p_sys->i_header_pos+16], 0 );
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+    vlc_bool_t *pb;
+    int64_t    *pi64;
 
-        p_sys->i_header_pos = p_sys->i_header_size;
+    switch( i_query )
+    {
+        /* Special for access_demux */
+        case DEMUX_CAN_PAUSE:
+        case DEMUX_SET_PAUSE_STATE:
+        case DEMUX_CAN_CONTROL_PACE:
+            pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
+            *pb = VLC_FALSE;
+            return VLC_SUCCESS;
+
+        case DEMUX_GET_PTS_DELAY:
+            pi64 = (int64_t*)va_arg( args, int64_t * );
+            *pi64 = (int64_t)var_GetInteger( p_demux, "v4l-caching" ) * 1000;
+            return VLC_SUCCESS;
+
+        case DEMUX_GET_TIME:
+            pi64 = (int64_t*)va_arg( args, int64_t * );
+            *pi64 = mdate();
+            return VLC_SUCCESS;
+
+        /* TODO implement others */
+        default:
+            return VLC_EGENERIC;
     }
 
-    if( p_sys->fd_audio >= 0 )
-    {
-        p_sys->i_header_size += 20;
-        p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header_size );
+    return VLC_EGENERIC;
+}
 
-        SetDWBE( &p_sys->p_header[4], ++p_sys->i_streams );
+/*****************************************************************************
+ * Demux:
+ *****************************************************************************/
+static int Demux( demux_t *p_demux )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    es_out_id_t  *p_es = p_sys->p_es_audio;
+    block_t *p_block = NULL;
 
-        memcpy(  &p_sys->p_header[p_sys->i_header_pos], "auds", 4 );
-        memcpy(  &p_sys->p_header[p_sys->i_header_pos+4], "araw", 4 );
-        SetDWBE( &p_sys->p_header[p_sys->i_header_pos+8],
-                 p_sys->b_stereo ? 2 : 1 );
-        SetDWBE( &p_sys->p_header[p_sys->i_header_pos+12],
-                 p_sys->i_sample_rate );
-        SetDWBE( &p_sys->p_header[p_sys->i_header_pos+16], 16 );
+    /* Try grabbing audio frames first */
+    if( p_sys->fd_audio < 0 || !( p_block = GrabAudio( p_demux ) ) )
+    {
+        /* Try grabbing video frame */
+        p_es = p_sys->p_es_video;
+        if( p_sys->fd_video > 0 ) p_block = GrabVideo( p_demux );
+    }
 
-        p_sys->i_header_pos = p_sys->i_header_size;
+    if( !p_block )
+    {
+        /* Sleep so we do not consume all the cpu, 10ms seems
+         * like a good value (100fps) */
+        msleep( 10000 );
+        return 1;
     }
-    p_sys->i_header_pos = 0;
 
-    return VLC_SUCCESS;
+    es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts );
+    es_out_Send( p_demux->out, p_es, p_block );
+
+    return 1;
 }
 
 /*****************************************************************************
  * ParseMRL: parse the options contained in the MRL
  *****************************************************************************/
-static void ParseMRL( input_thread_t *p_input )
+static void ParseMRL( demux_t *p_demux )
 {
-    access_sys_t *p_sys = p_input->p_access_data;
+    demux_sys_t *p_sys = p_demux->p_sys;
 
-    char *psz_dup = strdup( p_input->psz_name );
+    char *psz_dup = strdup( p_demux->psz_path );
     char *psz_parser = psz_dup;
 
     while( *psz_parser && *psz_parser != ':' )
@@ -479,7 +697,7 @@ static void ParseMRL( input_thread_t *p_input )
                             &psz_parser, 0 );
                 if( p_sys->i_frequency < 30000 )
                 {
-                    msg_Warn( p_input, "v4l syntax has changed : "
+                    msg_Warn( p_demux, "v4l syntax has changed : "
                               "'frequency' is now channel frequency in kHz");
                 }
             }
@@ -530,10 +748,30 @@ static void ParseMRL( input_thread_t *p_input )
                         p_sys->i_height = strtol( psz_parser + 1,
                                                   &psz_parser, 0 );
                     }
-                    msg_Dbg( p_input, "WxH %dx%d", p_sys->i_width,
+                    msg_Dbg( p_demux, "WxH %dx%d", p_sys->i_width,
                              p_sys->i_height );
                 }
             }
+            else if( !strncmp( psz_parser, "brightness=", strlen( "brightness=" ) ) )
+            {
+                p_sys->i_brightness = strtol( psz_parser + strlen( "brightness=" ),
+                                              &psz_parser, 0 );
+            }
+            else if( !strncmp( psz_parser, "colour=", strlen( "colour=" ) ) )
+            {
+                p_sys->i_colour = strtol( psz_parser + strlen( "colour=" ),
+                                          &psz_parser, 0 );
+            }
+            else if( !strncmp( psz_parser, "hue=", strlen( "hue=" ) ) )
+            {
+                p_sys->i_hue = strtol( psz_parser + strlen( "hue=" ), 
+                                       &psz_parser, 0 );
+            }
+            else if( !strncmp( psz_parser, "contrast=", strlen( "contrast=" ) ) )
+            {
+                p_sys->i_contrast = strtol( psz_parser + strlen( "contrast=" ),
+                                            &psz_parser, 0 );
+            }
             else if( !strncmp( psz_parser, "tuner=", strlen( "tuner=" ) ) )
             {
                 p_sys->i_tuner = strtol( psz_parser + strlen( "tuner=" ),
@@ -603,7 +841,7 @@ static void ParseMRL( input_thread_t *p_input )
             }
             else
             {
-                msg_Warn( p_input, "unknown option" );
+                msg_Warn( p_demux, "unknown option" );
             }
 
             while( *psz_parser && *psz_parser != ':' )
@@ -622,14 +860,15 @@ static void ParseMRL( input_thread_t *p_input )
     {
         p_sys->psz_device = strdup( psz_dup );
     }
+    if( psz_dup ) free( psz_dup );
 }
 
 /*****************************************************************************
  * OpenVideoDev:
  *****************************************************************************/
-int OpenVideoDev( input_thread_t *p_input, char *psz_device )
+static int OpenVideoDev( demux_t *p_demux, char *psz_device )
 {
-    access_sys_t *p_sys = p_input->p_access_data;
+    demux_sys_t *p_sys = p_demux->p_sys;
     int i_fd;
 
     struct video_channel vid_channel;
@@ -638,17 +877,17 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
 
     if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
     {
-        msg_Err( p_input, "cannot open device (%s)", strerror( errno ) );
+        msg_Err( p_demux, "cannot open device (%s)", strerror( errno ) );
         goto vdev_failed;
     }
 
     if( ioctl( i_fd, VIDIOCGCAP, &p_sys->vid_cap ) < 0 )
     {
-        msg_Err( p_input, "cannot get capabilities (%s)", strerror( errno ) );
+        msg_Err( p_demux, "cannot get capabilities (%s)", strerror( errno ) );
         goto vdev_failed;
     }
 
-    msg_Dbg( p_input,
+    msg_Dbg( p_demux,
              "V4L device %s %d channels %d audios %d < w < %d %d < h < %d",
              p_sys->vid_cap.name,
              p_sys->vid_cap.channels,
@@ -658,60 +897,56 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
 
     if( p_sys->i_channel < 0 || p_sys->i_channel >= p_sys->vid_cap.channels )
     {
-        msg_Dbg( p_input, "invalid channel, falling back on channel 0" );
+        msg_Dbg( p_demux, "invalid channel, falling back on channel 0" );
         p_sys->i_channel = 0;
     }
-    if( p_sys->i_audio >= p_sys->vid_cap.audios )
+    if( p_sys->vid_cap.audios && p_sys->i_audio >= p_sys->vid_cap.audios )
     {
-        msg_Dbg( p_input, "invalid audio, falling back with no audio" );
+        msg_Dbg( p_demux, "invalid audio, falling back with no audio" );
         p_sys->i_audio = -1;
     }
 
     if( p_sys->i_width < p_sys->vid_cap.minwidth ||
         p_sys->i_width > p_sys->vid_cap.maxwidth )
     {
-        msg_Dbg( p_input, "invalid width %i", p_sys->i_width );
+        msg_Dbg( p_demux, "invalid width %i", p_sys->i_width );
         p_sys->i_width = 0;
     }
     if( p_sys->i_height < p_sys->vid_cap.minheight ||
         p_sys->i_height > p_sys->vid_cap.maxheight )
     {
-        msg_Dbg( p_input, "invalid height %i", p_sys->i_height );
+        msg_Dbg( p_demux, "invalid height %i", p_sys->i_height );
         p_sys->i_height = 0;
     }
 
     if( !( p_sys->vid_cap.type & VID_TYPE_CAPTURE ) )
     {
-        msg_Err( p_input, "cannot grab" );
+        msg_Err( p_demux, "cannot grab" );
         goto vdev_failed;
     }
 
     vid_channel.channel = p_sys->i_channel;
     if( ioctl( i_fd, VIDIOCGCHAN, &vid_channel ) < 0 )
     {
-        msg_Err( p_input, "cannot get channel infos (%s)",
+        msg_Err( p_demux, "cannot get channel infos (%s)",
                           strerror( errno ) );
         goto vdev_failed;
     }
-    msg_Dbg( p_input,
+    msg_Dbg( p_demux,
              "setting channel %s(%d) %d tuners flags=0x%x type=0x%x norm=0x%x",
-             vid_channel.name,
-             vid_channel.channel,
-             vid_channel.tuners,
-             vid_channel.flags,
-             vid_channel.type,
-             vid_channel.norm );
+             vid_channel.name, vid_channel.channel, vid_channel.tuners,
+             vid_channel.flags, vid_channel.type, vid_channel.norm );
 
     if( p_sys->i_tuner >= vid_channel.tuners )
     {
-        msg_Dbg( p_input, "invalid tuner, falling back on tuner 0" );
+        msg_Dbg( p_demux, "invalid tuner, falling back on tuner 0" );
         p_sys->i_tuner = 0;
     }
 
     vid_channel.norm = p_sys->i_norm;
     if( ioctl( i_fd, VIDIOCSCHAN, &vid_channel ) < 0 )
     {
-        msg_Err( p_input, "cannot set channel (%s)", strerror( errno ) );
+        msg_Err( p_demux, "cannot set channel (%s)", strerror( errno ) );
         goto vdev_failed;
     }
 
@@ -726,22 +961,22 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
             vid_tuner.tuner = p_sys->i_tuner;
             if( ioctl( i_fd, VIDIOCGTUNER, &vid_tuner ) < 0 )
             {
-                msg_Err( p_input, "cannot get tuner (%s)", strerror( errno ) );
+                msg_Err( p_demux, "cannot get tuner (%s)", strerror( errno ) );
                 goto vdev_failed;
             }
-            msg_Dbg( p_input, "tuner %s low=%d high=%d, flags=0x%x "
+            msg_Dbg( p_demux, "tuner %s low=%d high=%d, flags=0x%x "
                      "mode=0x%x signal=0x%x",
                      vid_tuner.name, vid_tuner.rangelow, vid_tuner.rangehigh,
                      vid_tuner.flags, vid_tuner.mode, vid_tuner.signal );
 
-            msg_Dbg( p_input, "setting tuner %s (%d)",
+            msg_Dbg( p_demux, "setting tuner %s (%d)",
                      vid_tuner.name, vid_tuner.tuner );
 
             /* FIXME FIXME to be checked FIXME FIXME */
             //vid_tuner.mode = p_sys->i_norm;
             if( ioctl( i_fd, VIDIOCSTUNER, &vid_tuner ) < 0 )
             {
-                msg_Err( p_input, "cannot set tuner (%s)", strerror( errno ) );
+                msg_Err( p_demux, "cannot set tuner (%s)", strerror( errno ) );
                 goto vdev_failed;
             }
         }
@@ -757,11 +992,11 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
             int driver_frequency = p_sys->i_frequency * 16 /1000;
             if( ioctl( i_fd, VIDIOCSFREQ, &driver_frequency ) < 0 )
             {
-                msg_Err( p_input, "cannot set frequency (%s)",
+                msg_Err( p_demux, "cannot set frequency (%s)",
                                   strerror( errno ) );
                 goto vdev_failed;
             }
-            msg_Dbg( p_input, "frequency %d (%d)", p_sys->i_frequency,
+            msg_Dbg( p_demux, "frequency %d (%d)", p_sys->i_frequency,
                                                    driver_frequency );
         }
     }
@@ -777,7 +1012,7 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
             vid_audio.audio = p_sys->i_audio;
             if( ioctl( i_fd, VIDIOCGAUDIO, &vid_audio ) < 0 )
             {
-                msg_Err( p_input, "cannot get audio (%s)", strerror( errno ) );
+                msg_Err( p_demux, "cannot get audio (%s)", strerror( errno ) );
                 goto vdev_failed;
             }
 
@@ -786,7 +1021,7 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
 
             if( ioctl( i_fd, VIDIOCSAUDIO, &vid_audio ) < 0 )
             {
-                msg_Err( p_input, "cannot set audio (%s)", strerror( errno ) );
+                msg_Err( p_demux, "cannot set audio (%s)", strerror( errno ) );
                 goto vdev_failed;
             }
         }
@@ -802,7 +1037,7 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
 
         if( ioctl( i_fd, MJPIOC_G_PARAMS, &mjpeg ) < 0 )
         {
-            msg_Err( p_input, "cannot get mjpeg params (%s)",
+            msg_Err( p_demux, "cannot get mjpeg params (%s)",
                               strerror( errno ) );
             goto vdev_failed;
         }
@@ -853,7 +1088,7 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
 
         if( ioctl( i_fd, MJPIOC_S_PARAMS, &mjpeg ) < 0 )
         {
-            msg_Err( p_input, "cannot set mjpeg params (%s)",
+            msg_Err( p_demux, "cannot set mjpeg params (%s)",
                               strerror( errno ) );
             goto vdev_failed;
         }
@@ -870,94 +1105,127 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
 
         if( ioctl( i_fd, VIDIOCGWIN, &vid_win ) < 0 )
         {
-            msg_Err( p_input, "cannot get win (%s)", strerror( errno ) );
+            msg_Err( p_demux, "cannot get win (%s)", strerror( errno ) );
             goto vdev_failed;
         }
         p_sys->i_width  = vid_win.width;
         p_sys->i_height = vid_win.height;
 
-        msg_Dbg( p_input, "will use %dx%d", p_sys->i_width, p_sys->i_height );
-    }
+        if( !p_sys->i_width || !p_sys->i_height )
+        {
+            p_sys->i_width = p_sys->vid_cap.maxwidth;
+            p_sys->i_height = p_sys->vid_cap.maxheight;
+        }
 
-    p_sys->p_video_frame = NULL;
+        if( !p_sys->i_width || !p_sys->i_height )
+        {
+            msg_Err( p_demux, "invalid video size (%ix%i)",
+                     p_sys->i_width, p_sys->i_height );
+            goto vdev_failed;
+        }
+
+        msg_Dbg( p_demux, "will use %dx%d", p_sys->i_width, p_sys->i_height );
+    }
 
     if( !p_sys->b_mjpeg )
     {
-        /* Find out video format used by device */
+        /* set hue/color/.. */
         if( ioctl( i_fd, VIDIOCGPICT, &p_sys->vid_picture ) == 0 )
         {
-            int i_chroma = VLC_FOURCC( ' ', ' ', ' ', ' ' );
             struct video_picture vid_picture = p_sys->vid_picture;
 
-            /* Try to set the format to something easy to encode */
-            vid_picture.palette = VIDEO_PALETTE_YUV420P;
+            if( p_sys->i_brightness >= 0 && p_sys->i_brightness < 65536 )
+            {
+                vid_picture.brightness = p_sys->i_brightness;
+            }
+            if( p_sys->i_colour >= 0 && p_sys->i_colour < 65536 )
+            {
+                vid_picture.colour = p_sys->i_colour;
+            }
+            if( p_sys->i_hue >= 0 && p_sys->i_hue < 65536 )
+            {
+                vid_picture.hue = p_sys->i_hue;
+            }
+            if( p_sys->i_contrast  >= 0 && p_sys->i_contrast < 65536 )
+            {
+                vid_picture.contrast = p_sys->i_contrast;
+            }
             if( ioctl( i_fd, VIDIOCSPICT, &vid_picture ) == 0 )
+            {
+                msg_Dbg( p_demux, "v4l device uses brightness: %d",
+                         vid_picture.brightness );
+                msg_Dbg( p_demux, "v4l device uses colour: %d",
+                         vid_picture.colour );
+                msg_Dbg( p_demux, "v4l device uses hue: %d", vid_picture.hue );
+                msg_Dbg( p_demux, "v4l device uses contrast: %d",
+                         vid_picture.contrast );
+                p_sys->vid_picture = vid_picture;
+            }
+        }
+
+        /* Find out video format used by device */
+        if( ioctl( i_fd, VIDIOCGPICT, &p_sys->vid_picture ) == 0 )
+        {
+            struct video_picture vid_picture = p_sys->vid_picture;
+            char *psz;
+            int i;
+
+            vid_picture.palette = 0;
+            p_sys->i_fourcc = 0;
+
+            psz = var_CreateGetString( p_demux, "v4l-chroma" );
+            if( strlen( psz ) >= 4 )
+            {
+                int i_chroma = VLC_FOURCC( psz[0], psz[1], psz[2], psz[3] );
+
+                /* Find out v4l chroma code */
+                for( i = 0; v4lchroma_to_fourcc[i].i_v4l != 0; i++ )
+                {
+                    if( v4lchroma_to_fourcc[i].i_fourcc == i_chroma )
+                    {
+                        vid_picture.palette = v4lchroma_to_fourcc[i].i_v4l;
+                        break;
+                    }
+                }
+            }
+            free( psz );
+
+            if( vid_picture.palette &&
+                !ioctl( i_fd, VIDIOCSPICT, &vid_picture ) )
             {
                 p_sys->vid_picture = vid_picture;
             }
             else
             {
-                vid_picture.palette = VIDEO_PALETTE_YUV422P;
+                /* Try to set the format to something easy to encode */
+                vid_picture.palette = VIDEO_PALETTE_YUV420P;
                 if( ioctl( i_fd, VIDIOCSPICT, &vid_picture ) == 0 )
                 {
                     p_sys->vid_picture = vid_picture;
                 }
+                else
+                {
+                    vid_picture.palette = VIDEO_PALETTE_YUV422P;
+                    if( ioctl( i_fd, VIDIOCSPICT, &vid_picture ) == 0 )
+                    {
+                        p_sys->vid_picture = vid_picture;
+                    }
+                }
             }
 
             /* Find out final format */
-            switch( p_sys->vid_picture.palette )
+            for( i = 0; v4lchroma_to_fourcc[i].i_v4l != 0; i++ )
             {
-            case VIDEO_PALETTE_GREY:
-                i_chroma = VLC_FOURCC( 'G', 'R', 'E', 'Y' );
-                break;
-            case VIDEO_PALETTE_HI240:
-                i_chroma = VLC_FOURCC( 'I', '2', '4', '0' );
-                break;
-            case VIDEO_PALETTE_RGB565:
-                i_chroma = VLC_FOURCC( 'R', 'V', '1', '6' );
-                break;
-            case VIDEO_PALETTE_RGB555:
-                i_chroma = VLC_FOURCC( 'R', 'V', '1', '5' );
-                break;
-            case VIDEO_PALETTE_RGB24:
-                i_chroma = VLC_FOURCC( 'R', 'V', '2', '4' );
-                break;
-            case VIDEO_PALETTE_RGB32:
-                i_chroma = VLC_FOURCC( 'R', 'V', '3', '2' );
-                break;
-            case VIDEO_PALETTE_YUV422:
-                i_chroma = VLC_FOURCC( 'I', '4', '2', '2' );
-                break;
-            case VIDEO_PALETTE_YUYV:
-                i_chroma = VLC_FOURCC( 'Y', 'U', 'Y', 'V' );
-                break;
-            case VIDEO_PALETTE_UYVY:
-                i_chroma = VLC_FOURCC( 'U', 'Y', 'V', 'Y' );
-                break;
-            case VIDEO_PALETTE_YUV420:
-                i_chroma = VLC_FOURCC( 'I', '4', '2', 'N' );
-                break;
-            case VIDEO_PALETTE_YUV411:
-                i_chroma = VLC_FOURCC( 'I', '4', '1', 'N' );
-                break;
-            case VIDEO_PALETTE_RAW:
-                i_chroma = VLC_FOURCC( 'G', 'R', 'A', 'W' );
-                break;
-            case VIDEO_PALETTE_YUV422P:
-                i_chroma = VLC_FOURCC( 'I', '4', '2', '2' );
-                break;
-            case VIDEO_PALETTE_YUV420P:
-                i_chroma = VLC_FOURCC( 'I', '4', '2', '0' );
-                break;
-            case VIDEO_PALETTE_YUV411P:
-                i_chroma = VLC_FOURCC( 'I', '4', '1', '1' );
-                break;
+                if( v4lchroma_to_fourcc[i].i_v4l == p_sys->vid_picture.palette)
+                {
+                    p_sys->i_fourcc = v4lchroma_to_fourcc[i].i_fourcc;
+                    break;
+                }
             }
-            p_sys->i_fourcc = i_chroma;
         }
         else
         {
-            msg_Err( p_input, "ioctl VIDIOCGPICT failed" );
+            msg_Err( p_demux, "ioctl VIDIOCGPICT failed" );
             goto vdev_failed;
         }
     }
@@ -971,7 +1239,7 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
 
         if( ioctl( i_fd, MJPIOC_REQBUFS, &p_sys->mjpeg_buffers ) < 0 )
         {
-            msg_Err( p_input, "mmap unsupported" );
+            msg_Err( p_demux, "mmap unsupported" );
             goto vdev_failed;
         }
 
@@ -980,7 +1248,7 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
                 PROT_READ | PROT_WRITE, MAP_SHARED, i_fd, 0 );
         if( p_sys->p_video_mmap == MAP_FAILED )
         {
-            msg_Err( p_input, "mmap failed" );
+            msg_Err( p_demux, "mmap failed" );
             goto vdev_failed;
         }
 
@@ -992,7 +1260,7 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
         {
             if( ioctl( i_fd, MJPIOC_QBUF_CAPT, &i ) < 0 )
             {
-                msg_Err( p_input, "unable to queue frame" );
+                msg_Err( p_demux, "unable to queue frame" );
                 goto vdev_failed;
             }
         }
@@ -1000,30 +1268,30 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
     else
     {
         /* Fill in picture_t fields */
-        vout_InitPicture( VLC_OBJECT(p_input), &p_sys->pic, p_sys->i_fourcc,
+        vout_InitPicture( VLC_OBJECT(p_demux), &p_sys->pic, p_sys->i_fourcc,
                           p_sys->i_width, p_sys->i_height, p_sys->i_width *
                           VOUT_ASPECT_FACTOR / p_sys->i_height );
         if( !p_sys->pic.i_planes )
         {
-            msg_Err( p_input, "unsupported chroma" );
+            msg_Err( p_demux, "unsupported chroma" );
             goto vdev_failed;
         }
         p_sys->i_video_frame_size = 0;
         for( i = 0; i < p_sys->pic.i_planes; i++ )
         {
-            p_sys->i_video_frame_size += p_sys->pic.p[i].i_lines *
+            p_sys->i_video_frame_size += p_sys->pic.p[i].i_visible_lines *
               p_sys->pic.p[i].i_visible_pitch;
         }
 
-        msg_Dbg( p_input, "v4l device uses frame size: %i",
+        msg_Dbg( p_demux, "v4l device uses frame size: %i",
                  p_sys->i_video_frame_size );
-        msg_Dbg( p_input, "v4l device uses chroma: %4.4s",
+        msg_Dbg( p_demux, "v4l device uses chroma: %4.4s",
                 (char*)&p_sys->i_fourcc );
 
         /* Allocate mmap buffer */
         if( ioctl( i_fd, VIDIOCGMBUF, &p_sys->vid_mbuf ) < 0 )
         {
-            msg_Err( p_input, "mmap unsupported" );
+            msg_Err( p_demux, "mmap unsupported" );
             goto vdev_failed;
         }
 
@@ -1033,7 +1301,7 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
         if( p_sys->p_video_mmap == MAP_FAILED )
         {
             /* FIXME -> normal read */
-            msg_Err( p_input, "mmap failed" );
+            msg_Err( p_demux, "mmap failed" );
             goto vdev_failed;
         }
 
@@ -1044,8 +1312,8 @@ int OpenVideoDev( input_thread_t *p_input, char *psz_device )
         p_sys->vid_mmap.format = p_sys->vid_picture.palette;
         if( ioctl( i_fd, VIDIOCMCAPTURE, &p_sys->vid_mmap ) < 0 )
         {
-            msg_Warn( p_input, "%4.4s refused", (char*)&p_sys->i_fourcc );
-            msg_Err( p_input, "chroma selection failed" );
+            msg_Warn( p_demux, "%4.4s refused", (char*)&p_sys->i_fourcc );
+            msg_Err( p_demux, "chroma selection failed" );
             goto vdev_failed;
         }
     }
@@ -1060,14 +1328,14 @@ vdev_failed:
 /*****************************************************************************
  * OpenAudioDev:
  *****************************************************************************/
-int OpenAudioDev( input_thread_t *p_input, char *psz_device )
+static int OpenAudioDev( demux_t *p_demux, char *psz_device )
 {
-    access_sys_t *p_sys = p_input->p_access_data;
+    demux_sys_t *p_sys = p_demux->p_sys;
     int i_fd, i_format;
 
     if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 )
     {
-        msg_Err( p_input, "cannot open audio device (%s)", strerror( errno ) );
+        msg_Err( p_demux, "cannot open audio device (%s)", strerror( errno ) );
         goto adev_fail;
     }
 
@@ -1075,7 +1343,7 @@ int OpenAudioDev( input_thread_t *p_input, char *psz_device )
     if( ioctl( i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
         || i_format != AFMT_S16_LE )
     {
-        msg_Err( p_input, "cannot set audio format (16b little endian) "
+        msg_Err( p_demux, "cannot set audio format (16b little endian) "
                  "(%s)", strerror( errno ) );
         goto adev_fail;
     }
@@ -1083,7 +1351,7 @@ int OpenAudioDev( input_thread_t *p_input, char *psz_device )
     if( ioctl( i_fd, SNDCTL_DSP_STEREO,
                &p_sys->b_stereo ) < 0 )
     {
-        msg_Err( p_input, "cannot set audio channels count (%s)",
+        msg_Err( p_demux, "cannot set audio channels count (%s)",
                  strerror( errno ) );
         goto adev_fail;
     }
@@ -1091,18 +1359,16 @@ int OpenAudioDev( input_thread_t *p_input, char *psz_device )
     if( ioctl( i_fd, SNDCTL_DSP_SPEED,
                &p_sys->i_sample_rate ) < 0 )
     {
-        msg_Err( p_input, "cannot set audio sample rate (%s)",
+        msg_Err( p_demux, "cannot set audio sample rate (%s)",
                  strerror( errno ) );
         goto adev_fail;
     }
 
-    msg_Dbg( p_input, "openened adev=`%s' %s %dHz",
+    msg_Dbg( p_demux, "openened adev=`%s' %s %dHz",
              psz_device, p_sys->b_stereo ? "stereo" : "mono",
              p_sys->i_sample_rate );
 
-    p_sys->i_audio_frame_size = 0;
-    p_sys->i_audio_frame_size_allocated = 6*1024;
-    p_sys->p_audio_frame = malloc( p_sys->i_audio_frame_size_allocated );
+    p_sys->i_audio_max_frame_size = 6 * 1024;
 
     return i_fd;
 
@@ -1113,114 +1379,91 @@ int OpenAudioDev( input_thread_t *p_input, char *psz_device )
 }
 
 /*****************************************************************************
- * AccessClose: close device, free resources
+ * GrabAudio: grab audio
  *****************************************************************************/
-static void AccessClose( vlc_object_t *p_this )
+static block_t *GrabAudio( demux_t *p_demux )
 {
-    input_thread_t *p_input = (input_thread_t *)p_this;
-    access_sys_t   *p_sys   = p_input->p_access_data;
-
-    if( p_sys->psz_device ) free( p_sys->psz_device );
-    if( p_sys->psz_vdev )   free( p_sys->psz_vdev );
-    if( p_sys->psz_adev )   free( p_sys->psz_adev );
-    if( p_sys->fd_video >= 0 ) close( p_sys->fd_video );
-    if( p_sys->fd_audio >= 0 ) close( p_sys->fd_audio );
-
-    if( p_sys->p_header ) free( p_sys->p_header );
-    if( p_sys->p_audio_frame ) free( p_sys->p_audio_frame );
+    demux_sys_t *p_sys = p_demux->p_sys;
+    struct audio_buf_info buf_info;
+    int i_read, i_correct;
+    block_t *p_block;
 
-    if( p_sys->b_mjpeg )
-    {
-        int i_noframe = -1;
-        ioctl( p_sys->fd_video, MJPIOC_QBUF_CAPT, &i_noframe );
-    }
+    if( p_sys->p_block_audio ) p_block = p_sys->p_block_audio;
+    else p_block = block_New( p_demux, p_sys->i_audio_max_frame_size );
 
-    if( p_sys->p_video_mmap && p_sys->p_video_mmap != MAP_FAILED )
+    if( !p_block )
     {
-        if( p_sys->b_mjpeg )
-            munmap( p_sys->p_video_mmap, p_sys->mjpeg_buffers.size *
-                    p_sys->mjpeg_buffers.count );
-        else
-            munmap( p_sys->p_video_mmap, p_sys->vid_mbuf.size );
+        msg_Warn( p_demux, "cannot get block" );
+        return 0;
     }
 
-    free( p_sys );
-}
+    p_sys->p_block_audio = p_block;
 
-/*****************************************************************************
- * GrabAudio: grab audio
- *****************************************************************************/
-static int GrabAudio( input_thread_t * p_input,
-                      uint8_t **pp_data,
-                      int      *pi_data,
-                      mtime_t  *pi_pts )
-{
-    access_sys_t    *p_sys   = p_input->p_access_data;
-    struct audio_buf_info buf_info;
-    int i_read;
-    int i_correct;
-
-    i_read = read( p_sys->fd_audio, p_sys->p_audio_frame,
-                   p_sys->i_audio_frame_size_allocated );
+    i_read = read( p_sys->fd_audio, p_block->p_buffer,
+                   p_sys->i_audio_max_frame_size );
 
-    if( i_read <= 0 )
-    {
-        return VLC_EGENERIC;
-    }
+    if( i_read <= 0 ) return 0;
 
-    p_sys->i_audio_frame_size = i_read;
+    p_block->i_buffer = i_read;
+    p_sys->p_block_audio = 0;
 
-    /* from vls : correct the date because of kernel buffering */
+    /* Correct the date because of kernel buffering */
     i_correct = i_read;
     if( ioctl( p_sys->fd_audio, SNDCTL_DSP_GETISPACE, &buf_info ) == 0 )
     {
         i_correct += buf_info.bytes;
     }
 
+    p_block->i_pts = p_block->i_dts =
+        mdate() - I64C(1000000) * (mtime_t)i_correct /
+        2 / ( p_sys->b_stereo ? 2 : 1) / p_sys->i_sample_rate;
 
-    *pp_data = p_sys->p_audio_frame;
-    *pi_data = p_sys->i_audio_frame_size;
-    *pi_pts  = mdate() - (mtime_t)1000000 * (mtime_t)i_correct /
-                         2 / ( p_sys->b_stereo ? 2 : 1) / p_sys->i_sample_rate;
-    return VLC_SUCCESS;
+    return p_block;
 }
 
 /*****************************************************************************
  * GrabVideo:
  *****************************************************************************/
-static uint8_t *GrabCapture( input_thread_t *p_input )
+static uint8_t *GrabCapture( demux_t *p_demux )
 {
-    access_sys_t *p_sys = p_input->p_access_data;
-    p_sys->vid_mmap.frame = ( p_sys->i_frame_pos + 1 ) %
-                            p_sys->vid_mbuf.frames;
-    for( ;; )
+    demux_sys_t *p_sys = p_demux->p_sys;
+    int i_captured_frame = p_sys->i_frame_pos;
+
+    p_sys->vid_mmap.frame = (p_sys->i_frame_pos + 1) % p_sys->vid_mbuf.frames;
+
+    while( ioctl( p_sys->fd_video, VIDIOCMCAPTURE, &p_sys->vid_mmap ) < 0 )
     {
-        if( ioctl( p_sys->fd_video, VIDIOCMCAPTURE, &p_sys->vid_mmap ) >= 0 )
+        if( errno != EAGAIN )
         {
-            break;
+            msg_Err( p_demux, "failed capturing new frame" );
+            return NULL;
         }
 
-        if( errno != EAGAIN )
+        if( p_demux->b_die )
         {
-            msg_Err( p_input, "failed while grabbing new frame" );
-            return( NULL );
+            return NULL;
         }
-        msg_Dbg( p_input, "another try ?" );
-    }
 
-    //msg_Warn( p_input, "grab a new frame" );
+        msg_Dbg( p_demux, "grab failed, trying again" );
+    }
 
-    while( ioctl(p_sys->fd_video, VIDIOCSYNC, &p_sys->i_frame_pos) < 0 &&
-           ( errno == EAGAIN || errno == EINTR ) );
+    while( ioctl(p_sys->fd_video, VIDIOCSYNC, &p_sys->i_frame_pos) < 0 )
+    {
+        if( errno != EAGAIN && errno != EINTR )    
+        {
+            msg_Err( p_demux, "failed syncing new frame" );
+            return NULL;
+        }
+    }
 
     p_sys->i_frame_pos = p_sys->vid_mmap.frame;
     /* leave i_video_frame_size alone */
-    return p_sys->p_video_mmap + p_sys->vid_mbuf.offsets[p_sys->i_frame_pos];
+    return p_sys->p_video_mmap + p_sys->vid_mbuf.offsets[i_captured_frame];
 }
 
-static uint8_t *GrabMJPEG( input_thread_t *p_input )
+static uint8_t *GrabMJPEG( demux_t *p_demux )
 {
-    access_sys_t *p_sys = p_input->p_access_data;
+    demux_sys_t *p_sys = p_demux->p_sys;
     struct mjpeg_sync sync;
     uint8_t *p_frame, *p_field, *p;
     uint16_t tag;
@@ -1229,12 +1472,27 @@ static uint8_t *GrabMJPEG( input_thread_t *p_input )
 
     /* re-queue the last frame we sync'd */
     if( p_sys->i_frame_pos != -1 )
-        while( ioctl( p_sys->fd_video, MJPIOC_QBUF_CAPT, &p_sys->i_frame_pos ) < 0 &&
-                ( errno == EAGAIN || errno == EINTR ) );
+    {
+        while( ioctl( p_sys->fd_video, MJPIOC_QBUF_CAPT,
+                                       &p_sys->i_frame_pos ) < 0 )
+        {
+            if( errno != EAGAIN && errno != EINTR )
+            {
+                msg_Err( p_demux, "failed capturing new frame" );
+                return NULL;
+            }
+        }
+    }
 
     /* sync on the next frame */
-    while( ioctl( p_sys->fd_video, MJPIOC_SYNC, &sync ) < 0 &&
-            ( errno == EAGAIN || errno == EINTR ) );
+    while( ioctl( p_sys->fd_video, MJPIOC_SYNC, &sync ) < 0 )
+    {
+        if( errno != EAGAIN && errno != EINTR )    
+        {
+            msg_Err( p_demux, "failed syncing new frame" );
+            return NULL;
+        }
+    }
 
     p_sys->i_frame_pos = sync.frame;
     p_frame = p_sys->p_video_mmap + p_sys->mjpeg_buffers.size * sync.frame;
@@ -1305,360 +1563,33 @@ static uint8_t *GrabMJPEG( input_thread_t *p_input )
     return p_frame;
 }
 
-static int GrabVideo( input_thread_t * p_input,
-                      uint8_t **pp_data,
-                      int *pi_data,
-                      mtime_t  *pi_pts )
+static block_t *GrabVideo( demux_t *p_demux )
 {
-    access_sys_t *p_sys   = p_input->p_access_data;
-    uint8_t      *p_frame;
-
+    demux_sys_t *p_sys = p_demux->p_sys;
+    uint8_t     *p_frame;
+    block_t     *p_block;
 
     if( p_sys->f_fps >= 0.1 && p_sys->i_video_pts > 0 )
     {
         mtime_t i_dur = (mtime_t)((double)1000000 / (double)p_sys->f_fps);
 
-        /* Dif we wait long enougth ? */
-        if( p_sys->i_video_pts + i_dur > mdate() )
-        {
-            return VLC_EGENERIC;
-        }
+        /* Did we wait long enough ? (frame rate reduction) */
+        if( p_sys->i_video_pts + i_dur > mdate() ) return 0;
     }
 
-    if( p_sys->b_mjpeg )
-        p_frame = GrabMJPEG( p_input );
-    else
-        p_frame = GrabCapture( p_input );
-
-    if( !p_frame )
-        return VLC_EGENERIC;
-
-    p_sys->i_video_pts   = mdate();
-    p_sys->p_video_frame = p_frame;
-
-    *pp_data = p_sys->p_video_frame;
-    *pi_data = p_sys->i_video_frame_size;
-    *pi_pts  = p_sys->i_video_pts;
-
-    return VLC_SUCCESS;
-}
+    if( p_sys->b_mjpeg ) p_frame = GrabMJPEG( p_demux );
+    else p_frame = GrabCapture( p_demux );
 
-/*****************************************************************************
- * Read: reads from the device into PES packets.
- *****************************************************************************
- * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
- * bytes.
- *****************************************************************************/
-static int Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
-{
-    access_sys_t *p_sys = p_input->p_access_data;
-    int          i_data = 0;
-    int          i_stream;
-    mtime_t      i_pts;
+    if( !p_frame ) return 0;
 
-    while( i_len > 0 )
+    if( !( p_block = block_New( p_demux, p_sys->i_video_frame_size ) ) )
     {
-        /* First copy header if any */
-        if( i_len > 0 && p_sys->i_header_pos < p_sys->i_header_size )
-        {
-            int i_copy;
-
-            i_copy = __MIN( p_sys->i_header_size - p_sys->i_header_pos,
-                            (int)i_len );
-            memcpy( p_buffer, &p_sys->p_header[p_sys->i_header_pos], i_copy );
-            p_sys->i_header_pos += i_copy;
-
-            p_buffer += i_copy;
-            i_len -= i_copy;
-            i_data += i_copy;
-        }
-
-        /* then data */
-        if( i_len > 0 && p_sys->i_data_pos < p_sys->i_data_size )
-        {
-            int i_copy;
-
-            i_copy = __MIN( p_sys->i_data_size - p_sys->i_data_pos,
-                            (int)i_len );
-
-            memcpy( p_buffer, &p_sys->p_data[p_sys->i_data_pos], i_copy );
-            p_sys->i_data_pos += i_copy;
-
-            p_buffer += i_copy;
-            i_len -= i_copy;
-            i_data += i_copy;
-        }
-
-        /* The caller got what he wanted */
-        if( i_len <= 0 )
-        {
-            return( i_data );
-        }
-
-        /* Read no more than one frame at a time.
-         * That kills latency, especially for encoded v4l streams */
-        if( p_sys->i_data_size && p_sys->i_data_pos == p_sys->i_data_size )
-        {
-            p_sys->i_data_pos = 0; p_sys->i_data_size = 0;
-            return( i_data );
-        }
-
-        /* Re-fill data by grabbing audio/video */
-        p_sys->i_data_pos = 0;
-
-        /* Try grabbing audio frames first */
-        i_stream = p_sys->i_streams - 1;
-        if( p_sys->fd_audio < 0 ||
-            GrabAudio( p_input, &p_sys->p_data,
-                       &p_sys->i_data_size, &i_pts ) != VLC_SUCCESS )
-        {
-            /* Try grabbing video frame */
-            i_stream = 0;
-            if( p_sys->fd_video < 0 ||
-                GrabVideo( p_input, &p_sys->p_data,
-                           &p_sys->i_data_size, &i_pts ) != VLC_SUCCESS )
-            {
-                /* Sleep so we do not consume all the cpu, 10ms seems
-                 * like a good value (100fps) */
-                msleep( 10000 );
-            }
-        }
-
-        /* create pseudo header */
-        p_sys->i_header_size = 16;
-        p_sys->i_header_pos  = 0;
-        SetDWBE( &p_sys->p_header[0], i_stream );
-        SetDWBE( &p_sys->p_header[4], p_sys->i_data_size );
-        SetQWBE( &p_sys->p_header[8], i_pts );
-    }
-
-    return i_data;
-}
-
-/****************************************************************************
- * I. Demux Part
- ****************************************************************************/
-static int DemuxOpen( vlc_object_t *p_this )
-{
-    input_thread_t *p_input = (input_thread_t *)p_this;
-
-    uint8_t        *p_peek;
-    int            i_streams;
-    int            i;
-
-    data_packet_t  *p_pk;
-
-    /* Initialize access plug-in structures. */
-    if( p_input->i_mtu == 0 )
-    {
-        /* Improve speed. */
-        p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE ;
-    }
-
-    /* a little test to see if it's a v4l stream */
-    if( input_Peek( p_input, &p_peek, 8 ) < 8 )
-    {
-        msg_Warn( p_input, "v4l plugin discarded (cannot peek)" );
-        return VLC_EGENERIC;
-    }
-
-    if( strncmp( p_peek, ".v4l", 4 ) || GetDWBE( &p_peek[4] ) <= 0 )
-    {
-        msg_Warn( p_input, "v4l plugin discarded (not a valid stream)" );
-        return VLC_EGENERIC;
-    }
-
-    /*  create one program */
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    if( input_InitStream( p_input, 0 ) == -1)
-    {
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-        msg_Err( p_input, "cannot init stream" );
-        return( VLC_EGENERIC );
-    }
-    if( input_AddProgram( p_input, 0, 0) == NULL )
-    {
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-        msg_Err( p_input, "cannot add program" );
-        return VLC_EGENERIC;
-    }
-
-    p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
-    p_input->stream.i_mux_rate =  0;
-
-    i_streams = GetDWBE( &p_peek[4] );
-    if( input_Peek( p_input, &p_peek, 8 + 20 * i_streams )
-        < 8 + 20 * i_streams )
-    {
-        msg_Err( p_input, "v4l plugin discarded (cannot peek)" );
-        return VLC_EGENERIC;
+        msg_Warn( p_demux, "cannot get block" );
+        return 0;
     }
-    p_peek += 8;
 
-    for( i = 0; i < i_streams; i++ )
-    {
-        es_descriptor_t *p_es;
+    memcpy( p_block->p_buffer, p_frame, p_sys->i_video_frame_size );
+    p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate();
 
-        if( !strncmp( p_peek, "auds", 4 ) )
-        {
-#define wf ((WAVEFORMATEX*)p_es->p_waveformatex)
-            p_es = input_AddES( p_input, p_input->stream.pp_programs[0],
-                                i + 1, AUDIO_ES, NULL, 0 );
-            p_es->i_stream_id   = i + 1;
-            p_es->i_fourcc      =
-                VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] );
-
-            p_es->p_waveformatex= malloc( sizeof( WAVEFORMATEX ) );
-
-            wf->wFormatTag      = WAVE_FORMAT_UNKNOWN;
-            wf->nChannels       = GetDWBE( &p_peek[8] );
-            wf->nSamplesPerSec  = GetDWBE( &p_peek[12] );
-            wf->wBitsPerSample  = GetDWBE( &p_peek[16] );
-            wf->nBlockAlign     = wf->wBitsPerSample * wf->nChannels / 8;
-            wf->nAvgBytesPerSec = wf->nBlockAlign * wf->nSamplesPerSec;
-            wf->cbSize          = 0;
-
-            msg_Dbg( p_input, "added new audio es %d channels %dHz",
-                     wf->nChannels, wf->nSamplesPerSec );
-
-            input_SelectES( p_input, p_es );
-#undef wf
-        }
-        else if( !strncmp( p_peek, "vids", 4 ) )
-        {
-#define bih ((BITMAPINFOHEADER*)p_es->p_bitmapinfoheader)
-            p_es = input_AddES( p_input, p_input->stream.pp_programs[0],
-                                i + 1, VIDEO_ES, NULL, 0 );
-            p_es->i_stream_id   = i + 1;
-            p_es->i_fourcc  =
-                VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] );
-
-            p_es->p_bitmapinfoheader = malloc( sizeof( BITMAPINFOHEADER ) );
-
-            bih->biSize     = sizeof( BITMAPINFOHEADER );
-            bih->biWidth    = GetDWBE( &p_peek[8] );
-            bih->biHeight   = GetDWBE( &p_peek[12] );
-            bih->biPlanes   = 0;
-            bih->biBitCount = 0;
-            bih->biCompression      = 0;
-            bih->biSizeImage= 0;
-            bih->biXPelsPerMeter    = 0;
-            bih->biYPelsPerMeter    = 0;
-            bih->biClrUsed  = 0;
-            bih->biClrImportant     = 0;
-
-            msg_Dbg( p_input, "added new video es %4.4s %dx%d",
-                     (char*)&p_es->i_fourcc, bih->biWidth, bih->biHeight );
-
-            input_SelectES( p_input, p_es );
-#undef bih
-        }
-
-        p_peek += 20;
-    }
-
-    p_input->stream.p_selected_program->b_is_ok = 1;
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-
-    if( input_SplitBuffer( p_input, &p_pk, 8 + i_streams * 20 ) > 0 )
-    {
-        input_DeletePacket( p_input->p_method_data, p_pk );
-    }
-
-    p_input->pf_demux = Demux;
-    p_input->pf_demux_control = demux_vaControlDefault;
-    return VLC_SUCCESS;
-}
-
-static void DemuxClose( vlc_object_t *p_this )
-{
-    return;
-}
-
-#define MAX_PACKETS_IN_FIFO 3
-
-static int Demux( input_thread_t *p_input )
-{
-    es_descriptor_t *p_es;
-    pes_packet_t    *p_pes;
-
-    int i_stream;
-    int i_size;
-
-    uint8_t *p_peek;
-    mtime_t i_pts;
-
-    if( input_Peek( p_input, &p_peek, 16 ) < 16 )
-    {
-        msg_Warn( p_input, "cannot peek (EOF ?)" );
-        return( 0 );
-    }
-
-    i_stream = GetDWBE( &p_peek[0] );
-    i_size   = GetDWBE( &p_peek[4] );
-    i_pts    = GetQWBE( &p_peek[8] );
-
-    p_es = p_input->stream.p_selected_program->pp_es[i_stream];
-    if( !p_es )
-    {
-        msg_Err( p_input, "cannot find ES" );
-    }
-
-    p_pes = input_NewPES( p_input->p_method_data );
-    if( p_pes == NULL )
-    {
-        msg_Warn( p_input, "cannot allocate PES" );
-        msleep( 1000 );
-        return( 1 );
-    }
-    i_size += 16;
-    while( i_size > 0 )
-    {
-        data_packet_t   *p_data;
-        int i_read;
-
-        if( (i_read = input_SplitBuffer( p_input, &p_data,
-                                         __MIN( i_size, 10000 ) ) ) <= 0 )
-        {
-            input_DeletePES( p_input->p_method_data, p_pes );
-            return( 0 );
-        }
-        if( !p_pes->p_first )
-        {
-            p_pes->p_first = p_data;
-            p_pes->i_nb_data = 1;
-            p_pes->i_pes_size = i_read;
-        }
-        else
-        {
-            p_pes->p_last->p_next  = p_data;
-            p_pes->i_nb_data++;
-            p_pes->i_pes_size += i_read;
-        }
-        p_pes->p_last  = p_data;
-        i_size -= i_read;
-    }
-    p_pes->p_first->p_payload_start += 16;
-    p_pes->i_pes_size               -= 16;
-
-    if( p_es && p_es->p_decoder_fifo )
-    {
-        vlc_mutex_lock( &p_es->p_decoder_fifo->data_lock );
-        if( p_es->p_decoder_fifo->i_depth >= MAX_PACKETS_IN_FIFO )
-        {
-            /* Wait for the decoder. */
-            vlc_cond_wait( &p_es->p_decoder_fifo->data_wait,
-                           &p_es->p_decoder_fifo->data_lock );
-        }
-        vlc_mutex_unlock( &p_es->p_decoder_fifo->data_lock );
-        p_pes->i_pts = p_pes->i_dts = i_pts + p_input->i_pts_delay;
-
-        input_DecodePES( p_es->p_decoder_fifo, p_pes );
-    }
-    else
-    {
-        input_DeletePES( p_input->p_method_data, p_pes );
-    }
-
-    return 1;
+    return p_block;
 }