/*****************************************************************************
* ogg.c : ogg stream demux module for vlc
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_input.h>
+#include <vlc_demux.h>
#include <ogg/ogg.h>
-#include "codecs.h"
-#include "vlc_bits.h"
+#include <vlc_codecs.h>
+#include <vlc_bits.h>
/*****************************************************************************
* Module descriptor
static void Close( vlc_object_t * );
vlc_module_begin();
- set_description( _("Ogg stream demuxer" ) );
+ set_shortname ( "OGG" );
+ set_description( _("OGG demuxer" ) );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
set_capability( "demux2", 50 );
static int Open( vlc_object_t * p_this )
{
demux_t *p_demux = (demux_t *)p_this;
+ input_thread_t *p_input;
demux_sys_t *p_sys;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
/* Check if we are dealing with an ogg stream */
- if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
+ if( !p_demux->b_force && memcmp( p_peek, "OggS", 4 ) )
{
- msg_Err( p_demux, "cannot peek" );
- 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;
}
/* Begnning of stream, tell the demux to look for elementary streams. */
p_sys->i_eos = 0;
+
+ p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( p_input )
+ {
+ module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
+ if( p_meta )
+ {
+ vlc_meta_Merge( input_GetItem(p_input)->p_meta, (vlc_meta_t*)(p_demux->p_private ) );
+ module_Unneed( p_demux, p_meta );
+ }
+ vlc_object_release( p_input );
+ return VLC_SUCCESS;
+ }
+ if( p_input )
+ vlc_object_release( p_input );
+
/* Initialize the Ogg physical bitstream parser */
ogg_sync_init( &p_sys->oy );
{
if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[1], "theora", 6 ) )
+ ! memcmp( &oggpacket.packet[1], "theora", 6 ) )
{
Ogg_ReadTheoraHeader( p_stream, &oggpacket );
p_stream->secondary_header_packets = 0;
}
else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
+ ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) )
{
Ogg_ReadVorbisHeader( p_stream, &oggpacket );
p_stream->secondary_header_packets = 0;
{
demux_sys_t *p_ogg = p_demux->p_sys ;
int i_read = 0;
- byte_t *p_buffer;
+ char *p_buffer;
while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
{
}
if( p_oggpacket->bytes >= 7 &&
- ! strncmp ( &p_oggpacket->packet[0], "Annodex", 7 ) )
+ ! memcmp ( &p_oggpacket->packet[0], "Annodex", 7 ) )
{
/* it's an Annodex packet -- skip it (do nothing) */
- return;
+ return;
}
else if( p_oggpacket->bytes >= 7 &&
- ! strncmp ( &p_oggpacket->packet[0], "AnxData", 7 ) )
+ ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) )
{
/* it's an AnxData packet -- skip it (do nothing) */
- return;
+ return;
}
+ if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) &&
+ p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return;
+
/* Check the ES is selected */
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
p_stream->p_es, &b_selected );
case VLC_FOURCC( 'v','o','r','b' ):
case VLC_FOURCC( 's','p','x',' ' ):
case VLC_FOURCC( 't','h','e','o' ):
- if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
- break;
+ if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
+ break;
case VLC_FOURCC( 'f','l','a','c' ):
- if( p_stream->i_packets_backup == 2 )
- {
- Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
- p_stream->b_force_backup = 0;
- }
- b_store_size = VLC_FALSE;
- break;
+ if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 )
+ {
+ 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;
+ if( p_oggpacket->bytes >= 9 )
+ {
+ p_oggpacket->packet += 9;
+ p_oggpacket->bytes -= 9;
+ }
+ }
+ b_store_size = VLC_FALSE;
+ break;
default:
- p_stream->b_force_backup = 0;
- break;
+ p_stream->b_force_backup = 0;
+ break;
}
/* Backup the ogg packet (likely an header packet) */
return;
}
+ if( p_oggpacket->bytes <= 0 )
+ return;
+
if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
/* Normalize PTS */
/* 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 */
int i, lenbytes = 0;
-
+
if( i_header_len > 0 && p_oggpacket->bytes >= i_header_len + 1 )
{
for( i = 0, lenbytes = 0; i < i_header_len; i++ )
}
if( p_oggpacket->bytes - 1 - i_header_len > 2 ||
( p_oggpacket->packet[i_header_len + 1] != ' ' &&
- p_oggpacket->packet[i_header_len + 1] != 0 &&
+ p_oggpacket->packet[i_header_len + 1] != 0 &&
p_oggpacket->packet[i_header_len + 1] != '\n' &&
p_oggpacket->packet[i_header_len + 1] != '\r' ) )
{
}
i_header_len++;
- p_block->i_buffer -= i_header_len;
+ if( p_block->i_buffer >= i_header_len )
+ p_block->i_buffer -= i_header_len;
+ else
+ p_block->i_buffer = 0;
}
if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) )
/* Check for Vorbis header */
if( oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
+ ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) )
{
Ogg_ReadVorbisHeader( p_stream, &oggpacket );
msg_Dbg( p_demux, "found vorbis header" );
}
/* Check for Speex header */
else if( oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[0], "Speex", 5 ) )
+ ! memcmp( &oggpacket.packet[0], "Speex", 5 ) )
{
Ogg_ReadSpeexHeader( p_stream, &oggpacket );
msg_Dbg( p_demux, "found speex header, channels: %i, "
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 ) )
+ ! memcmp( &oggpacket.packet[0], "fLaC", 4 ) )
{
msg_Dbg( p_demux, "found FLAC header" );
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 &&
+ ! memcmp( &oggpacket.packet[1], "FLAC", 4 ) &&
+ ! memcmp( &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 ) )
+ ! memcmp( &oggpacket.packet[1], "theora", 6 ) )
{
Ogg_ReadTheoraHeader( p_stream, &oggpacket );
}
/* Check for Tarkin header */
else if( oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[1], "tarkin", 6 ) )
+ ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) )
{
oggpack_buffer opb;
}
/* Check for Annodex header */
else if( oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[0], "Annodex", 7 ) )
+ ! memcmp( &oggpacket.packet[0], "Annodex", 7 ) )
{
Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
&oggpacket );
}
/* Check for Annodex header */
else if( oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[0], "AnxData", 7 ) )
+ ! memcmp( &oggpacket.packet[0], "AnxData", 7 ) )
{
Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
&oggpacket );
}
else if( oggpacket.bytes >= 142 &&
- !strncmp( &oggpacket.packet[1],
+ !memcmp( &oggpacket.packet[1],
"Direct Show Samples embedded in Ogg", 35 ))
{
/* Old header type */
msg_Dbg( p_demux, "found video header of type: %.4s",
(char *)&p_stream->fmt.i_codec );
+ p_stream->fmt.video.i_frame_rate = 10000000;
+ p_stream->fmt.video.i_frame_rate_base =
+ GetQWLE((oggpacket.packet+164));
p_stream->f_rate = 10000000.0 /
GetQWLE((oggpacket.packet+164));
p_stream->fmt.video.i_bits_per_pixel =
msg_Dbg( p_demux, "found video header of type: %.4s",
(char *)&p_stream->fmt.i_codec );
+ p_stream->fmt.video.i_frame_rate = 10000000;
+ p_stream->fmt.video.i_frame_rate_base =
+ GetQWLE(&st->time_unit);
p_stream->f_rate = 10000000.0 /
GetQWLE(&st->time_unit);
p_stream->fmt.video.i_bits_per_pixel =
bs_read( &bitstream, 24 ); /* aspect_numerator */
bs_read( &bitstream, 24 ); /* aspect_denominator */
+ p_stream->fmt.video.i_frame_rate = i_fps_numerator;
+ p_stream->fmt.video.i_frame_rate_base = i_fps_denominator;
+
bs_read( &bitstream, 8 ); /* colorspace */
p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 );
bs_read( &bitstream, 6 ); /* quality */
bs_t s;
bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes );
+
bs_read( &s, 1 );
if( bs_read( &s, 7 ) == 0 )
{
logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
- if( ! strncmp( &p_oggpacket->packet[0], "Annodex", 7 ) )
+ if( p_oggpacket->bytes >= 28 &&
+ !memcmp( &p_oggpacket->packet[0], "Annodex", 7 ) )
{
oggpack_buffer opb;
timebase_numerator = GetQWLE( &p_oggpacket->packet[16] );
timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
}
- else if( ! strncmp( &p_oggpacket->packet[0], "AnxData", 7 ) )
+ else if( p_oggpacket->bytes >= 42 &&
+ !memcmp( &p_oggpacket->packet[0], "AnxData", 7 ) )
{
uint64_t granule_rate_numerator;
uint64_t granule_rate_denominator;
/* we are guaranteed that the first header field will be
* the content-type (by the Annodex standard) */
- if( !strncasecmp( &p_oggpacket->packet[28], "Content-Type: ", 14 ) )
+ content_type_string[0] = '\0';
+ if( !strncasecmp( (char*)(&p_oggpacket->packet[28]), "Content-Type: ", 14 ) )
{
- sscanf( &p_oggpacket->packet[42], "%1024s\r\n",
- content_type_string );
+ uint8_t *p = memchr( &p_oggpacket->packet[42], '\r',
+ p_oggpacket->bytes - 1 );
+ if( p && p[0] == '\r' && p[1] == '\n' )
+ sscanf( (char*)(&p_oggpacket->packet[42]), "%1024s\r\n",
+ content_type_string );
}
msg_Dbg( p_this, "AnxData packet info: "I64Fd" / "I64Fd", %d, ``%s''",
projects / vlc / blobdiff