X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fwav.c;h=8380fab9407b0b42db9059710adc5d3faafaa5ec;hb=848489c3863b1b7ddbe542aa3e746063722b9280;hp=c585f6efe2133556781cb9ab6e553ce107348b7d;hpb=11cd21f9c8aa7970dd343c39102b764657e9598f;p=vlc

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index c585f6efe2..8380fab940 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * wav.c : wav file input module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: wav.c,v 1.8 2003/11/11 02:49:26 fenrir Exp $
+ * Copyright (C) 2001-2008 the VideoLAN team
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -18,28 +18,33 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#include <codecs.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
+#include <vlc_aout.h>
+#include <vlc_codecs.h>
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-
-static int  Open    ( vlc_object_t * );
-static void Close  ( vlc_object_t * );
+static int  Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("WAV demuxer") );
+    set_description( N_("WAV demuxer") );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux", 142 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -47,8 +52,8 @@ vlc_module_end();
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-
-static int  Demux       ( input_thread_t * );
+static int Demux  ( demux_t * );
+static int Control( demux_t *, int i_query, va_list args );
 
 struct demux_sys_t
 {
@@ -58,165 +63,244 @@ struct demux_sys_t
     int64_t         i_data_pos;
     unsigned int    i_data_size;
 
-    mtime_t         i_time;
     unsigned int    i_frame_size;
-    mtime_t         i_frame_length;
-};
+    int             i_frame_samples;
 
+    date_t          pts;
 
-/*****************************************************************************
- * Declaration of local function
- *****************************************************************************/
-#define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) )
-
-static int ChunkFind( input_thread_t *, char *, unsigned int * );
+    uint32_t i_channel_mask;
+    bool b_chan_reorder;              /* do we need channel reordering */
+    int pi_chan_table[AOUT_CHAN_MAX];
+};
 
-static void FrameInfo_IMA_ADPCM( input_thread_t *, unsigned int *, mtime_t * );
-static void FrameInfo_MS_ADPCM ( input_thread_t *, unsigned int *, mtime_t * );
-static void FrameInfo_PCM      ( input_thread_t *, unsigned int *, mtime_t * );
+#define __EVEN( x ) (((x) + 1) & ~1)
+
+static int ChunkFind( demux_t *, const char *, unsigned int * );
+
+static void FrameInfo_IMA_ADPCM( demux_t *, unsigned int *, int * );
+static void FrameInfo_MS_ADPCM ( demux_t *, unsigned int *, int * );
+static void FrameInfo_PCM      ( demux_t *, unsigned int *, int * );
+
+static const uint32_t pi_channels_src[] =
+    { WAVE_SPEAKER_FRONT_LEFT, WAVE_SPEAKER_FRONT_RIGHT,
+      WAVE_SPEAKER_FRONT_CENTER, WAVE_SPEAKER_LOW_FREQUENCY,
+      WAVE_SPEAKER_BACK_LEFT, WAVE_SPEAKER_BACK_RIGHT,
+      WAVE_SPEAKER_SIDE_LEFT, WAVE_SPEAKER_SIDE_RIGHT, 0 };
+static const uint32_t pi_channels_in[] =
+    { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+      AOUT_CHAN_CENTER, AOUT_CHAN_LFE,
+      AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+      AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, 0 };
+static const uint32_t pi_channels_out[] =
+    { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+      AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+      AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+      AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
 
 /*****************************************************************************
  * Open: check file and initializes structures
  *****************************************************************************/
 static int Open( 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;
-    WAVEFORMATEX   *p_wf;
-    unsigned int   i_size;
-    char *psz_name;
+    const uint8_t *p_peek;
+    uint32_t     i_size;
+    unsigned int i_extended;
+    const char        *psz_name;
+
+    WAVEFORMATEXTENSIBLE *p_wf_ext = NULL;
+    WAVEFORMATEX         *p_wf = NULL;
 
     /* Is it a wav file ? */
-    if( input_Peek( p_input, &p_peek, 12 ) < 12 )
-    {
-        msg_Warn( p_input, "WAV module discarded (cannot peek)" );
-        return VLC_EGENERIC;
-    }
-    if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &p_peek[8], "WAVE", 4 ) )
+    if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) return VLC_EGENERIC;
+
+    if( memcmp( p_peek, "RIFF", 4 ) || memcmp( &p_peek[8], "WAVE", 4 ) )
     {
-        msg_Warn( p_input, "WAV module discarded (not a valid file)" );
         return VLC_EGENERIC;
     }
 
