/*****************************************************************************
* 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>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
+#include <vlc_meta.h>
+#include <vlc_input.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_capability( "demux2", 50 );
+ set_shortname ( "OGG" );
+ set_description( N_("OGG demuxer" ) );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
+ set_capability( "demux", 50 );
set_callbacks( Open, Close );
add_shortcut( "ogg" );
vlc_module_end();
/* Misc */
int b_reinit;
- int i_theora_keyframe_granule_shift;
+ int i_granule_shift;
+
+ /* kate streams have the number of headers in the ID header */
+ int i_kate_num_headers;
/* for Annodex logical bitstreams */
int secondary_header_packets;
static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * );
static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * );
static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * );
+static void Ogg_ReadKateHeader( logical_stream_t *, ogg_packet * );
static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * );
static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * );
+static void Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * );
+static uint32_t Ogg_ReadDiracPictureNumber( ogg_packet *p_oggpacket );
/*****************************************************************************
* Open: initializes ogg demux structures
{
demux_t *p_demux = (demux_t *)p_this;
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 )
- {
- msg_Err( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
- if( strcmp( p_demux->psz_demux, "ogg" ) && strncmp( p_peek, "OggS", 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_Warn( p_demux, "ogg module discarded (invalid header)" );
return VLC_EGENERIC;
}
{
if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[1], "theora", 6 ) )
+ ! memcmp( oggpacket.packet, "\x80theora", 7 ) )
{
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, "\x01vorbis", 7 ) )
{
Ogg_ReadVorbisHeader( p_stream, &oggpacket );
p_stream->secondary_header_packets = 0;
{
p_stream->secondary_header_packets = 0;
}
-
- p_stream->secondary_header_packets--;
}
if( p_stream->b_reinit )
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
}
-
return 1;
}
{
demux_sys_t *p_sys = p_demux->p_sys;
int64_t *pi64;
+ bool *pb_bool;
int i;
switch( i_query )
{
+ case DEMUX_HAS_UNSUPPORTED_META:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
+ return VLC_SUCCESS;
+
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = p_sys->i_pcr;
ogg_sync_reset( &p_sys->oy );
default:
- return demux2_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
+ return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
1, i_query, args );
}
}
{
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 )
{
/* Convert the granulepos into a pcr */
if( p_oggpacket->granulepos >= 0 )
{
- if( p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) )
+ if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) ||
+ p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) ||
+ p_stream->fmt.i_codec == VLC_FOURCC( 'k','a','t','e' ) )
{
- p_stream->i_pcr = p_oggpacket->granulepos * I64C(1000000)
+ ogg_int64_t iframe = p_oggpacket->granulepos >>
+ p_stream->i_granule_shift;
+ ogg_int64_t pframe = p_oggpacket->granulepos -
+ ( iframe << p_stream->i_granule_shift );
+
+ p_stream->i_pcr = ( iframe + pframe ) * INT64_C(1000000)
/ p_stream->f_rate;
}
else
{
- ogg_int64_t iframe = p_oggpacket->granulepos >>
- p_stream->i_theora_keyframe_granule_shift;
- ogg_int64_t pframe = p_oggpacket->granulepos -
- ( iframe << p_stream->i_theora_keyframe_granule_shift );
-
- p_stream->i_pcr = ( iframe + pframe ) * I64C(1000000)
+ p_stream->i_pcr = p_oggpacket->granulepos * INT64_C(1000000)
/ p_stream->f_rate;
}
* If we can't then don't touch the old value. */
if( p_stream->fmt.i_cat == VIDEO_ES )
/* 1 frame per packet */
- p_stream->i_interpolated_pcr += (I64C(1000000) / p_stream->f_rate);
+ p_stream->i_interpolated_pcr += (INT64_C(1000000) / p_stream->f_rate);
else if( p_stream->fmt.i_bitrate )
p_stream->i_interpolated_pcr +=
- ( p_oggpacket->bytes * I64C(1000000) /
+ ( p_oggpacket->bytes * INT64_C(1000000) /
p_stream->fmt.i_bitrate / 8 );
}
}
ogg_packet *p_oggpacket )
{
block_t *p_block;
- vlc_bool_t b_selected;
+ bool 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_oggpacket->bytes >= 7 &&
- ! strncmp ( &p_oggpacket->packet[0], "Annodex", 7 ) )
+ ! memcmp ( p_oggpacket->packet, "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, "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 );
if( p_stream->b_force_backup )
{
uint8_t *p_extra;
- vlc_bool_t b_store_size = VLC_TRUE;
+ bool b_store_size = true;
+ bool b_store_num_headers = false;
p_stream->i_packets_backup++;
switch( p_stream->fmt.i_codec )
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 = false;
+ break;
+
+ case VLC_FOURCC( 'k','a','t','e' ):
+ if( p_stream->i_packets_backup == 1)
+ b_store_num_headers = true;
+ if( p_stream->i_packets_backup == p_stream->i_kate_num_headers ) p_stream->b_force_backup = 0;
+ break;
default:
- p_stream->b_force_backup = 0;
- break;
+ p_stream->b_force_backup = 0;
+ break;
}
/* Backup the ogg packet (likely an header packet) */
p_stream->p_headers =
realloc( p_stream->p_headers, p_stream->i_headers +
- p_oggpacket->bytes + (b_store_size ? 2 : 0) );
+ p_oggpacket->bytes + (b_store_size ? 2 : 0) + (b_store_num_headers ? 1 : 0) );
p_extra = p_stream->p_headers + p_stream->i_headers;
+ if( b_store_num_headers )
+ {
+ /* Kate streams store the number of headers in the first header,
+ so we can't just test for 3 as Vorbis/Theora */
+ *(p_extra++) = p_stream->i_kate_num_headers;
+ }
if( b_store_size )
{
*(p_extra++) = p_oggpacket->bytes >> 8;
*(p_extra++) = p_oggpacket->bytes & 0xFF;
}
memcpy( p_extra, p_oggpacket->packet, p_oggpacket->bytes );
- p_stream->i_headers += p_oggpacket->bytes + (b_store_size ? 2 : 0);
+ p_stream->i_headers += p_oggpacket->bytes + (b_store_size ? 2 : 0) + (b_store_num_headers ? 1 : 0);
if( !p_stream->b_force_backup )
{
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 );
}
- b_selected = VLC_FALSE; /* Discard the header packet */
+ b_selected = false; /* Discard the header packet */
}
/* Convert the pcr into a pts */
}
/* 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 )
return;
}
+ if( p_oggpacket->bytes <= 0 )
+ return;
+
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 )
}
else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) )
p_block->i_dts = p_block->i_pts = i_pts;
+ else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) )
+ {
+ /* every packet[1] in the stream contains a picture, there may
+ * be header cruft infront of it though
+ * [1] EXCEPT the BOS page/packet */
+ uint32_t u_pnum = Ogg_ReadDiracPictureNumber( p_oggpacket );
+
+ if ( u_pnum != 0xffffffff ) {
+ p_block->i_dts =
+ p_block->i_pts = (u_pnum * INT64_C(1000000) / p_stream->f_rate);
+ }
+ }
else
{
p_block->i_dts = i_pts;
p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
p_stream->fmt.i_codec != VLC_FOURCC( 't','a','r','k' ) &&
p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'c','m','m','l' ) )
+ p_stream->fmt.i_codec != VLC_FOURCC( 'c','m','m','l' ) &&
+ p_stream->fmt.i_codec != VLC_FOURCC( 'd','r','a','c' ) &&
+ p_stream->fmt.i_codec != VLC_FOURCC( 'k','a','t','e' ) )
{
/* 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 >= (unsigned int)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' ) )
{
/* FIXME: the biggest hack I've ever done */
- msg_Warn( p_demux, "tarkin pts: "I64Fd", granule: "I64Fd,
+ msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64,
p_block->i_pts, p_block->i_dts );
msleep(10000);
}
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 );
/* Check for Vorbis header */
if( oggpacket.bytes >= 7 &&
- ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
+ ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
{
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 ) )
+ else if( oggpacket.bytes >= 5 &&
+ ! memcmp( oggpacket.packet, "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, "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, "\x80theora", 7 ) )
{
Ogg_ReadTheoraHeader( p_stream, &oggpacket );
"found theora header, bitrate: %i, rate: %f",
p_stream->fmt.i_bitrate, p_stream->f_rate );
}
+ /* Check for Dirac header */
+ else if( oggpacket.bytes >= 5 &&
+ ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) )
+ {
+ Ogg_ReadDiracHeader( p_stream, &oggpacket );
+ msg_Dbg( p_demux, "found dirac header" );
+ }
/* 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, "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, "AnxData", 7 ) )
{
Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
&oggpacket );
}
+ /* Check for Kate header */
+ else if( oggpacket.bytes >= 8 &&
+ ! memcmp( &oggpacket.packet[1], "kate\0\0\0", 7 ) )
+ {
+ Ogg_ReadKateHeader( p_stream, &oggpacket );
+ msg_Dbg( p_demux, "found kate header" );
+ }
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 =
p_ogg->i_streams--;
}
}
+ else if( oggpacket.bytes >= 7 &&
+ ! memcmp( oggpacket.packet, "fishead", 7 ) )
+
+ {
+ /* Skeleton */
+ msg_Dbg( p_demux, "stream %d is a skeleton",
+ p_ogg->i_streams-1 );
+ /* FIXME: https://trac.videolan.org/vlc/ticket/1412 */
+ }
else
{
msg_Dbg( p_demux, "stream %d is of unknown type",
#define p_stream p_ogg->pp_stream[i_stream]
p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt );
+ // TODO: something to do here ?
if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
{
/* Set the CMML stream active */
p_ogg->i_bitrate -= p_stream->fmt.i_bitrate;
ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os );
- if( p_ogg->pp_stream[i_stream]->p_headers)
- free( p_ogg->pp_stream[i_stream]->p_headers );
+ free( p_ogg->pp_stream[i_stream]->p_headers );
es_format_Clean( &p_stream->fmt );
#undef p_stream
/* Reinit p_ogg */
- if( p_ogg->pp_stream ) free( p_ogg->pp_stream );
+ free( p_ogg->pp_stream );
p_ogg->pp_stream = NULL;
p_ogg->i_streams = 0;
}
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 */
i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 );
/* granule_shift = i_log( frequency_force -1 ) */
- p_stream->i_theora_keyframe_granule_shift = 0;
+ p_stream->i_granule_shift = 0;
i_keyframe_frequency_force--;
while( i_keyframe_frequency_force )
{
- p_stream->i_theora_keyframe_granule_shift++;
+ p_stream->i_granule_shift++;
i_keyframe_frequency_force >>= 1;
}
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
{
}
}
+static void Ogg_ReadKateHeader( logical_stream_t *p_stream,
+ ogg_packet *p_oggpacket )
+{
+ oggpack_buffer opb;
+ int32_t gnum;
+ int32_t gden;
+ int n;
+
+ p_stream->fmt.i_cat = SPU_ES;
+ p_stream->fmt.i_codec = VLC_FOURCC( 'k','a','t','e' );
+
+ /* Signal that we want to keep a backup of the kate
+ * stream headers. They will be used when switching between
+ * kate streams. */
+ p_stream->b_force_backup = 1;
+
+ /* Cheat and get additionnal info ;) */
+ oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
+ oggpack_adv( &opb, 11*8 ); /* packet type, kate magic, version */
+ p_stream->i_kate_num_headers = oggpack_read( &opb, 8 );
+ oggpack_adv( &opb, 3*8 );
+ p_stream->i_granule_shift = oggpack_read( &opb, 8 );
+ oggpack_adv( &opb, 8*8 ); /* reserved */
+ gnum = oggpack_read( &opb, 32 );
+ gden = oggpack_read( &opb, 32 );
+ p_stream->f_rate = (double)gnum/gden;
+
+ p_stream->fmt.psz_language = malloc(16);
+ if (p_stream->fmt.psz_language)
+ {
+ for (n=0;n<16;++n)
+ p_stream->fmt.psz_language[n] = oggpack_read(&opb,8);
+ p_stream->fmt.psz_language[15] = 0; /* just in case */
+ }
+ else
+ {
+ for (n=0;n<16;++n)
+ oggpack_read(&opb,8);
+ }
+ p_stream->fmt.psz_description = malloc(16);
+ if (p_stream->fmt.psz_description)
+ {
+ for (n=0;n<16;++n)
+ p_stream->fmt.psz_description[n] = oggpack_read(&opb,8);
+ p_stream->fmt.psz_description[15] = 0; /* just in case */
+ }
+ else
+ {
+ for (n=0;n<16;++n)
+ oggpack_read(&opb,8);
+ }
+}
+
static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
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, "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, "AnxData", 7 ) )
{
uint64_t granule_rate_numerator;
uint64_t granule_rate_denominator;
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 );
+ content_type_string[0] = '\0';
+ if( !strncasecmp( (char*)(&p_oggpacket->packet[28]), "Content-Type: ", 14 ) )
+ {
+ 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: %"PRId64" / %"PRId64", %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;
}
}
}
+
+/* every packet[1] in the stream contains a picture, there may
+ * be header cruft infront of it though
+ * [1] EXCEPT the BOS page/packet */
+static uint32_t Ogg_ReadDiracPictureNumber( ogg_packet *p_oggpacket )
+{
+ uint32_t u_pos = 4;
+ /* find the picture startcode */
+ while ( (p_oggpacket->packet[u_pos] & 0x08) == 0) {
+ /* skip to the next dirac parse unit */
+ u_pos += GetDWBE( p_oggpacket->packet + u_pos + 1 );
+ /* protect against falling off the edge */
+ if ( u_pos > p_oggpacket->bytes )
+ return -1;
+ }
+
+ uint32_t u_pnum = GetDWBE( p_oggpacket->packet + u_pos + 9 );
+
+ return u_pnum;
+}
+
+static uint32_t dirac_uint( bs_t *p_bs )
+{
+ uint32_t count = 0, value = 0;
+ while( !bs_read ( p_bs, 1 ) ) {
+ count++;
+ value <<= 1;
+ value |= bs_read ( p_bs, 1 );
+ }
+
+ return (1<<count) - 1 + value;
+}
+
+static int dirac_bool( bs_t *p_bs )
+{
+ return bs_read ( p_bs, 1 );
+}
+
+static void Ogg_ReadDiracHeader( logical_stream_t *p_stream,
+ ogg_packet *p_oggpacket )
+{
+ bs_t bs;
+
+ p_stream->fmt.i_cat = VIDEO_ES;
+ p_stream->fmt.i_codec = VLC_FOURCC( 'd','r','a','c' );
+ p_stream->i_granule_shift = 32;
+
+ /* Backing up stream headers is not required -- seqhdrs are repeated
+ * thoughout the stream at suitable decoding start points */
+ p_stream->b_force_backup = 0;
+
+ /* read in useful bits from sequence header */
+ bs_init( &bs, p_oggpacket->packet, p_oggpacket->bytes );
+ bs_skip( &bs, 13*8); /* parse_info_header */
+ dirac_uint( &bs ); /* major_version */
+ dirac_uint( &bs ); /* minor_version */
+ dirac_uint( &bs ); /* profile */
+ dirac_uint( &bs ); /* level */
+
+ uint32_t u_video_format = dirac_uint( &bs ); /* index */
+
+ if (dirac_bool( &bs )) {
+ dirac_uint( &bs ); /* frame_width */
+ dirac_uint( &bs ); /* frame_height */
+ }
+
+ if (dirac_bool( &bs )) {
+ dirac_uint( &bs ); /* chroma_format */
+ }
+ if (dirac_bool( &bs )) {
+ if (dirac_bool( &bs )) { /* interlaced */
+ dirac_bool( &bs ); /* top_field_first */
+ }
+ }
+
+ static const struct {
+ uint32_t u_n /* numerator */, u_d /* denominator */;
+ } dirac_frate_tbl[] = { /* table 10.3 */
+ {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1},
+ {50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2},
+ };
+
+ static const uint32_t dirac_vidfmt_frate[] = { /* table C.1 */
+ 1, 9, 10, 9, 10, 9, 10, 4, 3, 7, 6, 4, 3, 7, 6, 2, 2, 7, 6, 7, 6,
+ };
+
+ uint32_t u_n = dirac_frate_tbl[dirac_vidfmt_frate[u_video_format]].u_n;
+ uint32_t u_d = dirac_frate_tbl[dirac_vidfmt_frate[u_video_format]].u_d;
+ if (dirac_bool( &bs )) {
+ uint32_t frame_rate_index = dirac_uint( &bs );
+ u_n = dirac_frate_tbl[frame_rate_index].u_n;
+ u_d = dirac_frate_tbl[frame_rate_index].u_d;
+ if (frame_rate_index == 0) {
+ u_n = dirac_uint( &bs ); /* frame_rate_numerator */
+ u_d = dirac_uint( &bs ); /* frame_rate_denominator */
+ }
+ }
+ p_stream->f_rate = (float) u_n / u_d;
+}
projects / vlc / blobdiff