vlc_module_begin();
set_description( _("Ogg stream demuxer" ) );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
set_capability( "demux2", 50 );
set_callbacks( Open, Close );
add_shortcut( "ogg" );
/* Check if we are dealing with an ogg stream */
- if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
- {
- msg_Err( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
if( strcmp( p_demux->psz_demux, "ogg" ) && strncmp( p_peek, "OggS", 4 ) )
{
- msg_Warn( p_demux, "ogg module discarded (invalid header)" );
return VLC_EGENERIC;
}
{
p_stream->secondary_header_packets = 0;
}
-
- p_stream->secondary_header_packets--;
}
if( p_stream->b_reinit )
block_t *p_block;
vlc_bool_t b_selected;
int i_header_len = 0;
- mtime_t i_pts = 0;
+ mtime_t i_pts = -1, i_interpolated_pts;
/* Sanity check */
if( !p_oggpacket->bytes )
if( p_stream->b_force_backup )
{
uint8_t *p_extra;
- vlc_bool_t b_store_size = VLC_TRUE;
+ vlc_bool_t b_store_size = VLC_TRUE;
p_stream->i_packets_backup++;
switch( p_stream->fmt.i_codec )
break;
case VLC_FOURCC( 'f','l','a','c' ):
- if( p_stream->i_packets_backup == 2 )
+ if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 )
{
- Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
+ Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
p_stream->b_force_backup = 0;
}
+ else if( p_stream->fmt.audio.i_rate )
+ {
+ p_stream->b_force_backup = 0;
+ p_oggpacket->packet += 9; p_oggpacket->bytes -= 9;
+ }
b_store_size = VLC_FALSE;
break;
p_stream->fmt.i_extra = p_stream->i_headers;
p_stream->fmt.p_extra =
realloc( p_stream->fmt.p_extra, p_stream->i_headers );
- memcpy( p_stream->fmt.p_extra, p_stream->p_headers,
- p_stream->i_headers );
+ memcpy( p_stream->fmt.p_extra, p_stream->p_headers,
+ p_stream->i_headers );
es_out_Control( p_demux->out, ES_OUT_SET_FMT,
p_stream->p_es, &p_stream->fmt );
}
}
/* Convert the granulepos into the next pcr */
+ i_interpolated_pts = p_stream->i_interpolated_pcr;
Ogg_UpdatePCR( p_stream, p_oggpacket );
if( p_stream->i_pcr >= 0 )
if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
+ /* Normalize PTS */
+ if( i_pts == 0 ) i_pts = 1;
+ else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = 1;
+ else if( i_pts == -1 ) i_pts = 0;
+
if( p_stream->fmt.i_cat == AUDIO_ES )
p_block->i_dts = p_block->i_pts = i_pts;
else if( p_stream->fmt.i_cat == SPU_ES )
/* We remove the header from the packet */
i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
-
+
if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ))
{
/* But with subtitles we need to retrieve the duration first */
p_stream = malloc( sizeof(logical_stream_t) );
memset( p_stream, 0, sizeof(logical_stream_t) );
p_stream->p_headers = 0;
+ p_stream->secondary_header_packets = 0;
es_format_Init( &p_stream->fmt, 0, 0 );
p_stream->fmt.audio.i_channels,
(int)p_stream->f_rate, p_stream->fmt.i_bitrate );
}
- /* Check for Flac header */
+ /* Check for Flac header (< version 1.1.1) */
else if( oggpacket.bytes >= 4 &&
! strncmp( &oggpacket.packet[0], "fLaC", 4 ) )
{
p_stream->fmt.i_cat = AUDIO_ES;
p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
}
+ /* Check for Flac header (>= version 1.1.1) */
+ else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F &&
+ ! strncmp( &oggpacket.packet[1], "FLAC", 4 ) &&
+ ! strncmp( &oggpacket.packet[9], "fLaC", 4 ) )
+ {
+ int i_packets = ((int)oggpacket.packet[7]) << 8 |
+ oggpacket.packet[8];
+ msg_Dbg( p_demux, "found FLAC header version %i.%i "
+ "(%i header packets)",
+ oggpacket.packet[5], oggpacket.packet[6],
+ i_packets );
+
+ p_stream->b_force_backup = 1;
+
+ p_stream->fmt.i_cat = AUDIO_ES;
+ p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
+ oggpacket.packet += 13; oggpacket.bytes -= 13;
+ Ogg_ReadFlacHeader( p_demux, p_stream, &oggpacket );
+ }
/* Check for Theora header */
else if( oggpacket.bytes >= 7 &&
! strncmp( &oggpacket.packet[1], "theora", 6 ) )
bs_t s;
bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes );
+
bs_read( &s, 1 );
if( bs_read( &s, 7 ) == 0 )
{
if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ )
- {
- bs_skip( &s, 80 );
- p_stream->f_rate = p_stream->fmt.audio.i_rate = bs_read( &s, 20 );
- p_stream->fmt.audio.i_channels = bs_read( &s, 3 ) + 1;
-
- msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i",
- p_stream->fmt.audio.i_channels, (int)p_stream->f_rate );
- }
- else msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" );
-
- /* Fake this as the last metadata block */
- *((uint8_t*)p_oggpacket->packet) |= 0x80;
+ {
+ bs_skip( &s, 80 );
+ p_stream->f_rate = p_stream->fmt.audio.i_rate = bs_read( &s, 20 );
+ p_stream->fmt.audio.i_channels = bs_read( &s, 3 ) + 1;
+
+ msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i",
+ p_stream->fmt.audio.i_channels, (int)p_stream->f_rate );
+ }
+ else msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" );
+
+ /* Fake this as the last metadata block */
+ *((uint8_t*)p_oggpacket->packet) |= 0x80;
}
else
{
p_stream->secondary_header_packets =
GetDWLE( &p_oggpacket->packet[24] );
- msg_Dbg( p_this, "anxdata packet info: %qd/%qd, %d",
- granule_rate_numerator, granule_rate_denominator,
- p_stream->secondary_header_packets);
-
/* we are guaranteed that the first header field will be
* the content-type (by the Annodex standard) */
- sscanf( &p_oggpacket->packet[28], "Content-Type: %1024s\r\n",
- content_type_string );
+ if( !strncasecmp( &p_oggpacket->packet[28], "Content-Type: ", 14 ) )
+ {
+ sscanf( &p_oggpacket->packet[42], "%1024s\r\n",
+ content_type_string );
+ }
+
+ msg_Dbg( p_this, "AnxData packet info: "I64Fd" / "I64Fd", %d, ``%s''",
+ granule_rate_numerator, granule_rate_denominator,
+ p_stream->secondary_header_packets, content_type_string );
p_stream->f_rate = (float) granule_rate_numerator /
(float) granule_rate_denominator;
p_stream->b_force_backup = 1;
}
+ else if( !strncmp(content_type_string, "audio/x-speex", 14) )
+ {
+ p_stream->fmt.i_cat = AUDIO_ES;
+ p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' );
+
+ p_stream->b_force_backup = 1;
+ }
else if( !strncmp(content_type_string, "video/x-theora", 14) )
{
p_stream->fmt.i_cat = VIDEO_ES;