-    p_input->pf_demux     = Demux;
-    p_input->pf_demux_control = demux_vaControlDefault;
-    p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );
-    p_sys->p_es           = NULL;
-    p_sys->i_time         = 0;
+    p_demux->pf_demux   = Demux;
+    p_demux->pf_control = Control;
+    p_demux->p_sys      = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( p_sys == NULL )
+        return VLC_ENOMEM;
+
+    p_sys->p_es         = NULL;
+    p_sys->b_chan_reorder = 0;
+    p_sys->i_channel_mask = 0;
 
     /* skip riff header */
-    stream_Read( p_input->s, NULL, 12 );  /* cannot fail as peek succeed */
+    stream_Read( p_demux->s, NULL, 12 );  /* cannot fail as peek succeed */
 
     /* search fmt chunk */
-    if( ChunkFind( p_input, "fmt ", &i_size ) )
+    if( ChunkFind( p_demux, "fmt ", &i_size ) )
     {
-        msg_Err( p_input, "cannot find 'fmt ' chunk" );
+        msg_Err( p_demux, "cannot find 'fmt ' chunk" );
         goto error;
     }
-    if( i_size < sizeof( WAVEFORMATEX ) - 2 )   /* XXX -2 isn't a typo */
+    i_size += 2;
+    if( i_size < sizeof( WAVEFORMATEX ) )
     {
-        msg_Err( p_input, "invalid 'fmt ' chunk" );
+        msg_Err( p_demux, "invalid 'fmt ' chunk" );
         goto error;
     }
-    stream_Read( p_input->s, NULL, 8 );   /* cannot fail */
+    stream_Read( p_demux->s, NULL, 8 );   /* Cannot fail */
 
     /* load waveformatex */
-    p_wf = malloc( __EVEN( i_size ) + 2 ); /* +2, for raw audio -> no cbSize */
+    p_wf_ext = malloc( i_size );
+    if( p_wf_ext == NULL )
+         goto error;
+
+    p_wf = (WAVEFORMATEX *)p_wf_ext;
     p_wf->cbSize = 0;
-    if( stream_Read( p_input->s,
-                     p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) )
+    i_size -= 2;
+    if( stream_Read( p_demux->s, p_wf, i_size ) != (int)i_size
+     || ( ( i_size & 1 ) && stream_Read( p_demux->s, NULL, 1 ) != 1 ) )
     {
-        msg_Err( p_input, "cannot load 'fmt ' chunk" );
+        msg_Err( p_demux, "cannot load 'fmt ' chunk" );
         goto error;
     }
 
     es_format_Init( &p_sys->fmt, AUDIO_ES, 0 );
-    wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &p_sys->fmt.i_codec, &psz_name );
+    wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &p_sys->fmt.i_codec,
+                      &psz_name );
     p_sys->fmt.audio.i_channels = GetWLE ( &p_wf->nChannels );
