* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc_demux.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc_codecs.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
/*****************************************************************************
* Module descriptor
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_description( _("XA demuxer") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux2", 10 );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("XA demuxer") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_capability( "demux", 10 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
int64_t i_data_offset;
unsigned int i_data_size;
+ unsigned int i_block_frames;
date_t pts;
};
uint16_t wBitsPerSample;
} xa_header_t;
-
/*****************************************************************************
* Open: check file and initializes structures
*****************************************************************************/
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
xa_header_t p_xa;
- uint8_t *p_buf;
+ const uint8_t *p_buf;
/* XA file heuristic */
if( stream_Peek( p_demux->s, &p_buf, sizeof( p_xa ) )
p_sys->i_data_offset = stream_Tell( p_demux->s );
/* FIXME: better computation */
p_sys->i_data_size = p_xa.iSize * 15 / 56;
+ /* How many frames per block (1:1 is too CPU intensive) */
+ p_sys->i_block_frames = p_sys->fmt.audio.i_rate / (28 * 20) + 1;
msg_Dbg( p_demux, "fourcc: %4.4s, channels: %d, "
"freq: %d Hz, bitrate: %dKo/s, blockalign: %d",
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block;
int64_t i_offset;
+ unsigned i_frames = p_sys->i_block_frames;
i_offset = stream_Tell( p_demux->s );
return 0;
}
- p_block = stream_Block( p_demux->s, p_sys->fmt.audio.i_bytes_per_frame );
+ p_block = stream_Block( p_demux->s, p_sys->fmt.audio.i_bytes_per_frame *
+ i_frames );
if( p_block == NULL )
{
msg_Warn( p_demux, "cannot read data" );
return 0;
}
- p_block->i_dts = p_block->i_pts =
- date_Increment( &p_sys->pts, p_sys->fmt.audio.i_frame_length );
-
+ i_frames = p_block->i_buffer / p_sys->fmt.audio.i_bytes_per_frame;
+ p_block->i_dts = p_block->i_pts = VLC_TS_0 + date_Get( &p_sys->pts );
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts );
-
es_out_Send( p_demux->out, p_sys->p_es, p_block );
+ date_Increment( &p_sys->pts, i_frames * p_sys->fmt.audio.i_frame_length );
+
return 1;
}
{
demux_sys_t *p_sys = p_demux->p_sys;
- return demux2_vaControlHelper( p_demux->s, p_sys->i_data_offset,
+ return demux_vaControlHelper( p_demux->s, p_sys->i_data_offset,
p_sys->i_data_size ? p_sys->i_data_offset
+ p_sys->i_data_size : -1,
p_sys->fmt.i_bitrate,