X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fv4l%2Fv4l.c;h=de0cb79206f9c5c23e460a471cd46936662cddd2;hb=08be895ad56325bb18277bcc55a658e9d6cd04bf;hp=c9e781bf4dfa1aee87ef44106acff4ef28f21e6a;hpb=4363f75abf93c34cb68f83ad93370bf2df5ba51e;p=vlc

diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l/v4l.c
index c9e781bf4d..de0cb79206 100644
--- a/modules/access/v4l/v4l.c
+++ b/modules/access/v4l/v4l.c
@@ -1,11 +1,12 @@
 /*****************************************************************************
  * v4l.c : Video4Linux input module for vlc
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: v4l.c,v 1.27 2003/10/25 20:19:19 fenrir Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
  *
  * Author: Laurent Aimar <fenrir@via.ecp.fr>
  *         Paul Forgey <paulf at aphrodite dot com>
+ *         Gildas Bazin <gbazin@videolan.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
@@ -40,53 +41,94 @@
 #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
+ * Module descriptior
  *****************************************************************************/
-static int  AccessOpen  ( vlc_object_t * );
-static void AccessClose ( vlc_object_t * );
-static int  Read        ( input_thread_t *, byte_t *, size_t );
+static int  AccessOpen ( vlc_object_t * );
+static void AccessClose( vlc_object_t * );
 
 static int  DemuxOpen  ( vlc_object_t * );
 static void DemuxClose ( vlc_object_t * );
-static int  Demux      ( input_thread_t * );
 
-
-/*****************************************************************************
- * Module descriptior
- *****************************************************************************/
 #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." )
+    "value should be set in millisecond units." )
+#define VDEV_TEXT N_("Video device name")
+#define VDEV_LONGTEXT N_( \
+    "Specify the name of the video device that will be used. " \
+    "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 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.)")
 
 vlc_module_begin();
+    set_shortname( _("Video4Linux") );
     set_description( _("Video4Linux input") );
-    add_category_hint( N_("v4l"), NULL, VLC_TRUE );
+
     add_integer( "v4l-caching", DEFAULT_PTS_DELAY / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+    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_shortcut( "v4l" );
-    set_capability( "access", 10 );
+    set_capability( "access2", 10 );
     set_callbacks( AccessOpen, AccessClose );
 
     add_submodule();
         set_description( _("Video4Linux demuxer") );
         add_shortcut( "v4l" );
-        set_capability( "demux", 200 );
+        set_capability( "demux2", 20 );
         set_callbacks( DemuxOpen, DemuxClose );
 vlc_module_end();
 
 
-/****************************************************************************
- * I. Access Part
- ****************************************************************************/
+/*****************************************************************************
+ * Access: local prototypes
+ *****************************************************************************/
+static int AccessRead   ( access_t *, uint8_t *, int );
+static int AccessControl( access_t *, int, va_list );
+
+
+static void ParseMRL    ( access_t * );
+static int  OpenVideoDev( access_t *, char * );
+static int  OpenAudioDev( access_t *, char * );
+
+static int GrabAudio( access_t *, uint8_t **, int *, mtime_t * );
+static int GrabVideo( access_t *, uint8_t **, int *, mtime_t * );
+
+
 #define MJPEG_BUFFER_SIZE (256*1024)
 
 struct quicktime_mjpeg_app1
@@ -103,12 +145,44 @@ struct quicktime_mjpeg_app1
     uint32_t    i_data_offset;          /* following SOS marker data */
 };
 
+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 access_sys_t
 {
-    char    *psz_video_device;
-    int     fd;
+    /* Devices */
+    char *psz_device;         /* Main device from MRL, can be video or audio */
+
+    char *psz_vdev;
+    int  fd_video;
 
-    picture_t       pic;
+    char *psz_adev;
+    int  fd_audio;
+
+    /* Video properties */
+    picture_t pic;
 
     int i_fourcc;
     int i_channel;
@@ -119,6 +193,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 */
 
@@ -140,8 +219,7 @@ struct access_sys_t
     int     i_video_frame_size;
     int     i_video_frame_size_allocated;
 
-    char         *psz_adev;
-    int          fd_audio;
+    /* Audio properties */
     vlc_fourcc_t i_acodec_raw;
     int          i_sample_rate;
     vlc_bool_t   b_stereo;
@@ -151,6 +229,7 @@ struct access_sys_t
     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
@@ -159,7 +238,6 @@ struct access_sys_t
     int     i_data_size;
     int     i_data_pos;
     uint8_t *p_data;        // never allocated
-
 };
 
 /*
@@ -183,7 +261,7 @@ struct access_sys_t
  *  u8      data
  */
 
-static void    SetDWBE( uint8_t *p, uint32_t dw )
+static void SetDWBE( uint8_t *p, uint32_t dw )
 {
     p[0] = (dw >> 24)&0xff;
     p[1] = (dw >> 16)&0xff;
@@ -191,14 +269,14 @@ static void    SetDWBE( uint8_t *p, uint32_t dw )
     p[3] = (dw      )&0xff;
 }
 