-    p_sys->fmt.audio.i_samplerate = GetDWLE( &p_wf->nSamplesPerSec );
-    p_sys->fmt.audio.i_blockalign = GetWLE ( &p_wf->nBlockAlign );
-    p_sys->fmt.audio.i_bitrate    = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8;
-    p_sys->fmt.audio.i_bitspersample = GetWLE ( &p_wf->wBitsPerSample );;
+    p_sys->fmt.audio.i_rate = GetDWLE( &p_wf->nSamplesPerSec );
+    p_sys->fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign );
+    p_sys->fmt.i_bitrate = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8;
+    p_sys->fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample );
+    if( i_size >= sizeof(WAVEFORMATEX) )
+        p_sys->fmt.i_extra = __MIN( GetWLE( &p_wf->cbSize ), i_size - sizeof(WAVEFORMATEX) );
+    i_extended = 0;
+
+    /* Handle new WAVE_FORMAT_EXTENSIBLE wav files */
+    /* see the following link for more information:
+     * http://www.microsoft.com/whdc/device/audio/multichaud.mspx#EFAA */
+    if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_EXTENSIBLE &&
+        i_size >= sizeof( WAVEFORMATEXTENSIBLE ) &&
+        ( p_sys->fmt.i_extra + sizeof( WAVEFORMATEX )
+            >= sizeof( WAVEFORMATEXTENSIBLE ) ) )
+    {
+        unsigned i, i_channel_mask;
+        GUID guid_subformat;
+
+        guid_subformat = p_wf_ext->SubFormat;
+        guid_subformat.Data1 = GetDWLE( &p_wf_ext->SubFormat.Data1 );
+        guid_subformat.Data2 = GetWLE( &p_wf_ext->SubFormat.Data2 );
+        guid_subformat.Data3 = GetWLE( &p_wf_ext->SubFormat.Data3 );
+
+        sf_tag_to_fourcc( &guid_subformat, &p_sys->fmt.i_codec, &psz_name );
+
+        i_extended = sizeof( WAVEFORMATEXTENSIBLE ) - sizeof( WAVEFORMATEX );
+        p_sys->fmt.i_extra -= i_extended;
+
+        i_channel_mask = GetDWLE( &p_wf_ext->dwChannelMask );
+        if( i_channel_mask )
+        {
+            for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ )
+            {
+                if( i_channel_mask & pi_channels_src[i] )
+                    p_sys->i_channel_mask |= pi_channels_in[i];
+            }
+
+            if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') ||
+                p_sys->fmt.i_codec == VLC_FOURCC('p','c','m',' ') ||
+                p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') )
+
+            p_sys->b_chan_reorder =
+                aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
+                                          p_sys->i_channel_mask,
+                                          p_sys->fmt.audio.i_channels,
+                                          p_sys->pi_chan_table );
+
+            msg_Dbg( p_demux, "channel mask: %x, reordering: %i",
+                     p_sys->i_channel_mask, (int)p_sys->b_chan_reorder );
+        }
+        p_sys->fmt.audio.i_physical_channels =
+            p_sys->fmt.audio.i_original_channels =
+                p_sys->i_channel_mask;
+    }
 
-    p_sys->fmt.i_extra = GetWLE ( &p_wf->cbSize );
     if( p_sys->fmt.i_extra > 0 )
     {
         p_sys->fmt.p_extra = malloc( p_sys->fmt.i_extra );
-        memcpy( p_sys->fmt.p_extra, &p_wf[1], p_sys->fmt.i_extra );
+        memcpy( p_sys->fmt.p_extra, ((uint8_t *)p_wf) + i_extended,
+                p_sys->fmt.i_extra );
     }
 
-    msg_Dbg( p_input, "format:0x%4.4x channels:%d %dHz %dKo/s blockalign:%d bits/samples:%d extra size:%d",
-            GetWLE( &p_wf->wFormatTag ),
-            p_sys->fmt.audio.i_channels,
-            p_sys->fmt.audio.i_samplerate,
-            p_sys->fmt.audio.i_bitrate / 8 / 1024,
-            p_sys->fmt.audio.i_blockalign,
-            p_sys->fmt.audio.i_bitspersample,
-            p_sys->fmt.i_extra );
+    msg_Dbg( p_demux, "format: 0x%4.4x, fourcc: %4.4s, channels: %d, "
+             "freq: %u Hz, bitrate: %uKo/s, blockalign: %d, bits/samples: %d, "
+             "extra size: %d",
+             GetWLE( &p_wf->wFormatTag ), (char *)&p_sys->fmt.i_codec,
+             p_sys->fmt.audio.i_channels, p_sys->fmt.audio.i_rate,
+             p_sys->fmt.i_bitrate / 8 / 1024, p_sys->fmt.audio.i_blockalign,
+             p_sys->fmt.audio.i_bitspersample, p_sys->fmt.i_extra );
+
     free( p_wf );
