* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
/* TODO:
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-vlc_module_begin();
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_description( _("AIFF demuxer" ) );
- set_capability( "demux2", 10 );
- set_callbacks( Open, Close );
- add_shortcut( "aiff" );
-vlc_module_end();
+vlc_module_begin ()
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_description( N_("AIFF demuxer" ) )
+ set_capability( "demux", 10 )
+ set_callbacks( Open, Close )
+ add_shortcut( "aiff" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
int i_exp = 30 - p[1];
unsigned int i_last = 0;
- while( i_exp-- )
+ while( i_exp-- > 0 )
{
i_last = i_mantissa;
i_mantissa >>= 1;
if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 )
return VLC_EGENERIC;
- if( memcmp( p_peek, "FORM", 4 )
- || memcmp( &p_peek[8], "AIFF", 4 ) )
+ if( memcmp( p_peek, "FORM", 4 ) || memcmp( &p_peek[8], "AIFF", 4 ) )
return VLC_EGENERIC;
/* skip aiff header */
/* Fill p_demux field */
DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
es_format_Init( &p_sys->fmt, UNKNOWN_ES, 0 );
- p_sys->i_time = 1;
+ p_sys->i_time = 0;
p_sys->i_ssnd_pos = -1;
for( ;; )
{
uint32_t i_size;
- CHECK_PEEK_GOTO( p_peek, 8 );
+ if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
+ goto error;
+
i_size = GetDWBE( &p_peek[4] );
msg_Dbg( p_demux, "chunk fcc=%4.4s size=%d", p_peek, i_size );
if( !memcmp( p_peek, "COMM", 4 ) )
{
- CHECK_PEEK_GOTO( p_peek, 18+8 );
+ if( stream_Peek( p_demux->s, &p_peek, 18+8 ) < 18+8 )
+ goto error;
+
es_format_Init( &p_sys->fmt, AUDIO_ES, VLC_FOURCC( 't', 'w', 'o', 's' ) );
p_sys->fmt.audio.i_channels = GetWBE( &p_peek[8] );
p_sys->fmt.audio.i_bitspersample = GetWBE( &p_peek[14] );
}
else if( !memcmp( p_peek, "SSND", 4 ) )
{
- CHECK_PEEK_GOTO( p_peek, 8+8 );
+ if( stream_Peek( p_demux->s, &p_peek, 8+8 ) < 8+8 )
+ goto error;
+
p_sys->i_ssnd_pos = stream_Tell( p_demux->s );
p_sys->i_ssnd_size = i_size;
p_sys->i_ssnd_offset = GetDWBE( &p_peek[8] );
}
/* Set PCR */
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time);
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_time);
/* we will read 100ms at once */
i_read = p_sys->i_ssnd_fsize * ( p_sys->fmt.audio.i_rate / 10 );
}
p_block->i_dts =
- p_block->i_pts = p_sys->i_time;
+ p_block->i_pts = VLC_TS_0 + p_sys->i_time;
p_sys->i_time += (int64_t)1000000 *
p_block->i_buffer /
{
return VLC_EGENERIC;
}
- p_sys->i_time = 1 + (int64_t)1000000 * i_frame / p_sys->fmt.audio.i_rate;
+ p_sys->i_time = (int64_t)1000000 * i_frame / p_sys->fmt.audio.i_rate;
return VLC_SUCCESS;
}
return VLC_EGENERIC;