-static void    SetQWBE( uint8_t *p, uint64_t qw )
+static void SetQWBE( uint8_t *p, uint64_t qw )
 {
     SetDWBE( p,     (qw >> 32)&0xffffffff );
     SetDWBE( &p[4], qw&0xffffffff);
 }
 
 /*****************************************************************************
- * Open: open device:
+ * AccessOpen: opens v4l device
  *****************************************************************************
  *
  * url: <video device>::::
@@ -206,50 +284,378 @@ static void    SetQWBE( uint8_t *p, uint64_t qw )
  *****************************************************************************/
 static int AccessOpen( vlc_object_t *p_this )
 {
-    input_thread_t *p_input = (input_thread_t *)p_this;
-    access_sys_t   *p_sys;
-    char           *psz_dup, *psz_parser;
-    struct mjpeg_params mjpeg;
-    int i;
-
-    struct video_channel    vid_channel;
-
-    /* create access private data */
-    p_sys = malloc( sizeof( access_sys_t ) );
+    access_t     *p_access = (access_t*)p_this;
+    access_sys_t *p_sys;
+
+    /* Set up p_access */
+    p_access->pf_read = AccessRead;
+    p_access->pf_block = NULL;
+    p_access->pf_control = AccessControl;
+    p_access->pf_seek = NULL;
+    p_access->info.i_update = 0;
+    p_access->info.i_size = 0;
+    p_access->info.i_pos = 0;
+    p_access->info.b_eof = VLC_FALSE;
+    p_access->info.i_title = 0;
+    p_access->info.i_seekpoint = 0;
+    p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
     memset( p_sys, 0, sizeof( access_sys_t ) );
 
-    p_sys->psz_video_device = NULL;
-    p_sys->fd               = -1;
-    p_sys->i_channel        = -1;
     p_sys->i_audio          = -1;
     p_sys->i_norm           = VIDEO_MODE_AUTO;    // auto
     p_sys->i_tuner          = -1;
     p_sys->i_frequency      = -1;
-    p_sys->i_width          = 0;
-    p_sys->i_height         = 0;
 
     p_sys->f_fps            = -1.0;
     p_sys->i_video_pts      = -1;
 
+    p_sys->i_brightness     = -1;
+    p_sys->i_hue            = -1;
+    p_sys->i_colour         = -1;
+    p_sys->i_contrast       = -1;
+
     p_sys->b_mjpeg     = VLC_FALSE;
     p_sys->i_decimation = 1;
     p_sys->i_quality = 100;
 
+    p_sys->i_video_frame_size_allocated = 0;
     p_sys->i_frame_pos = 0;
 
-    p_sys->i_video_frame_size_allocated = 0;
-    p_sys->psz_adev         = NULL;
-    p_sys->fd_audio         = -1;
-    p_sys->i_sample_rate    = 44100;
-    p_sys->b_stereo         = VLC_TRUE;
+    p_sys->p_audio_frame  = 0;
+    p_sys->i_sample_rate  = 44100;
+    p_sys->b_stereo       = VLC_TRUE;
 
+    p_sys->p_header    = NULL;
     p_sys->i_data_size = 0;
     p_sys->i_data_pos  = 0;
     p_sys->p_data      = NULL;
 
-    /* parse url and open device(s) */
-    psz_dup = strdup( p_input->psz_name );
-    psz_parser = psz_dup;
+    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_access );
+
+    /* Find main device (video or audio) */
+    if( p_sys->psz_device && *p_sys->psz_device )
+    {
+        msg_Dbg( p_access, "main device=`%s'", p_sys->psz_device );
+
+        /* Try to open as video device */
+        p_sys->fd_video = OpenVideoDev( p_access, p_sys->psz_device );
+
+        if( p_sys->fd_video < 0 )
+        {
+            /* Try to open as audio device */
+            p_sys->fd_audio = OpenAudioDev( p_access, p_sys->psz_device );
+            if( p_sys->fd_audio >= 0 )
+            {
+                if( p_sys->psz_adev ) free( p_sys->psz_adev );
+                p_sys->psz_adev = p_sys->psz_device;
+                p_sys->psz_device = NULL;
+            }
+        }
+        else
+        {
+            if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
+            p_sys->psz_vdev = p_sys->psz_device;
+            p_sys->psz_device = NULL;
+        }
+    }
+
+    /* If no device opened, only continue if the access was forced */
+    if( p_sys->fd_video < 0 && p_sys->fd_audio < 0 )
+    {
+        if( strcmp( p_access->psz_access, "v4l" ) )
+        {
+            AccessClose( p_this );
+            return VLC_EGENERIC;
+        }
+    }
+
+    /* Find video device */
+    if( p_sys->fd_video < 0 )
+    {
+        if( !p_sys->psz_vdev || !*p_sys->psz_vdev )
+        {
+            if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
+            p_sys->psz_vdev = var_CreateGetString( p_access, "v4l-vdev" );;
+        }
+
+        if( p_sys->psz_vdev && *p_sys->psz_vdev )
+        {
+            p_sys->fd_video = OpenVideoDev( p_access, p_sys->psz_vdev );
+        }
+    }
+
+    /* Find audio device */
+    if( p_sys->fd_audio < 0 )
+    {
+        if( !p_sys->psz_adev || !*p_sys->psz_adev )
+        {
+            if( p_sys->psz_adev ) free( p_sys->psz_adev );
+            p_sys->psz_adev = var_CreateGetString( p_access, "v4l-adev" );;
+        }
+
+        if( p_sys->psz_adev && *p_sys->psz_adev )
+        {
+            p_sys->fd_audio = OpenAudioDev( p_access, p_sys->psz_adev );
+        }
+    }
+
+    if( p_sys->fd_video < 0 && p_sys->fd_audio < 0 )
+    {
+        AccessClose( p_this );
+        return VLC_EGENERIC;
+    }
+
+    msg_Dbg( p_access, "v4l grabbing started" );
+
+    /* 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 );
+
+    memcpy( p_sys->p_header, ".v4l", 4 );
+
+    if( p_sys->fd_video >= 0 )
+    {
+        p_sys->i_header_size += 20;
+        p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header_size );
+
+        SetDWBE( &p_sys->p_header[4], ++p_sys->i_streams );
+
+        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 );
+
+        p_sys->i_header_pos = p_sys->i_header_size;
+    }
+
+    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 );
+
+        SetDWBE( &p_sys->p_header[4], ++p_sys->i_streams );
+
+        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 );
+
+        p_sys->i_header_pos = p_sys->i_header_size;
+    }
+    p_sys->i_header_pos = 0;
+
+    /* Update default_pts to a suitable value for access */
+    var_Create( p_access, "v4l-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+    /* Force v4l demuxer */
+    p_access->psz_demux = strdup( "v4l" );
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * AccessClose: close device, free resources
+ *****************************************************************************/
+static void AccessClose( vlc_object_t *p_this )
+{
+    access_t     *p_access = (access_t *)p_this;
+    access_sys_t *p_sys    = p_access->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_header ) free( p_sys->p_header );
+    if( p_sys->p_audio_frame ) free( p_sys->p_audio_frame );
+
+    if( p_sys->b_mjpeg )
+    {
+        int i_noframe = -1;
+        ioctl( p_sys->fd_video, MJPIOC_QBUF_CAPT, &i_noframe );
+    }
+
+    if( p_sys->p_video_mmap && p_sys->p_video_mmap != MAP_FAILED )
+    {
+        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 );
+    }
+
+    free( p_sys );
+}
+
+/*****************************************************************************
+ * AccessControl:
+ *****************************************************************************/
+static int AccessControl( access_t *p_access, int i_query, va_list args )
+{
+    vlc_bool_t   *pb_bool;
+    int          *pi_int;
+    int64_t      *pi_64;
+
+    switch( i_query )
+    {
+        /* */
+        case ACCESS_CAN_SEEK:
+        case ACCESS_CAN_FASTSEEK:
+        case ACCESS_CAN_PAUSE:
+        case ACCESS_CAN_CONTROL_PACE:
+            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+            *pb_bool = VLC_FALSE;
+            break;
+
+        /* */
+        case ACCESS_GET_MTU:
+            pi_int = (int*)va_arg( args, int * );
+            *pi_int = 0;
+            break;
+
+        case ACCESS_GET_PTS_DELAY:
+            pi_64 = (int64_t*)va_arg( args, int64_t * );
+            *pi_64 = (int64_t)var_GetInteger( p_access, "v4l-caching" ) * I64C(1000);
+            break;
+
+        /* */
+        case ACCESS_SET_PAUSE_STATE:
+        case ACCESS_GET_TITLE_INFO:
+        case ACCESS_SET_TITLE:
+        case ACCESS_SET_SEEKPOINT:
+            return VLC_EGENERIC;
+
+        default:
+            msg_Err( p_access, "unimplemented query in control" );
+            return VLC_EGENERIC;
+
+    }
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * AccessRead:
+ *****************************************************************************/
+static int AccessRead( access_t *p_access, uint8_t *p_buffer, int i_len )
+{
+    access_sys_t *p_sys = p_access->p_sys;
+    int          i_data = 0;
+    int          i_stream;
+    mtime_t      i_pts;
+
+    while( i_len > 0 )
+    {
+        /* First copy header if any */
+        if( 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 = p_sys->i_data_size = 0;
+
+        /* Try grabbing audio frames first */
+        i_stream = p_sys->i_streams - 1;
+        if( p_sys->fd_audio < 0 ||
+            GrabAudio( p_access, &p_sys->p_data,
+                       &p_sys->i_data_size, &i_pts ) != VLC_SUCCESS )
+        {
+            int i_ret = VLC_ETIMEOUT;
+
+            /* Try grabbing video frame */
+            i_stream = 0;
+            if( p_sys->fd_video > 0 )
+            {
+                i_ret = GrabVideo( p_access, &p_sys->p_data,
+                                   &p_sys->i_data_size, &i_pts );
+            }
+
+            /* No video or timeout */
+            if( i_ret == VLC_ETIMEOUT )
+            {
+                /* Sleep so we do not consume all the cpu, 10ms seems
+                 * like a good value (100fps) */
+                msleep( 10000 );
+                continue;
+            }
+            else if( i_ret != VLC_SUCCESS )
+            {
+                msg_Err( p_access, "Error during capture!" );
+                return -1;
+            }
+        }
+
+        /* 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;
+}
+
+/*****************************************************************************
+ * ParseMRL: parse the options contained in the MRL
+ *****************************************************************************/
+static void ParseMRL( access_t *p_access )
+{
+    access_sys_t *p_sys = p_access->p_sys;
+
+    char *psz_dup = strdup( p_access->psz_path );
+    char *psz_parser = psz_dup;
 
     while( *psz_parser && *psz_parser != ':' )
     {
@@ -303,7 +709,8 @@ static int AccessOpen( vlc_object_t *p_this )
                             &psz_parser, 0 );
                 if( p_sys->i_frequency < 30000 )
                 {
-                msg_Warn( p_input, "v4l syntax has changed : 'frequency' is now channel frequency in kHz");
+                    msg_Warn( p_access, "v4l syntax has changed : "
+                              "'frequency' is now channel frequency in kHz");
                 }
             }
             else if( !strncmp( psz_parser, "audio=", strlen( "audio=" ) ) )
@@ -353,10 +760,30 @@ static int AccessOpen( vlc_object_t *p_this )
                         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_access, "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=" ),
@@ -426,7 +853,7 @@ static int AccessOpen( vlc_object_t *p_this )
             }
             else
             {
-                msg_Warn( p_input, "unknown option" );
+                msg_Warn( p_access, "unknown option" );
             }
 
             while( *psz_parser && *psz_parser != ':' )
@@ -443,35 +870,36 @@ static int AccessOpen( vlc_object_t *p_this )
 
     if( *psz_dup )
     {
-        p_sys->psz_video_device = strdup( psz_dup );
-    }
-    else
-    {
-        p_sys->psz_video_device = strdup( "/dev/video" );
-    }
-    msg_Dbg( p_input, "video device=`%s'", p_sys->psz_video_device );
-
-    if( p_sys->psz_adev && *p_sys->psz_adev == '\0' )
-    {
-        p_sys->psz_adev = strdup( "/dev/dsp" );
+        p_sys->psz_device = strdup( psz_dup );
     }
-    msg_Dbg( p_input, "audio device=`%s'", p_sys->psz_adev );
+    if( psz_dup ) free( psz_dup );
+}
 
+/*****************************************************************************
+ * OpenVideoDev:
+ *****************************************************************************/
+static int OpenVideoDev( access_t *p_access, char *psz_device )
+{
+    access_sys_t *p_sys = p_access->p_sys;
+    int i_fd;
 
+    struct video_channel vid_channel;
+    struct mjpeg_params mjpeg;
+    int i;
 
-    if( ( p_sys->fd = open( p_sys->psz_video_device, O_RDWR ) ) < 0 )
+    if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
     {
-        msg_Err( p_input, "cannot open device (%s)", strerror( errno ) );
-        goto failed;
+        msg_Err( p_access, "cannot open device (%s)", strerror( errno ) );
+        goto vdev_failed;
     }
 
-    if( ioctl( p_sys->fd, VIDIOCGCAP, &p_sys->vid_cap ) < 0 )
+    if( ioctl( i_fd, VIDIOCGCAP, &p_sys->vid_cap ) < 0 )
     {
-        msg_Err( p_input, "cannot get capabilities (%s)", strerror( errno ) );
-        goto failed;
+        msg_Err( p_access, "cannot get capabilities (%s)", strerror( errno ) );
+        goto vdev_failed;
     }
 
-    msg_Dbg( p_input,
+    msg_Dbg( p_access,
              "V4L device %s %d channels %d audios %d < w < %d %d < h < %d",
              p_sys->vid_cap.name,
              p_sys->vid_cap.channels,
@@ -481,42 +909,42 @@ static int AccessOpen( vlc_object_t *p_this )
 
     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_access, "invalid channel, falling back on channel 0" );
         p_sys->i_channel = 0;
     }
     if( p_sys->i_audio >= p_sys->vid_cap.audios )
     {
-        msg_Dbg( p_input, "invalid audio, falling back with no audio" );
+        msg_Dbg( p_access, "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_access, "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_access, "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" );
-        goto failed;
+        msg_Err( p_access, "cannot grab" );
+        goto vdev_failed;
     }
 
     vid_channel.channel = p_sys->i_channel;
-    if( ioctl( p_sys->fd, VIDIOCGCHAN, &vid_channel ) < 0 )
+    if( ioctl( i_fd, VIDIOCGCHAN, &vid_channel ) < 0 )
     {
-        msg_Err( p_input, "cannot get channel infos (%s)",
+        msg_Err( p_access, "cannot get channel infos (%s)",
                           strerror( errno ) );
-        goto failed;
+        goto vdev_failed;
     }
-    msg_Dbg( p_input,
+    msg_Dbg( p_access,
              "setting channel %s(%d) %d tuners flags=0x%x type=0x%x norm=0x%x",
              vid_channel.name,
              vid_channel.channel,
@@ -527,15 +955,15 @@ static int AccessOpen( vlc_object_t *p_this )
 
     if( p_sys->i_tuner >= vid_channel.tuners )
     {
-        msg_Dbg( p_input, "invalid tuner, falling back on tuner 0" );
+        msg_Dbg( p_access, "invalid tuner, falling back on tuner 0" );
         p_sys->i_tuner = 0;
     }
 
     vid_channel.norm = p_sys->i_norm;
-    if( ioctl( p_sys->fd, VIDIOCSCHAN, &vid_channel ) < 0 )
+    if( ioctl( i_fd, VIDIOCSCHAN, &vid_channel ) < 0 )
     {
-        msg_Err( p_input, "cannot set channel (%s)", strerror( errno ) );
-        goto failed;
+        msg_Err( p_access, "cannot set channel (%s)", strerror( errno ) );
+        goto vdev_failed;
     }
 
     if( vid_channel.flags & VIDEO_VC_TUNER )
@@ -547,42 +975,44 @@ static int AccessOpen( vlc_object_t *p_this )
         if( p_sys->i_tuner >= 0 )
         {
             vid_tuner.tuner = p_sys->i_tuner;
-            if( ioctl( p_sys->fd, VIDIOCGTUNER, &vid_tuner ) < 0 )
+            if( ioctl( i_fd, VIDIOCGTUNER, &vid_tuner ) < 0 )
             {
-                msg_Err( p_input, "cannot get tuner (%s)", strerror( errno ) );
-                goto failed;
+                msg_Err( p_access, "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_access, "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_access, "setting tuner %s (%d)",
                      vid_tuner.name, vid_tuner.tuner );
 
-            //vid_tuner.mode = p_sys->i_norm; /* FIXME FIXME to be checked FIXME FIXME */
-            if( ioctl( p_sys->fd, VIDIOCSTUNER, &vid_tuner ) < 0 )
+            /* 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 ) );
-                goto failed;
+                msg_Err( p_access, "cannot set tuner (%s)", strerror( errno ) );
+                goto vdev_failed;
             }
         }
 #endif
 
-        // show a warning if frequency is < than 30000. User is certainly usint old syntax.
+        /* Show a warning if frequency is < than 30000.
+         * User is certainly usint old syntax. */
 
 
         /* set frequency */
         if( p_sys->i_frequency >= 0 )
         {
             int driver_frequency = p_sys->i_frequency * 16 /1000;
-            if( ioctl( p_sys->fd, VIDIOCSFREQ, &driver_frequency ) < 0 )
+            if( ioctl( i_fd, VIDIOCSFREQ, &driver_frequency ) < 0 )
             {
-                msg_Err( p_input, "cannot set frequency (%s)",
+                msg_Err( p_access, "cannot set frequency (%s)",
                                   strerror( errno ) );
-                goto failed;
+                goto vdev_failed;
             }
-            msg_Dbg( p_input, "frequency %d (%d)", p_sys->i_frequency,
+            msg_Dbg( p_access, "frequency %d (%d)", p_sys->i_frequency,
                                                    driver_frequency );
         }
     }
@@ -596,71 +1026,24 @@ static int AccessOpen( vlc_object_t *p_this )
         if( p_sys->i_audio >= 0 )
         {
             vid_audio.audio = p_sys->i_audio;
-            if( ioctl( p_sys->fd, VIDIOCGAUDIO, &vid_audio ) < 0 )
+            if( ioctl( i_fd, VIDIOCGAUDIO, &vid_audio ) < 0 )
             {
-                msg_Err( p_input, "cannot get audio (%s)", strerror( errno ) );
-                goto failed;
+                msg_Err( p_access, "cannot get audio (%s)", strerror( errno ) );
+                goto vdev_failed;
             }
 
             /* unmute audio */
             vid_audio.flags &= ~VIDEO_AUDIO_MUTE;
 
-            if( ioctl( p_sys->fd, VIDIOCSAUDIO, &vid_audio ) < 0 )
+            if( ioctl( i_fd, VIDIOCSAUDIO, &vid_audio ) < 0 )
             {
-                msg_Err( p_input, "cannot set audio (%s)", strerror( errno ) );
-                goto failed;
+                msg_Err( p_access, "cannot set audio (%s)", strerror( errno ) );
+                goto vdev_failed;
             }
         }
 
     }
 
-    if( p_sys->psz_adev )
-    {
-        int    i_format;
-        if( ( p_sys->fd_audio = open( p_sys->psz_adev, O_RDONLY|O_NONBLOCK ) ) < 0 )
-        {
-            msg_Err( p_input, "cannot open audio device (%s)",
-                              strerror( errno ) );
-            goto failed;
-        }
-
-        i_format = AFMT_S16_LE;
-        if( ioctl( p_sys->fd_audio, SNDCTL_DSP_SETFMT, &i_format ) < 0
-            || i_format != AFMT_S16_LE )
-        {
-            msg_Err( p_input, "cannot set audio format (16b little endian) "
-                              "(%s)", strerror( errno ) );
-            goto failed;
-        }
-
-        if( ioctl( p_sys->fd_audio, SNDCTL_DSP_STEREO,
-                   &p_sys->b_stereo ) < 0 )
-        {
-            msg_Err( p_input, "cannot set audio channels count (%s)",
-                              strerror( errno ) );
-            goto failed;
-        }
-
-        if( ioctl( p_sys->fd_audio, SNDCTL_DSP_SPEED,
-                   &p_sys->i_sample_rate ) < 0 )
-        {
-            msg_Err( p_input, "cannot set audio sample rate (%s)",
-                              strerror( errno ) );
-            goto failed;
-        }
-
-        msg_Dbg( p_input,
-                 "adev=`%s' %s %dHz",
-                 p_sys->psz_adev,
-                 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 );
-    }
-
     /* establish basic params with input and norm before feeling width
      * or height */
     if( p_sys->b_mjpeg )
@@ -668,11 +1051,11 @@ static int AccessOpen( vlc_object_t *p_this )
         struct quicktime_mjpeg_app1 *p_app1;
         int32_t i_offset;
 
-        if( ioctl( p_sys->fd, MJPIOC_G_PARAMS, &mjpeg ) < 0 )
+        if( ioctl( i_fd, MJPIOC_G_PARAMS, &mjpeg ) < 0 )
         {
-            msg_Err( p_input, "cannot get mjpeg params (%s)",
+            msg_Err( p_access, "cannot get mjpeg params (%s)",
                               strerror( errno ) );
-            goto failed;
+            goto vdev_failed;
         }
         mjpeg.input = p_sys->i_channel;
         mjpeg.norm  = p_sys->i_norm;
@@ -719,11 +1102,11 @@ static int AccessOpen( vlc_object_t *p_this )
          * optional.  They will be present in the output. */
         mjpeg.jpeg_markers = JPEG_MARKER_DHT | JPEG_MARKER_DQT;
 
-        if( ioctl( p_sys->fd, MJPIOC_S_PARAMS, &mjpeg ) < 0 )
+        if( ioctl( i_fd, MJPIOC_S_PARAMS, &mjpeg ) < 0 )
         {
-            msg_Err( p_input, "cannot set mjpeg params (%s)",
+            msg_Err( p_access, "cannot set mjpeg params (%s)",
                               strerror( errno ) );
-            goto failed;
+            goto vdev_failed;
         }
 
         p_sys->i_width = mjpeg.img_width * mjpeg.HorDcm;
@@ -736,101 +1119,120 @@ static int AccessOpen( vlc_object_t *p_this )
     {
         struct video_window vid_win;
 
-        if( ioctl( p_sys->fd, VIDIOCGWIN, &vid_win ) < 0 )
+        if( ioctl( i_fd, VIDIOCGWIN, &vid_win ) < 0 )
         {
-            msg_Err( p_input, "cannot get win (%s)", strerror( errno ) );
-            goto failed;
+            msg_Err( p_access, "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 );
+        msg_Dbg( p_access, "will use %dx%d", p_sys->i_width, p_sys->i_height );
     }
 
     p_sys->p_video_frame = NULL;
 
     if( !p_sys->b_mjpeg )
     {
+        /* set hue/color/.. */
+        if( ioctl( i_fd, VIDIOCGPICT, &p_sys->vid_picture ) == 0 )
+        {
+            struct video_picture vid_picture = p_sys->vid_picture;
+
+            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_access, "v4l device uses brightness: %d", vid_picture.brightness );
+                msg_Dbg( p_access, "v4l device uses colour: %d", vid_picture.colour );
+                msg_Dbg( p_access, "v4l device uses hue: %d", vid_picture.hue );
+                msg_Dbg( p_access, "v4l device uses contrast: %d", vid_picture.contrast );
+                p_sys->vid_picture = vid_picture;
+            }
+        }
+
         /* Find out video format used by device */
-        if( ioctl( p_sys->fd, VIDIOCGPICT, &p_sys->vid_picture ) == 0 )
+        if( ioctl( i_fd, VIDIOCGPICT, &p_sys->vid_picture ) == 0 )
         {
-            int i_chroma = VLC_FOURCC( ' ', ' ', ' ', ' ' );
             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_access, "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 );
 
-            /* Try to set the format to something easy to encode */
-            vid_picture.palette = VIDEO_PALETTE_YUV420P;
-            if( ioctl( p_sys->fd, VIDIOCSPICT, &vid_picture ) == 0 )
+            if( vid_picture.palette &&
+                !ioctl( i_fd, VIDIOCSPICT, &vid_picture ) )
             {
                 p_sys->vid_picture = vid_picture;
             }
             else
             {
-                vid_picture.palette = VIDEO_PALETTE_YUV422P;
-                if( ioctl( p_sys->fd, VIDIOCSPICT, &vid_picture ) == 0 )
+                /* 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" );
-            goto failed;
+            msg_Err( p_access, "ioctl VIDIOCGPICT failed" );
+            goto vdev_failed;
         }
     }
 
-
     if( p_sys->b_mjpeg )
     {
         int i;
@@ -838,19 +1240,19 @@ static int AccessOpen( vlc_object_t *p_this )
         p_sys->mjpeg_buffers.count = 8;
         p_sys->mjpeg_buffers.size = MJPEG_BUFFER_SIZE;
 
-        if( ioctl( p_sys->fd, MJPIOC_REQBUFS, &p_sys->mjpeg_buffers ) < 0 )
+        if( ioctl( i_fd, MJPIOC_REQBUFS, &p_sys->mjpeg_buffers ) < 0 )
         {
-            msg_Err( p_input, "mmap unsupported" );
-            goto failed;
+            msg_Err( p_access, "mmap unsupported" );
+            goto vdev_failed;
         }
 
         p_sys->p_video_mmap = mmap( 0,
                 p_sys->mjpeg_buffers.size * p_sys->mjpeg_buffers.count,
-                PROT_READ | PROT_WRITE, MAP_SHARED, p_sys->fd, 0 );
+                PROT_READ | PROT_WRITE, MAP_SHARED, i_fd, 0 );
         if( p_sys->p_video_mmap == MAP_FAILED )
         {
-            msg_Err( p_input, "mmap failed" );
-            goto failed;
+            msg_Err( p_access, "mmap failed" );
+            goto vdev_failed;
         }
 
         p_sys->i_fourcc  = VLC_FOURCC( 'm','j','p','g' );
@@ -859,23 +1261,23 @@ static int AccessOpen( vlc_object_t *p_this )
         /* queue up all the frames */
         for( i = 0; i < (int)p_sys->mjpeg_buffers.count; i++ )
         {
-            if( ioctl( p_sys->fd, MJPIOC_QBUF_CAPT, &i ) < 0 )
+            if( ioctl( i_fd, MJPIOC_QBUF_CAPT, &i ) < 0 )
             {
-                msg_Err( p_input, "unable to queue frame" );
-                goto failed;
+                msg_Err( p_access, "unable to queue frame" );
+                goto vdev_failed;
             }
         }
     }
     else
     {
         /* Fill in picture_t fields */
-        vout_InitPicture( VLC_OBJECT(p_input), &p_sys->pic, p_sys->i_fourcc,
+        vout_InitPicture( VLC_OBJECT(p_access), &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" );
-            goto failed;
+            msg_Err( p_access, "unsupported chroma" );
+            goto vdev_failed;
         }
         p_sys->i_video_frame_size = 0;
         for( i = 0; i < p_sys->pic.i_planes; i++ )
@@ -884,26 +1286,26 @@ static int AccessOpen( vlc_object_t *p_this )
               p_sys->pic.p[i].i_visible_pitch;
         }
 
-        msg_Dbg( p_input, "v4l device uses frame size: %i",
+        msg_Dbg( p_access, "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_access, "v4l device uses chroma: %4.4s",
                 (char*)&p_sys->i_fourcc );
 
         /* Allocate mmap buffer */
-        if( ioctl( p_sys->fd, VIDIOCGMBUF, &p_sys->vid_mbuf ) < 0 )
+        if( ioctl( i_fd, VIDIOCGMBUF, &p_sys->vid_mbuf ) < 0 )
         {
-            msg_Err( p_input, "mmap unsupported" );
-            goto failed;
+            msg_Err( p_access, "mmap unsupported" );
+            goto vdev_failed;
         }
 
         p_sys->p_video_mmap = mmap( 0, p_sys->vid_mbuf.size,
                                     PROT_READ|PROT_WRITE, MAP_SHARED,
-                                    p_sys->fd, 0 );
+                                    i_fd, 0 );
         if( p_sys->p_video_mmap == MAP_FAILED )
         {
             /* FIXME -> normal read */
-            msg_Err( p_input, "mmap failed" );
-            goto failed;
+            msg_Err( p_access, "mmap failed" );
+            goto vdev_failed;
         }
 
         /* init grabbing */
@@ -911,113 +1313,83 @@ static int AccessOpen( vlc_object_t *p_this )
         p_sys->vid_mmap.width  = p_sys->i_width;
         p_sys->vid_mmap.height = p_sys->i_height;
         p_sys->vid_mmap.format = p_sys->vid_picture.palette;
-        if( ioctl( p_sys->fd, VIDIOCMCAPTURE, &p_sys->vid_mmap ) < 0 )
+        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" );
-            goto failed;
+            msg_Warn( p_access, "%4.4s refused", (char*)&p_sys->i_fourcc );
+            msg_Err( p_access, "chroma selection failed" );
+            goto vdev_failed;
         }
     }
+    return i_fd;
 
-    p_input->pf_read        = Read;
-    p_input->pf_seek        = NULL;
-    p_input->pf_set_area    = NULL;
-    p_input->pf_set_program = NULL;
-
-    p_input->p_access_data  = p_sys;
-
-    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 );
-
-    /* Update default_pts to a suitable value for access */
-    p_input->i_pts_delay = config_GetInt( p_input, "v4l-caching" ) * 1000;
-
-    msg_Info( p_input, "v4l grabbing started" );
-
-    /* create header */
-    p_sys->i_header_size = 8 + 20;
-    p_sys->i_header_pos  = 0;
-    p_sys->p_header      = malloc( p_sys->i_header_size );
-
-    memcpy(  &p_sys->p_header[0], ".v4l", 4 );
-    SetDWBE( &p_sys->p_header[4], 1 );
+vdev_failed:
 
-    memcpy(  &p_sys->p_header[ 8], "vids", 4 );
-    memcpy(  &p_sys->p_header[12], &p_sys->i_fourcc, 4 );
-    SetDWBE( &p_sys->p_header[16], p_sys->i_width );
-    SetDWBE( &p_sys->p_header[20], p_sys->i_height );
-    SetDWBE( &p_sys->p_header[24], 0 );
-
-    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 );
-
-        SetDWBE( &p_sys->p_header[4], 2 );
-
-        memcpy(  &p_sys->p_header[28], "auds", 4 );
-        memcpy(  &p_sys->p_header[32], "araw", 4 );
-        SetDWBE( &p_sys->p_header[36], p_sys->b_stereo ? 2 : 1 );
-        SetDWBE( &p_sys->p_header[40], p_sys->i_sample_rate );
-        SetDWBE( &p_sys->p_header[44], 16 );
-    }
-    return VLC_SUCCESS;
-
-failed:
-    free( p_sys->psz_video_device );
-    if( p_sys->fd >= 0 )
-    {
-        close( p_sys->fd );
-    }
-    free( p_sys );
-    return VLC_EGENERIC;
+    if( i_fd >= 0 ) close( i_fd );
+    return -1;
 }
 
 /*****************************************************************************
- * V4lClose: close device
+ * OpenAudioDev:
  *****************************************************************************/
-static void AccessClose( vlc_object_t *p_this )
+static int OpenAudioDev( access_t *p_access, char *psz_device )
 {
-    input_thread_t  *p_input = (input_thread_t *)p_this;
-    access_sys_t    *p_sys   = p_input->p_access_data;
+    access_sys_t *p_sys = p_access->p_sys;
+    int i_fd, i_format;
 
-    msg_Info( p_input, "v4l grabbing stoped" );
+    if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 )
+    {
+        msg_Err( p_access, "cannot open audio device (%s)", strerror( errno ) );
+        goto adev_fail;
+    }
 
-    if( p_sys->b_mjpeg )
+    i_format = AFMT_S16_LE;
+    if( ioctl( i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
+        || i_format != AFMT_S16_LE )
     {
-        int i_noframe = -1;
-        ioctl( p_sys->fd, MJPIOC_QBUF_CAPT, &i_noframe );
+        msg_Err( p_access, "cannot set audio format (16b little endian) "
+                 "(%s)", strerror( errno ) );
+        goto adev_fail;
     }
 
-    free( p_sys->psz_video_device );
-    close( p_sys->fd );
-    if( p_sys->p_video_mmap && p_sys->p_video_mmap != MAP_FAILED )
+    if( ioctl( i_fd, SNDCTL_DSP_STEREO,
+               &p_sys->b_stereo ) < 0 )
     {
-        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_Err( p_access, "cannot set audio channels count (%s)",
+                 strerror( errno ) );
+        goto adev_fail;
     }
-    if( p_sys->fd_audio >= 0 )
+
+    if( ioctl( i_fd, SNDCTL_DSP_SPEED,
+               &p_sys->i_sample_rate ) < 0 )
     {
-        close( p_sys->fd_audio );
+        msg_Err( p_access, "cannot set audio sample rate (%s)",
+                 strerror( errno ) );
+        goto adev_fail;
     }
 
-    free( p_sys );
+    msg_Dbg( p_access, "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 );
+
+    return i_fd;
+
+ adev_fail:
+
+    if( i_fd >= 0 ) close( i_fd );
+    return -1;
 }
 
-static int GrabAudio( input_thread_t * p_input,
-                      uint8_t **pp_data,
-                      int      *pi_data,
-                      mtime_t  *pi_pts )
+/*****************************************************************************
+ * GrabAudio: grab audio
+ *****************************************************************************/
+static int GrabAudio( access_t * p_access, uint8_t **pp_data,
+                      int      *pi_data, mtime_t  *pi_pts )
 {
-    access_sys_t    *p_sys   = p_input->p_access_data;
+    access_sys_t *p_sys = p_access->p_sys;
     struct audio_buf_info buf_info;
     int i_read;
     int i_correct;
@@ -1047,39 +1419,49 @@ static int GrabAudio( input_thread_t * p_input,
     return VLC_SUCCESS;
 }
 
-static uint8_t *GrabCapture( input_thread_t *p_input )
+/*****************************************************************************
+ * GrabVideo:
+ *****************************************************************************/
+static uint8_t *GrabCapture( access_t *p_access )
 {
-    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( ;; )
+    access_sys_t *p_sys = p_access->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, VIDIOCMCAPTURE, &p_sys->vid_mmap ) >= 0 )
+        if( errno != EAGAIN )
         {
-            break;
+            msg_Err( p_access, "failed capturing new frame" );
+            return NULL;
         }
 
-        if( errno != EAGAIN )
+        if( p_access->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_access, "grab failed, trying again" );
+    }
 
-    while( ioctl(p_sys->fd, 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_access, "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( access_t *p_access )
 {
-    access_sys_t *p_sys = p_input->p_access_data;
+    access_sys_t *p_sys = p_access->p_sys;
     struct mjpeg_sync sync;
     uint8_t *p_frame, *p_field, *p;
     uint16_t tag;
@@ -1088,12 +1470,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, 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_access, "failed capturing new frame" );
+                return NULL;
+            }
+        }
+    }
 
     /* sync on the next frame */
-    while( ioctl( p_sys->fd, 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_access, "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;
@@ -1164,12 +1561,10 @@ 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 int GrabVideo( access_t * p_access, uint8_t **pp_data,
+                      int *pi_data, mtime_t  *pi_pts )
 {
-    access_sys_t *p_sys   = p_input->p_access_data;
+    access_sys_t *p_sys = p_access->p_sys;
     uint8_t      *p_frame;
 
 
@@ -1177,19 +1572,17 @@ static int GrabVideo( input_thread_t * p_input,
     {
         mtime_t i_dur = (mtime_t)((double)1000000 / (double)p_sys->f_fps);
 
-        /* have we wait enought ? */
+        /* Did we wait long enougth ? */
         if( p_sys->i_video_pts + i_dur > mdate() )
         {
-            /* no, msleep needed to consume all the cpu, 10ms seem a good value (100fps)*/
-            msleep( 10000 );
-            return VLC_EGENERIC;
+            return VLC_ETIMEOUT;
         }
     }
 
     if( p_sys->b_mjpeg )
-        p_frame = GrabMJPEG( p_input );
+        p_frame = GrabMJPEG( p_access );
     else
-        p_frame = GrabCapture( p_input );
+        p_frame = GrabCapture( p_access );
 
     if( !p_frame )
         return VLC_EGENERIC;
@@ -1205,320 +1598,172 @@ static int GrabVideo( input_thread_t * p_input,
 }
 
 /*****************************************************************************
- * Read: reads from the device into PES packets.
- *****************************************************************************
- * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
- * bytes.
+ * Demux: local prototypes
  *****************************************************************************/
-static int Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
+struct demux_sys_t
 {
-    access_sys_t *p_sys = p_input->p_access_data;
-    int          i_data = 0;
-    int          i_stream;
-    mtime_t      i_pts;
-
-    //msg_Info( p_input, "access read data_size %i, data_pos %i",
-                //p_sys->i_data_size, p_sys->i_data_pos );
-    while( i_len > 0 )
-    {
-        /* 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 */
-        i_stream = 1;
-        if( p_sys->fd_audio < 0 ||
-            GrabAudio( p_input, &p_sys->p_data, &p_sys->i_data_size, &i_pts ) )
-        {
-            /* and then get video frame if no audio */
-            i_stream = 0;
-            if( GrabVideo( p_input, &p_sys->p_data, &p_sys->i_data_size, &i_pts ) )
-            {
-                return -1;
-            }
-        }
-
-        /* 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 );
-    }
+    int         i_es;
+    es_out_id_t **es;
+};
 
-    return i_data;
-}
+static int Demux       ( demux_t * );
+static int DemuxControl( demux_t *, int, va_list );
 
 /****************************************************************************
- * I. Demux Part
+ * DemuxOpen:
  ****************************************************************************/
-#define MAX_PACKETS_IN_FIFO 3
-
 static int DemuxOpen( vlc_object_t *p_this )
 {
-    input_thread_t *p_input = (input_thread_t *)p_this;
-    //demux_sys_t    *p_sys;
+    demux_t *p_demux = (demux_t *)p_this;
+    demux_sys_t    *p_sys;
 
     uint8_t        *p_peek;
-    int            i_streams;
+    int            i_es;
     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 )
+    if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
     {
-        msg_Warn( p_input, "v4l plugin discarded (cannot peek)" );
-        return( VLC_EGENERIC );
+        return VLC_EGENERIC;
     }
 
-    if( strncmp( p_peek, ".v4l", 4 ) || GetDWBE( &p_peek[4] ) <= 0 )
+    if( strncmp( p_peek, ".v4l", 4 ) || ( i_es = 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;
+    p_demux->pf_demux   = Demux;
+    p_demux->pf_control = DemuxControl;
+    p_demux->p_sys      = p_sys = malloc( sizeof( demux_sys_t ) );
+    p_sys->i_es = 0;
+    p_sys->es   = NULL;
 
-    i_streams = GetDWBE( &p_peek[4] );
-    if( input_Peek( p_input, &p_peek, 8 + 20 * i_streams )
-        < 8 + 20 * i_streams )
+    if( stream_Peek( p_demux->s, &p_peek, 8 + 20 * i_es ) < 8 + 20 * i_es )
     {
-        msg_Err( p_input, "v4l plugin discarded (cannot peek)" );
-        return( VLC_EGENERIC );
+        msg_Err( p_demux, "v4l plugin discarded (cannot peek)" );
+        return VLC_EGENERIC;
     }
     p_peek += 8;
 
-    for( i = 0; i < i_streams; i++ )
+    for( i = 0; i < i_es; i++ )
     {
-        es_descriptor_t *p_es;
+        es_format_t fmt;
 
         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
+            es_format_Init( &fmt, AUDIO_ES,
+                VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] ) );
+
+            fmt.audio.i_channels = GetDWBE( &p_peek[8] );
+            fmt.audio.i_rate = GetDWBE( &p_peek[12] );
+            fmt.audio.i_bitspersample = GetDWBE( &p_peek[16] );
+            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 );
+
+            TAB_APPEND( p_sys->i_es, p_sys->es,
+                        es_out_Add( p_demux->out, &fmt ) );
         }
         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
+            es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( p_peek[4], p_peek[5],
+                            p_peek[6], p_peek[7] ) );
+            fmt.video.i_width  = GetDWBE( &p_peek[8] );
+            fmt.video.i_height = GetDWBE( &p_peek[12] );
+
+            msg_Dbg( p_demux, "added new video es %4.4s %dx%d",
+                     (char*)&fmt.i_codec,
+                     fmt.video.i_width, fmt.video.i_height );
+            TAB_APPEND( p_sys->i_es, p_sys->es,
+                        es_out_Add( p_demux->out, &fmt ) );
         }
 
         p_peek += 20;
     }
 
-    p_input->stream.p_selected_program->b_is_ok = 1;
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
+    /* Skip header */
+    stream_Read( p_demux->s, NULL, 8 + 20 * i_es );
 
-    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;
 }
 
+/****************************************************************************
+ * DemuxClose:
+ ****************************************************************************/
 static void DemuxClose( vlc_object_t *p_this )
 {
-    return;
+    demux_t     *p_demux = (demux_t *)p_this;
+    demux_sys_t *p_sys = p_demux->p_sys;
+
+    if( p_sys->i_es > 0 )
+    {
+        free( p_sys->es );
+    }
+    free( p_sys );
 }
 
-static int Demux( input_thread_t *p_input )
+/****************************************************************************
+ * Demux:
+ ****************************************************************************/
+static int Demux( demux_t *p_demux )
 {
-    es_descriptor_t *p_es;
-    pes_packet_t    *p_pes;
+    demux_sys_t *p_sys = p_demux->p_sys;
+    block_t     *p_block;
 
-    int i_stream;
+    int i_es;
     int i_size;
+
     uint8_t *p_peek;
-    mtime_t        i_pts;
+    mtime_t i_pts;
 
-    if( input_Peek( p_input, &p_peek, 16 ) < 16 )
+    if( stream_Peek( p_demux->s, &p_peek, 16 ) < 16 )
     {
-        msg_Warn( p_input, "cannot peek (EOF ?)" );
-        return( 0 );
+        msg_Warn( p_demux, "cannot peek (EOF ?)" );
+        return 0;
     }
 
-    i_stream = GetDWBE( &p_peek[0] );
-    i_size   = GetDWBE( &p_peek[4] );
-    i_pts    = GetQWBE( &p_peek[8] );
-
-    //msg_Dbg( p_input, "stream=%d size=%d", i_stream, i_size );
-//    p_es = input_FindES( p_input, i_stream );
-    p_es = p_input->stream.p_selected_program->pp_es[i_stream];
-    if( !p_es )
+    i_es   = GetDWBE( &p_peek[0] );
+    if( i_es < 0 || i_es >= p_sys->i_es )
     {
-        msg_Err( p_input, "cannot find ES" );
+        msg_Err( p_demux, "cannot find ES" );
+        return -1;
     }
 
-    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;
+    i_size = GetDWBE( &p_peek[4] );
+    i_pts  = GetQWBE( &p_peek[8] );
 
-        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;
-    }
-//    input_SplitBuffer( p_input, &p_pk, i_size + 8 );
-    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 = mdate() + p_input->i_pts_delay;
-        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
+    if( ( p_block = stream_Block( p_demux->s, 16 + i_size ) ) == NULL )
     {
-        input_DeletePES( p_input->p_method_data, p_pes );
+        msg_Warn( p_demux, "cannot read data" );
+        return 0;
     }
 
+    p_block->p_buffer += 16;
+    p_block->i_buffer -= 16;
+
+    p_block->i_dts =
+    p_block->i_pts = i_pts;
+
+    es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_pts );
+    es_out_Send( p_demux->out, p_sys->es[i_es], p_block );
+
     return 1;
 }
+
+/****************************************************************************
+ * DemuxControl:
+ ****************************************************************************/
+static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
+{
+   return demux2_vaControlHelper( p_demux->s,
+                                  0, -1,
+                                  0, 1,
+                                  i_query, args );
+}
+