+    p_wf = NULL;
 
     switch( p_sys->fmt.i_codec )
     {
-        case VLC_FOURCC( 'a', 'r', 'a', 'w' ):
-        case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
-        case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
-            FrameInfo_PCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
-            break;
-        case VLC_FOURCC( 'm', 's', 0x00, 0x02 ):
-            FrameInfo_MS_ADPCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
-            break;
-        case VLC_FOURCC( 'm', 's', 0x00, 0x11 ):
-            FrameInfo_IMA_ADPCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
-            break;
-        case VLC_FOURCC( 'm', 's', 0x00, 0x61 ):
-        case VLC_FOURCC( 'm', 's', 0x00, 0x62 ):
-            /* FIXME not sure at all FIXME */
-            FrameInfo_MS_ADPCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
-            break;
-        case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
-        case VLC_FOURCC( 'a', '5', '2', ' ' ):
-            /* FIXME set end of area FIXME */
-            goto relay;
-        default:
-            msg_Err( p_input, "unsupported codec (%4.4s)", (char*)&p_sys->fmt.i_codec );
-            goto error;
-    }
-
-    msg_Dbg( p_input, "found %s audio format", psz_name );
-
-    if( ChunkFind( p_input, "data", &p_sys->i_data_size ) )
-    {
-        msg_Err( p_input, "cannot find 'data' chunk" );
+    case VLC_FOURCC( 'a', 'r', 'a', 'w' ):
+    case VLC_FOURCC( 'a', 'f', 'l', 't' ):
+    case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
+    case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
+    case VLC_FOURCC( 'm', 'l', 'a', 'w' ):
+    case VLC_FOURCC( 'p', 'c', 'm', ' ' ):
+        FrameInfo_PCM( p_demux, &p_sys->i_frame_size,
+                       &p_sys->i_frame_samples );
+        break;
+    case VLC_FOURCC( 'm', 's', 0x00, 0x02 ):
+        FrameInfo_MS_ADPCM( p_demux, &p_sys->i_frame_size,
+                            &p_sys->i_frame_samples );
+        break;
+    case VLC_FOURCC( 'm', 's', 0x00, 0x11 ):
+        FrameInfo_IMA_ADPCM( p_demux, &p_sys->i_frame_size,
+                             &p_sys->i_frame_samples );
+        break;
+    case VLC_FOURCC( 'm', 's', 0x00, 0x61 ):
+    case VLC_FOURCC( 'm', 's', 0x00, 0x62 ):
+        /* FIXME not sure at all FIXME */
+        FrameInfo_MS_ADPCM( p_demux, &p_sys->i_frame_size,
+                            &p_sys->i_frame_samples );
+        break;
+    case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+    case VLC_FOURCC( 'a', '5', '2', ' ' ):
+        /* FIXME set end of area FIXME */
+        goto error;
+    default:
+        msg_Err( p_demux, "unsupported codec (%4.4s)",
+                 (char*)&p_sys->fmt.i_codec );
         goto error;
     }
 
-    p_sys->i_data_pos = stream_Tell( p_input->s );
+    msg_Dbg( p_demux, "found %s audio format", psz_name );
 
-    stream_Read( p_input->s, NULL, 8 );   /* cannot fail */
-
-    /*  create one program */
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    if( input_InitStream( p_input, 0 ) == -1)
+    if( ChunkFind( p_demux, "data", &p_sys->i_data_size ) )
     {
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-        msg_Err( p_input, "cannot init stream" );
+        msg_Err( p_demux, "cannot find 'data' chunk" );
         goto error;
     }
-    p_input->stream.i_mux_rate = 0;
-    if( p_sys->i_data_size > 0 )
+    stream_Read( p_demux->s, NULL, 8 );   /* Cannot fail */
+    p_sys->i_data_pos = stream_Tell( p_demux->s );
+
+    if( p_sys->fmt.i_bitrate <= 0 )
     {
-        p_input->stream.i_mux_rate = (mtime_t)p_sys->i_frame_size *
-                                     (mtime_t)1000000 / 50 / p_sys->i_frame_length;
+        p_sys->fmt.i_bitrate = (mtime_t)p_sys->i_frame_size *
+            p_sys->fmt.audio.i_rate * 8 / p_sys->i_frame_samples;
     }
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-    p_sys->p_es = es_out_Add( p_input->p_es_out, &p_sys->fmt );
+    p_sys->p_es = es_out_Add( p_demux->out, &p_sys->fmt );
+
+    date_Init( &p_sys->pts, p_sys->fmt.audio.i_rate, 1 );
+    date_Set( &p_sys->pts, 1 );
+
     return VLC_SUCCESS;
 
 error:
-relay:
+    free( p_wf );
     free( p_sys );
     return VLC_EGENERIC;
 }
@@ -226,30 +310,13 @@ relay:
  *****************************************************************************
  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
  *****************************************************************************/
