/*****************************************************************************
* au.c : au file input module for vlc
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: au.c,v 1.14 2004/03/03 11:40:19 fenrir Exp $
+ * Copyright (C) 2001-2007 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
/* TODO:
* - all adpcm things (I _NEED_ samples)
static void Close( vlc_object_t * );
vlc_module_begin();
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
set_description( _("AU demuxer") );
set_capability( "demux2", 10 );
set_callbacks( Open, Close );
int i_header_size;
};
-static int DemuxPCM( demux_t * );
+static int Demux( demux_t * );
static int Control ( demux_t *, int i_query, va_list args );
/*****************************************************************************
demux_sys_t *p_sys;
uint8_t hdr[20];
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_cat;
int i_samples, i_modulo;
- if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
- {
- msg_Warn( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
- if( strncmp( p_peek, ".snd", 4 ) )
+ CHECK_PEEK( p_peek, 4 );
+
+ if( memcmp( p_peek, ".snd", 4 ) )
{
- msg_Warn( p_demux, "AU module discarded" );
return VLC_EGENERIC;
}
return VLC_EGENERIC;
}
- p_sys = p_demux->p_sys = malloc( sizeof( demux_sys_t ) );
- p_sys->i_time = 0;
+ DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
+ p_sys->i_time = 1;
p_sys->i_header_size = GetDWBE( &hdr[0] );
/* skip extra header data */
(mtime_t)i_samples /
(mtime_t)p_sys->fmt.audio.i_rate;
- /* finish to set up p_demux */
- p_demux->pf_demux = DemuxPCM;
- p_demux->pf_control = Control;
-
return VLC_SUCCESS;
}
/*****************************************************************************
- * DemuxPCM: read packet and send them to decoders
+ * Demux: read packet and send them to decoders
*****************************************************************************
* Returns -1 in case of error, 0 in case of EOF, 1 otherwise
*****************************************************************************/
-static int DemuxPCM( demux_t *p_demux )
+static int Demux( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block;