*
* Authors: RĂ©mi Denis-Courmont <rem # 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
-#include <vlc_aout.h>
-
-#include <vlc_codecs.h>
/*****************************************************************************
* Module descriptor
/* read subsequent block 1 */
if( stream_Read( p_demux->s, buf, 4 ) < 4 )
return VLC_EGENERIC; /* EOF */
-
+
i_block_size = GetDWLE( buf ) >> 8;
msg_Dbg( p_demux, "new block: type: %u, size: %u",
(unsigned)*buf, i_block_size );
return VLC_EGENERIC;
}
+ if( new_fmt.audio.i_channels == 0 )
+ {
+ msg_Err( p_demux, "0 channels detected" );
+ return VLC_EGENERIC;
+ }
+
new_fmt.audio.i_bytes_per_frame = new_fmt.audio.i_channels
* (new_fmt.audio.i_bitspersample / 8);
new_fmt.audio.i_frame_length = 1;
{
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block;
- int64_t i_offset, i;
-
- i_offset = stream_Tell( p_demux->s );
-
- while( ( i_offset >= p_sys->i_block_end )
- && ( p_sys->i_silence_countdown == 0 ) )
- if( ReadBlockHeader( p_demux ) != VLC_SUCCESS )
- return 0;
+ int64_t i;
if( p_sys->i_silence_countdown == 0 )
{
+ int64_t i_offset = stream_Tell( p_demux->s );
+ if( i_offset >= p_sys->i_block_end )
+ {
+ if( ReadBlockHeader( p_demux ) != VLC_SUCCESS )
+ return 0;
+ return 1;
+ }
+
i = ( p_sys->i_block_end - i_offset )
/ p_sys->fmt.audio.i_bytes_per_frame;
if( i > SAMPLES_BUFFER )
if( i > SAMPLES_BUFFER )
i = SAMPLES_BUFFER;
- p_block = block_New( p_demux, i );
+ p_block = block_Alloc( i );
if( p_block == NULL )
return VLC_ENOMEM;
p_sys->i_silence_countdown -= i;
}
- p_block->i_dts = p_block->i_pts =
- date_Increment( &p_sys->pts, p_sys->fmt.audio.i_frame_length * i );
+ 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, p_sys->fmt.audio.i_frame_length * i );
+
return 1;
}