-static int Demux( input_thread_t *p_input )
+static int Demux( demux_t *p_demux )
 {
-    demux_sys_t  *p_sys = p_input->p_demux_data;
-    int64_t      i_pos;
-    pes_packet_t *p_pes;
-
-    if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
-    {
-        i_pos = stream_Tell( p_input->s );
-        if( p_sys->fmt.audio.i_blockalign != 0 )
-        {
-            i_pos += p_sys->fmt.audio.i_blockalign - i_pos % p_sys->fmt.audio.i_blockalign;
-            if( stream_Seek( p_input->s, i_pos ) )
-            {
-                msg_Err( p_input, "stream_Sekk failed (cannot resync)" );
-            }
-        }
-    }
-
-    input_ClockManageRef( p_input,
-                          p_input->stream.p_selected_program,
-                          p_sys->i_time * 9 / 100 );
+    demux_sys_t *p_sys = p_demux->p_sys;
+    int64_t     i_pos;
+    block_t     *p_block;
 
-    i_pos = stream_Tell( p_input->s );
+    i_pos = stream_Tell( p_demux->s );
 
     if( p_sys->i_data_size > 0 &&
         i_pos >= p_sys->i_data_pos + p_sys->i_data_size )
@@ -258,21 +325,28 @@ static int Demux( input_thread_t *p_input )
         return 0;
     }
 
-    if( ( p_pes = stream_PesPacket( p_input->s, p_sys->i_frame_size ) )==NULL )
+    if( ( p_block = stream_Block( p_demux->s, p_sys->i_frame_size ) ) == NULL )
     {
-        msg_Warn( p_input, "cannot read data" );
+        msg_Warn( p_demux, "cannot read data" );
         return 0;
     }
-    p_pes->i_dts =
-    p_pes->i_pts = input_ClockGetTS( p_input,
-                                     p_input->stream.p_selected_program,
-                                     p_sys->i_time * 9 / 100 );
 
-    es_out_Send( p_input->p_es_out, p_sys->p_es, p_pes );
+    p_block->i_dts = p_block->i_pts =
+        date_Increment( &p_sys->pts, p_sys->i_frame_samples );
+
+    /* set PCR */
+    es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts );
+
+    /* Do the channel reordering */
+    if( p_sys->b_chan_reorder )
+        aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer,
+                             p_sys->fmt.audio.i_channels,
+                             p_sys->pi_chan_table,
+                             p_sys->fmt.audio.i_bitspersample );
 
-    p_sys->i_time += p_sys->i_frame_length;
+    es_out_Send( p_demux->out, p_sys->p_es, p_block );
 
-    return( 1 );
+    return 1;
 }
 
 /*****************************************************************************
@@ -280,36 +354,53 @@ static int Demux( input_thread_t *p_input )
  *****************************************************************************/
 static void Close ( vlc_object_t * p_this )
 {
-    input_thread_t *p_input = (input_thread_t *)p_this;
-    demux_sys_t    *p_sys = p_input->p_demux_data;
+    demux_t     *p_demux = (demux_t*)p_this;
+    demux_sys_t *p_sys  = p_demux->p_sys;
 
     free( p_sys );
 }
 
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+    demux_sys_t *p_sys  = p_demux->p_sys;
+    int64_t i_end = -1;
+
+    if( p_sys->i_data_size > 0 )
+    {
+        i_end = p_sys->i_data_pos + p_sys->i_data_size;
+    }
+
+    return demux_vaControlHelper( p_demux->s, p_sys->i_data_pos, i_end,
+                                   p_sys->fmt.i_bitrate,
+                                   p_sys->fmt.audio.i_blockalign,
+                                   i_query, args );
+}
 
 /*****************************************************************************
  * Local functions
  *****************************************************************************/
