} sh;
} stream_header_t;
-#define OGG_BLOCK_SIZE 4096
/* Some defines from OggDS */
#define PACKET_TYPE_HEADER 0x01
static int Demux( demux_t * p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
- ogg_page oggpage;
ogg_packet oggpacket;
int i_stream;
bool b_skipping = false;
/*
* Demux an ogg page from the stream
*/
- if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
+ if( Ogg_ReadPage( p_demux, &p_sys->current_page ) != VLC_SUCCESS )
return 0; /* EOF */
/* Test for End of Stream */
- if( ogg_page_eos( &oggpage ) )
+ if( ogg_page_eos( &p_sys->current_page ) )
p_sys->i_eos++;
}
if( !p_sys->b_page_waiting )
{
if( p_sys->i_streams == 1 &&
- ogg_page_serialno( &oggpage ) != p_stream->os.serialno )
+ ogg_page_serialno( &p_sys->current_page ) != p_stream->os.serialno )
{
msg_Err( p_demux, "Broken Ogg stream (serialno) mismatch" );
- ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &oggpage ) );
+ ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &p_sys->current_page ) );
p_stream->b_reinit = true;
p_stream->i_pcr = -1;
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
}
- if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
+ if( ogg_stream_pagein( &p_stream->os, &p_sys->current_page ) != 0 )
{
continue;
}
while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
{
- p_buffer = ogg_sync_buffer( &p_ogg->oy, OGG_BLOCK_SIZE );
+ p_buffer = ogg_sync_buffer( &p_ogg->oy, OGGSEEK_BYTES_TO_READ );
- i_read = stream_Read( p_demux->s, p_buffer, OGG_BLOCK_SIZE );
+ i_read = stream_Read( p_demux->s, p_buffer, OGGSEEK_BYTES_TO_READ );
if( i_read <= 0 )
return VLC_EGENERIC;
( iframe << p_stream->i_granule_shift );
p_stream->i_pcr = ( iframe + pframe - p_stream->i_keyframe_offset )
- * INT64_C(1000000) / p_stream->f_rate;
+ * INT64_C(1000000) / p_stream->f_rate;
}
else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
{
{
demux_sys_t *p_ogg = p_demux->p_sys ;
ogg_packet oggpacket;
- ogg_page oggpage;
int i_stream;
p_ogg->i_total_length = stream_Size ( p_demux->s );
msg_Dbg( p_demux, "File length is %"PRId64" bytes", p_ogg->i_total_length );
- while( Ogg_ReadPage( p_demux, &oggpage ) == VLC_SUCCESS )
+ while( Ogg_ReadPage( p_demux, &p_ogg->current_page ) == VLC_SUCCESS )
{
- if( ogg_page_bos( &oggpage ) )
+
+ if( ogg_page_bos( &p_ogg->current_page ) )
{
/* All is wonderful in our fine fine little world.
* We found the beginning of our first logical stream. */
- while( ogg_page_bos( &oggpage ) )
+ while( ogg_page_bos( &p_ogg->current_page ) )
{
logical_stream_t *p_stream;
es_format_Init( &p_stream->fmt_old, 0, 0 );
/* Setup the logical stream */
- p_stream->i_serial_no = ogg_page_serialno( &oggpage );
+ p_stream->i_serial_no = ogg_page_serialno( &p_ogg->current_page );
ogg_stream_init( &p_stream->os, p_stream->i_serial_no );
/* Extract the initial header from the first page and verify
* the codec type of this Ogg bitstream */
- if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 )
+ if( ogg_stream_pagein( &p_stream->os, &p_ogg->current_page ) < 0 )
{
/* error. stream version mismatch perhaps */
msg_Err( p_demux, "error reading first page of "
}
/* Check for Dirac header */
else if( ( oggpacket.bytes >= 5 &&
- ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) ||
- ( oggpacket.bytes >= 9 &&
- ! memcmp( oggpacket.packet, "KW-DIRAC\x00", 9 ) ) )
- {
- if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) )
- msg_Dbg( p_demux, "found dirac header" );
+ ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) ||
+ ( oggpacket.bytes >= 9 &&
+ ! memcmp( oggpacket.packet, "KW-DIRAC\x00", 9 ) ) )
+ {
+ if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) )
+ msg_Dbg( p_demux, "found dirac header" );
else
{
msg_Warn( p_demux, "found dirac header isn't decodable" );
p_ogg->i_streams--;
}
- if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
+ if( Ogg_ReadPage( p_demux, &p_ogg->current_page ) != VLC_SUCCESS )
return VLC_EGENERIC;
}
for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
{
if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os,
- &oggpage ) == 0 )
+ &p_ogg->current_page ) == 0 )
{
p_ogg->b_page_waiting = true;
break;