-static int ChunkFind( input_thread_t *p_input,
-                      char *fcc, unsigned int *pi_size )
+static int ChunkFind( demux_t *p_demux, const char *fcc, unsigned int *pi_size )
 {
-    uint8_t     *p_peek;
+    const uint8_t *p_peek;
 
     for( ;; )
     {
-        int i_size;
+        uint32_t i_size;
 
-        if( stream_Peek( p_input->s, &p_peek, 8 ) < 8 )
+        if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
         {
-            msg_Err( p_input, "cannot peek()" );
+            msg_Err( p_demux, "cannot peek" );
             return VLC_EGENERIC;
         }
 
         i_size = GetDWLE( p_peek + 4 );
 
-        msg_Dbg( p_input, "Chunk: fcc=`%4.4s` size=%d", p_peek, i_size );
+        msg_Dbg( p_demux, "chunk: fcc=`%4.4s` size=%"PRIu32, p_peek, i_size );
 
-        if( !strncmp( p_peek, fcc, 4 ) )
+        if( !memcmp( p_peek, fcc, 4 ) )
         {
             if( pi_size )
             {
@@ -318,34 +409,25 @@ static int ChunkFind( input_thread_t *p_input,
             return VLC_SUCCESS;
         }
 
-        i_size = __EVEN( i_size ) + 8;
-        if( stream_Read( p_input->s, NULL, i_size ) != i_size )
-        {
+        /* Skip chunk */
+        if( stream_Read( p_demux->s, NULL, 8 ) != 8
+         || stream_Read( p_demux->s, NULL, i_size ) != i_size
+         || ((i_size & 1) && stream_Read( p_demux->s, NULL, 1 ) != 1 ))
             return VLC_EGENERIC;
-        }
     }
 }
 
-static void FrameInfo_PCM( input_thread_t *p_input,
-                           unsigned int   *pi_size,
-                           mtime_t        *pi_length )
+static void FrameInfo_PCM( demux_t *p_demux, unsigned int *pi_size,
+                           int *pi_samples )
 {
-    demux_sys_t    *p_sys = p_input->p_demux_data;
-
-    int i_samples;
-
-    int i_bytes;
-    int i_modulo;
+    demux_sys_t *p_sys = p_demux->p_sys;
+    int i_bytes, i_modulo;
 
     /* read samples for 50ms of */
-    i_samples = __MAX( p_sys->fmt.audio.i_samplerate / 20, 1 );
+    *pi_samples = __MAX( p_sys->fmt.audio.i_rate / 20, 1 );
 
-
-    *pi_length = (mtime_t)1000000 *
-                 (mtime_t)i_samples /
-                 (mtime_t)p_sys->fmt.audio.i_samplerate;
-
-    i_bytes = i_samples * p_sys->fmt.audio.i_channels * ( (p_sys->fmt.audio.i_bitspersample + 7) / 8 );
+    i_bytes = *pi_samples * p_sys->fmt.audio.i_channels *
+        ( (p_sys->fmt.audio.i_bitspersample + 7) / 8 );
 
     if( p_sys->fmt.audio.i_blockalign > 0 )
     {
@@ -354,42 +436,28 @@ static void FrameInfo_PCM( input_thread_t *p_input,
             i_bytes += p_sys->fmt.audio.i_blockalign - i_modulo;
         }
     }
+
     *pi_size = i_bytes;
 }
 
-static void FrameInfo_MS_ADPCM( input_thread_t *p_input,
-                              unsigned int   *pi_size,
-                              mtime_t        *pi_length )
+static void FrameInfo_MS_ADPCM( demux_t *p_demux, unsigned int *pi_size,
+                                int *pi_samples )
 {
-    demux_sys_t    *p_sys = p_input->p_demux_data;
-
-    int i_samples;
+    demux_sys_t *p_sys = p_demux->p_sys;
 
-    i_samples = 2 + 2 * ( p_sys->fmt.audio.i_blockalign -
-                                7 * p_sys->fmt.audio.i_channels ) / p_sys->fmt.audio.i_channels;
-
-    *pi_length = (mtime_t)1000000 *
-                 (mtime_t)i_samples /
-                 (mtime_t)p_sys->fmt.audio.i_samplerate;
+    *pi_samples = 2 + 2 * ( p_sys->fmt.audio.i_blockalign -
+        7 * p_sys->fmt.audio.i_channels ) / p_sys->fmt.audio.i_channels;
 
     *pi_size = p_sys->fmt.audio.i_blockalign;
 }
 
-static void FrameInfo_IMA_ADPCM( input_thread_t *p_input,
-                               unsigned int   *pi_size,
-                               mtime_t        *pi_length )
+static void FrameInfo_IMA_ADPCM( demux_t *p_demux, unsigned int *pi_size,
+                                 int *pi_samples )
 {
-    demux_sys_t    *p_sys = p_input->p_demux_data;
-
-    int i_samples;
+    demux_sys_t *p_sys = p_demux->p_sys;
 
-    i_samples = 2 * ( p_sys->fmt.audio.i_blockalign -
-                        4 * p_sys->fmt.audio.i_channels ) / p_sys->fmt.audio.i_channels;
-
-    *pi_length = (mtime_t)1000000 *
-                 (mtime_t)i_samples /
-                 (mtime_t)p_sys->fmt.audio.i_samplerate;
+    *pi_samples = 2 * ( p_sys->fmt.audio.i_blockalign -
+        4 * p_sys->fmt.audio.i_channels ) / p_sys->fmt.audio.i_channels;
 
     *pi_size = p_sys->fmt.audio.i_blockalign;
 }
-