# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_meta.h>
#include <vlc_input.h>
#include <vlc_codecs.h>
#include <vlc_bits.h>
+#include "xiph.h"
+#include "vorbis.h"
+#include "kate_categories.h"
+#include "ogg.h"
+#include "oggseek.h"
/*****************************************************************************
* Module descriptor
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_shortname ( "OGG" );
- set_description( _("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();
+vlc_module_begin ()
+ 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 ()
/*****************************************************************************
* Definitions of structures and functions used by this plugins
*****************************************************************************/
-typedef struct logical_stream_s
-{
- ogg_stream_state os; /* logical stream of packets */
-
- es_format_t fmt;
- es_out_id_t *p_es;
- double f_rate;
-
- int i_serial_no;
-
- /* the header of some logical streams (eg vorbis) contain essential
- * data for the decoder. We back them up here in case we need to re-feed
- * them to the decoder. */
- int b_force_backup;
- int i_packets_backup;
- uint8_t *p_headers;
- int i_headers;
-
- /* program clock reference (in units of 90kHz) derived from the previous
- * granulepos */
- mtime_t i_pcr;
- mtime_t i_interpolated_pcr;
- mtime_t i_previous_pcr;
-
- /* Misc */
- int b_reinit;
- int i_theora_keyframe_granule_shift;
-
- /* for Annodex logical bitstreams */
- int secondary_header_packets;
-
-} logical_stream_t;
-
-struct demux_sys_t
-{
- ogg_sync_state oy; /* sync and verify incoming physical bitstream */
-
- int i_streams; /* number of logical bitstreams */
- logical_stream_t **pp_stream; /* pointer to an array of logical streams */
-
- /* program clock reference (in units of 90kHz) derived from the pcr of
- * the sub-streams */
- mtime_t i_pcr;
-
- /* stream state */
- int i_eos;
-
- /* bitrate */
- int i_bitrate;
-};
/* OggDS headers for the new header format (used in ogm files) */
-typedef struct stream_header_video
+typedef struct
{
ogg_int32_t width;
ogg_int32_t height;
-} stream_header_video;
+} stream_header_video_t;
-typedef struct stream_header_audio
+typedef struct
{
ogg_int16_t channels;
+ ogg_int16_t padding;
ogg_int16_t blockalign;
ogg_int32_t avgbytespersec;
-} stream_header_audio;
+} stream_header_audio_t;
-typedef struct stream_header
+typedef struct
{
char streamtype[8];
char subtype[4];
ogg_int32_t buffersize;
ogg_int16_t bits_per_sample;
+ ogg_int16_t padding;
union
{
/* Video specific */
- stream_header_video video;
+ stream_header_video_t video;
/* Audio specific */
- stream_header_audio audio;
+ stream_header_audio_t audio;
} sh;
-} stream_header;
+} stream_header_t;
-#define OGG_BLOCK_SIZE 4096
/* Some defines from OggDS */
#define PACKET_TYPE_HEADER 0x01
static int Ogg_FindLogicalStreams( demux_t *p_demux );
static void Ogg_EndOfStream( demux_t *p_demux );
+/* */
+static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream );
+static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream );
+
+/* */
+static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers );
+
/* Logical bitstream headers */
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 bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * );
/*****************************************************************************
* Open: initializes ogg demux structures
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
memset( p_sys, 0, sizeof( demux_sys_t ) );
p_sys->i_bitrate = 0;
p_sys->pp_stream = NULL;
+ p_sys->p_old_stream = NULL;
/* Begnning of stream, tell the demux to look for elementary streams. */
+ p_sys->i_bos = 0;
p_sys->i_eos = 0;
/* Initialize the Ogg physical bitstream parser */
ogg_sync_init( &p_sys->oy );
+ p_sys->b_page_waiting = false;
+
+ /* */
+ p_sys->p_meta = NULL;
return VLC_SUCCESS;
}
Ogg_EndOfStream( p_demux );
+ if( p_sys->p_old_stream )
+ Ogg_LogicalStreamDelete( p_demux, p_sys->p_old_stream );
+
free( p_sys );
}
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;
if( p_sys->i_eos == p_sys->i_streams )
if( p_sys->i_eos )
{
msg_Dbg( p_demux, "end of a group of logical streams" );
+ /* We keep the ES to try reusing it in Ogg_BeginningOfStream
+ * only 1 ES is supported (common case for ogg web radio) */
+ if( p_sys->i_streams == 1 )
+ {
+ p_sys->p_old_stream = p_sys->pp_stream[0];
+ TAB_CLEAN( p_sys->i_streams, p_sys->pp_stream );
+ }
Ogg_EndOfStream( p_demux );
}
p_sys->i_eos = 0;
- if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS ) return 0;
+ if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS )
+ return 0;
msg_Dbg( p_demux, "beginning of a group of logical streams" );
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
}
/*
- * Demux an ogg page from the stream
+ * The first data page of a physical stream is stored in the relevant logical stream
+ * in Ogg_FindLogicalStreams. Therefore, we must not read a page and only update the
+ * stream it belongs to if we haven't processed this first page yet. If we do, we
+ * will only process that first page whenever we find the second page for this stream.
+ * While this is fine for Vorbis and Theora, which are continuous codecs, which means
+ * the second page will arrive real quick, this is not fine for Kate, whose second
+ * data page will typically arrive much later.
+ * This means it is now possible to seek right at the start of a stream where the last
+ * logical stream is Kate, without having to wait for the second data page to unblock
+ * the first one, which is the one that triggers the 'no more headers to backup' code.
+ * And, as we all know, seeking without having backed up all headers is bad, since the
+ * codec will fail to initialize if it's missing its headers.
*/
- if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
+ if( !p_sys->b_page_waiting)
{
- return 0; /* EOF */
+ /*
+ * Demux an ogg page from the stream
+ */
+ if( Ogg_ReadPage( p_demux, &p_sys->current_page ) != VLC_SUCCESS )
+ return 0; /* EOF */
+
+ /* Test for End of Stream */
+ if( ogg_page_eos( &p_sys->current_page ) )
+ p_sys->i_eos++;
}
- /* Test for End of Stream */
- if( ogg_page_eos( &oggpage ) ) p_sys->i_eos++;
-
for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{
logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
- if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
- continue;
+ /* if we've just pulled page, look for the right logical stream */
+ if( !p_sys->b_page_waiting )
+ {
+ if( p_sys->i_streams == 1 &&
+ 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( &p_sys->current_page ) );
+
+ p_stream->b_reinit = true;
+ p_stream->i_pcr = -1;
+ p_stream->i_interpolated_pcr = -1;
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ }
+
+ if( ogg_stream_pagein( &p_stream->os, &p_sys->current_page ) != 0 )
+ {
+ continue;
+ }
+
+ }
while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
{
/* Read info from any secondary header packets, if there are any */
- if( p_stream->secondary_header_packets > 0 )
+ if( p_stream->i_secondary_header_packets > 0 )
{
- if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
+ if( p_stream->fmt.i_codec == VLC_CODEC_THEORA &&
oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x80theora", 7 ) )
{
Ogg_ReadTheoraHeader( p_stream, &oggpacket );
- p_stream->secondary_header_packets = 0;
+ p_stream->i_secondary_header_packets = 0;
}
- else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
+ else if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS &&
oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
{
Ogg_ReadVorbisHeader( p_stream, &oggpacket );
- p_stream->secondary_header_packets = 0;
+ p_stream->i_secondary_header_packets = 0;
}
- else if ( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
+ else if( p_stream->fmt.i_codec == VLC_CODEC_CMML )
{
- p_stream->secondary_header_packets = 0;
+ p_stream->i_secondary_header_packets = 0;
}
+
+ /* update start of data pointer */
+ p_stream->i_data_start = stream_Tell( p_demux->s );
+
}
+ /* If any streams have i_skip_frames, only decode (pre-roll)
+ * for those streams */
+ if ( b_skipping && p_stream->i_skip_frames == 0 ) continue;
+
+
if( p_stream->b_reinit )
{
/* If synchro is re-initialized we need to drop all the packets
if( p_stream->i_pcr >= 0 )
{
- p_stream->b_reinit = 0;
+ p_stream->b_reinit = false;
}
else
{
}
/* An Ogg/vorbis packet contains an end date granulepos */
- if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
+ if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
+ p_stream->fmt.i_codec == VLC_CODEC_SPEEX ||
+ p_stream->fmt.i_codec == VLC_CODEC_FLAC )
{
if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
{
else
{
es_out_Control( p_demux->out, ES_OUT_SET_PCR,
- p_stream->i_pcr );
+ VLC_TS_0 + p_stream->i_pcr );
}
continue;
}
Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
}
- break;
+
+ if( !p_sys->b_page_waiting )
+ break;
}
- i_stream = 0; p_sys->i_pcr = -1;
- for( ; i_stream < p_sys->i_streams; i_stream++ )
+ /* if a page was waiting, it's now processed */
+ p_sys->b_page_waiting = false;
+
+ p_sys->i_pcr = -1;
+ for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{
logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
p_sys->i_pcr = p_stream->i_interpolated_pcr;
}
- if( p_sys->i_pcr >= 0 )
- {
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
- }
-
+ if( p_sys->i_pcr >= 0 && ! b_skipping )
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
return 1;
}
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
+ vlc_meta_t *p_meta;
int64_t *pi64;
bool *pb_bool;
int i;
switch( i_query )
{
+ case DEMUX_GET_META:
+ p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
+ if( p_sys->p_meta )
+ vlc_meta_Merge( p_meta, p_sys->p_meta );
+ return VLC_SUCCESS;
+
case DEMUX_HAS_UNSUPPORTED_META:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = true;
return VLC_EGENERIC;
case DEMUX_SET_POSITION:
+ /* forbid seeking if we haven't initialized all logical bitstreams yet;
+ if we allowed, some headers would not get backed up and decoder init
+ would fail, making that logical stream unusable */
+ if( p_sys->i_bos > 0 )
+ {
+ return VLC_EGENERIC;
+ }
+
for( i = 0; i < p_sys->i_streams; i++ )
{
logical_stream_t *p_stream = p_sys->pp_stream[i];
/* we'll trash all the data until we find the next pcr */
- p_stream->b_reinit = 1;
+ p_stream->b_reinit = true;
p_stream->i_pcr = -1;
p_stream->i_interpolated_pcr = -1;
ogg_stream_reset( &p_stream->os );
}
ogg_sync_reset( &p_sys->oy );
+ /* XXX The break/return is missing on purpose as
+ * demux_vaControlHelper will do the last part of the job */
default:
return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
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;
/* Convert the granulepos into a pcr */
if( p_oggpacket->granulepos >= 0 )
{
- if( p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) )
- {
- p_stream->i_pcr = p_oggpacket->granulepos * I64C(1000000)
- / p_stream->f_rate;
- }
- else
+ if( p_stream->fmt.i_codec == VLC_CODEC_THEORA ||
+ p_stream->fmt.i_codec == VLC_CODEC_KATE )
{
ogg_int64_t iframe = p_oggpacket->granulepos >>
- p_stream->i_theora_keyframe_granule_shift;
+ p_stream->i_granule_shift;
ogg_int64_t pframe = p_oggpacket->granulepos -
- ( iframe << p_stream->i_theora_keyframe_granule_shift );
+ ( iframe << p_stream->i_granule_shift );
- p_stream->i_pcr = ( iframe + pframe ) * I64C(1000000)
+ p_stream->i_pcr = ( iframe + pframe - p_stream->i_keyframe_offset )
+ * INT64_C(1000000) / p_stream->f_rate;
+ }
+ else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
+ {
+ ogg_int64_t i_dts = p_oggpacket->granulepos >> 31;
+ /* NB, OggDirac granulepos values are in units of 2*picturerate */
+ p_stream->i_pcr = (i_dts/2) * INT64_C(1000000) / p_stream->f_rate;
+ }
+ else
+ {
+ p_stream->i_pcr = p_oggpacket->granulepos * INT64_C(1000000)
/ p_stream->f_rate;
}
+ p_stream->i_pcr += 1;
p_stream->i_interpolated_pcr = p_stream->i_pcr;
}
else
* 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 );
}
}
bool b_selected;
int i_header_len = 0;
mtime_t i_pts = -1, i_interpolated_pts;
+ demux_sys_t *p_ogg = p_demux->p_sys;
/* Sanity check */
if( !p_oggpacket->bytes )
return;
}
- if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) &&
+ if( p_stream->fmt.i_codec == VLC_CODEC_SUBT &&
p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return;
/* Check the ES is selected */
if( p_stream->b_force_backup )
{
- uint8_t *p_extra;
- bool b_store_size = true;
-
+ bool b_xiph;
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' ):
+ case VLC_CODEC_VORBIS:
+ case VLC_CODEC_SPEEX:
+ case VLC_CODEC_THEORA:
if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
+ b_xiph = true;
break;
- case VLC_FOURCC( 'f','l','a','c' ):
+ case VLC_CODEC_FLAC:
if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 )
{
Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
p_oggpacket->bytes -= 9;
}
}
- b_store_size = false;
+ b_xiph = false;
+ break;
+
+ case VLC_CODEC_KATE:
+ if( p_stream->i_packets_backup == p_stream->i_kate_num_headers ) p_stream->b_force_backup = 0;
+ b_xiph = true;
break;
default:
p_stream->b_force_backup = 0;
+ b_xiph = false;
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_extra = p_stream->p_headers + p_stream->i_headers;
- if( b_store_size )
+ if( !b_xiph )
+ {
+ void *p_org = p_stream->p_headers;
+ p_stream->i_headers += p_oggpacket->bytes;
+ p_stream->p_headers = realloc( p_stream->p_headers, p_stream->i_headers );
+ if( p_stream->p_headers )
+ {
+ memcpy( (unsigned char *)p_stream->p_headers + p_stream->i_headers - p_oggpacket->bytes,
+ p_oggpacket->packet, p_stream->i_headers );
+ }
+ else
+ {
+ p_stream->i_headers = 0;
+ p_stream->p_headers = NULL;
+ free( p_org );
+ }
+ }
+ else if( xiph_AppendHeaders( &p_stream->i_headers, &p_stream->p_headers,
+ p_oggpacket->bytes, p_oggpacket->packet ) )
{
- *(p_extra++) = p_oggpacket->bytes >> 8;
- *(p_extra++) = p_oggpacket->bytes & 0xFF;
+ p_stream->i_headers = 0;
+ p_stream->p_headers = NULL;
}
- memcpy( p_extra, p_oggpacket->packet, p_oggpacket->bytes );
- p_stream->i_headers += p_oggpacket->bytes + (b_store_size ? 2 : 0);
-
- if( !p_stream->b_force_backup )
+ if( p_stream->i_headers > 0 )
{
- /* Last header received, commit changes */
- 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 );
- es_out_Control( p_demux->out, ES_OUT_SET_FMT,
- p_stream->p_es, &p_stream->fmt );
+ if( !p_stream->b_force_backup )
+ {
+ /* Last header received, commit changes */
+ free( p_stream->fmt.p_extra );
+
+ p_stream->fmt.i_extra = p_stream->i_headers;
+ p_stream->fmt.p_extra = malloc( p_stream->i_headers );
+ if( p_stream->fmt.p_extra )
+ memcpy( p_stream->fmt.p_extra, p_stream->p_headers,
+ p_stream->i_headers );
+ else
+ p_stream->fmt.i_extra = 0;
+
+ if( Ogg_LogicalStreamResetEsFormat( p_demux, p_stream ) )
+ es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
+ p_stream->p_es, &p_stream->fmt );
+
+ if( p_stream->i_headers > 0 )
+ Ogg_ExtractMeta( p_demux, p_stream->fmt.i_codec,
+ p_stream->p_headers, p_stream->i_headers );
+
+ /* we're not at BOS anymore for this logical stream */
+ p_ogg->i_bos--;
+ }
}
b_selected = false; /* Discard the header packet */
}
/* Convert the pcr into a pts */
- if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
+ if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
+ p_stream->fmt.i_codec == VLC_CODEC_SPEEX ||
+ p_stream->fmt.i_codec == VLC_CODEC_FLAC )
{
if( p_stream->i_pcr >= 0 )
{
/* Call the pace control */
es_out_Control( p_demux->out, ES_OUT_SET_PCR,
- p_stream->i_pcr );
+ VLC_TS_0 + p_stream->i_pcr );
}
p_stream->i_previous_pcr = p_stream->i_pcr;
i_interpolated_pts = p_stream->i_interpolated_pcr;
Ogg_UpdatePCR( p_stream, p_oggpacket );
- if( p_stream->i_pcr >= 0 )
+ /* SPU streams are typically discontinuous, do not mind large gaps */
+ if( p_stream->fmt.i_cat != SPU_ES )
{
- /* This is for streams where the granulepos of the header packets
- * doesn't match these of the data packets (eg. ogg web radios). */
- if( p_stream->i_previous_pcr == 0 &&
- p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY )
+ if( p_stream->i_pcr >= 0 )
{
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ /* This is for streams where the granulepos of the header packets
+ * doesn't match these of the data packets (eg. ogg web radios). */
+ if( p_stream->i_previous_pcr == 0 &&
+ p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY )
+ {
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
- /* Call the pace control */
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_stream->i_pcr );
+ /* Call the pace control */
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr );
+ }
}
}
- if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
+ if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
+ p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
+ p_stream->fmt.i_codec != VLC_CODEC_FLAC &&
p_stream->i_pcr >= 0 )
{
p_stream->i_previous_pcr = p_stream->i_pcr;
if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
+
+ /* may need to preroll video frames after a seek */
+ if ( p_stream->i_skip_frames > 0 )
+ {
+ p_block->i_flags |= BLOCK_FLAG_PREROLL;
+ p_stream->i_skip_frames--;
+ }
+
+
/* 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( i_pts == 0 ) i_pts = VLC_TS_0;
+ else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = VLC_TS_0;
+ else if( i_pts == -1 ) i_pts = VLC_TS_INVALID;
if( p_stream->fmt.i_cat == AUDIO_ES )
p_block->i_dts = p_block->i_pts = i_pts;
p_block->i_dts = p_block->i_pts = i_pts;
p_block->i_length = 0;
}
- else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) )
+ else if( p_stream->fmt.i_codec == VLC_CODEC_THEORA )
+ {
p_block->i_dts = p_block->i_pts = i_pts;
+ if( (p_oggpacket->granulepos & ((1<<p_stream->i_granule_shift)-1)) == 0 )
+ {
+ p_block->i_flags |= BLOCK_FLAG_TYPE_I;
+ }
+ }
+ else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
+ {
+ ogg_int64_t dts = p_oggpacket->granulepos >> 31;
+ ogg_int64_t delay = (p_oggpacket->granulepos >> 9) & 0x1fff;
+
+ uint64_t u_pnum = dts + delay;
+
+ p_block->i_dts = p_stream->i_pcr;
+ p_block->i_pts = VLC_TS_INVALID;
+ /* NB, OggDirac granulepos values are in units of 2*picturerate */
+
+ /* granulepos for dirac is possibly broken, this value should be ignored */
+ if( -1 != p_oggpacket->granulepos )
+ p_block->i_pts = u_pnum * INT64_C(1000000) / p_stream->f_rate / 2;
+ }
else
{
p_block->i_dts = i_pts;
- p_block->i_pts = 0;
+ p_block->i_pts = VLC_TS_INVALID;
}
- if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
- 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' ) )
+ if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
+ p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
+ p_stream->fmt.i_codec != VLC_CODEC_FLAC &&
+ p_stream->fmt.i_codec != VLC_CODEC_TARKIN &&
+ p_stream->fmt.i_codec != VLC_CODEC_THEORA &&
+ p_stream->fmt.i_codec != VLC_CODEC_CMML &&
+ p_stream->fmt.i_codec != VLC_CODEC_DIRAC &&
+ p_stream->fmt.i_codec != VLC_CODEC_KATE )
{
/* 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' ))
+ if( p_stream->fmt.i_codec == VLC_CODEC_SUBT)
{
/* But with subtitles we need to retrieve the duration first */
int i, lenbytes = 0;
p_block->i_buffer = 0;
}
- if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) )
+ if( p_stream->fmt.i_codec == VLC_CODEC_TARKIN )
{
/* FIXME: the biggest hack I've ever done */
msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64,
{
demux_sys_t *p_ogg = p_demux->p_sys ;
ogg_packet oggpacket;
- ogg_page oggpage;
int i_stream;
-#define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1]
+ 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 ) )
{
- p_ogg->i_streams++;
- p_ogg->pp_stream =
- realloc( p_ogg->pp_stream, p_ogg->i_streams *
- sizeof(logical_stream_t *) );
+ logical_stream_t *p_stream;
p_stream = malloc( sizeof(logical_stream_t) );
+ if( !p_stream )
+ return VLC_ENOMEM;
+
+ TAB_APPEND( p_ogg->i_streams, p_ogg->pp_stream, p_stream );
+
memset( p_stream, 0, sizeof(logical_stream_t) );
p_stream->p_headers = 0;
- p_stream->secondary_header_packets = 0;
+ p_stream->i_secondary_header_packets = 0;
+
+ p_stream->i_keyframe_offset = 0;
+ p_stream->i_skip_frames = 0;
+
+ p_stream->i_data_start = 0;
es_format_Init( &p_stream->fmt, 0, 0 );
+ 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 tis Ogg bitstream */
- if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 )
+ * the codec type of this Ogg bitstream */
+ 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 "
p_stream->b_force_backup = 1;
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
+ p_stream->fmt.i_codec = VLC_CODEC_FLAC;
}
/* Check for Flac header (>= version 1.1.1) */
else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F &&
p_stream->b_force_backup = 1;
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
+ p_stream->fmt.i_codec = VLC_CODEC_FLAC;
oggpacket.packet += 13; oggpacket.bytes -= 13;
Ogg_ReadFlacHeader( p_demux, 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 ) ) ||
+ ( 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" );
+ free( p_stream );
+ p_ogg->i_streams--;
+ }
+ }
/* Check for Tarkin header */
else if( oggpacket.bytes >= 7 &&
! memcmp( &oggpacket.packet[1], "tarkin", 6 ) )
msg_Dbg( p_demux, "found tarkin header" );
p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 't','a','r','k' );
+ p_stream->fmt.i_codec = VLC_CODEC_TARKIN;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
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 &&
!memcmp( &oggpacket.packet[1],
"Direct Show Samples embedded in Ogg", 35 ))
/* Check for audio header (old format) */
else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
{
- unsigned int i_extra_size;
+ int i_extra_size;
unsigned int i_format_tag;
p_stream->fmt.i_cat = AUDIO_ES;
i_extra_size = GetWLE((oggpacket.packet+140));
- if( i_extra_size )
+ if( i_extra_size > 0 && i_extra_size < oggpacket.bytes - 142 )
{
p_stream->fmt.i_extra = i_extra_size;
p_stream->fmt.p_extra = malloc( i_extra_size );
- memcpy( p_stream->fmt.p_extra,
- oggpacket.packet + 142, i_extra_size );
+ if( p_stream->fmt.p_extra )
+ memcpy( p_stream->fmt.p_extra,
+ oggpacket.packet + 142, i_extra_size );
+ else
+ p_stream->fmt.i_extra = 0;
}
i_format_tag = GetWLE((oggpacket.packet+124));
p_ogg->i_streams--;
}
}
- else if( (*oggpacket.packet & PACKET_TYPE_BITS )
- == PACKET_TYPE_HEADER &&
- oggpacket.bytes >= (int)sizeof(stream_header)+1 )
+ else if( (*oggpacket.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER &&
+ oggpacket.bytes >= 56+1 )
{
- stream_header *st = (stream_header *)(oggpacket.packet+1);
+ stream_header_t tmp;
+ stream_header_t *st = &tmp;
+
+ memcpy( st->streamtype, &oggpacket.packet[1+0], 8 );
+ memcpy( st->subtype, &oggpacket.packet[1+8], 4 );
+ st->size = GetDWLE( &oggpacket.packet[1+12] );
+ st->time_unit = GetQWLE( &oggpacket.packet[1+16] );
+ st->samples_per_unit = GetQWLE( &oggpacket.packet[1+24] );
+ st->default_len = GetDWLE( &oggpacket.packet[1+32] );
+ st->buffersize = GetDWLE( &oggpacket.packet[1+36] );
+ st->bits_per_sample = GetWLE( &oggpacket.packet[1+40] ); // (padding 2)
/* Check for video header (new format) */
if( !strncmp( st->streamtype, "video", 5 ) )
{
+ st->sh.video.width = GetDWLE( &oggpacket.packet[1+44] );
+ st->sh.video.height = GetDWLE( &oggpacket.packet[1+48] );
+
p_stream->fmt.i_cat = VIDEO_ES;
/* We need to get rid of the header packet */
(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 =
- GetWLE(&st->bits_per_sample);
- p_stream->fmt.video.i_width =
- GetDWLE(&st->sh.video.width);
- p_stream->fmt.video.i_height =
- GetDWLE(&st->sh.video.height);
+ p_stream->fmt.video.i_frame_rate_base = st->time_unit;
+ if( st->time_unit <= 0 )
+ st->time_unit = 400000;
+ p_stream->f_rate = 10000000.0 / st->time_unit;
+ p_stream->fmt.video.i_bits_per_pixel = st->bits_per_sample;
+ p_stream->fmt.video.i_width = st->sh.video.width;
+ p_stream->fmt.video.i_height = st->sh.video.height;
msg_Dbg( p_demux,
"fps: %f, width:%i; height:%i, bitcount:%i",
else if( !strncmp( st->streamtype, "audio", 5 ) )
{
char p_buffer[5];
+ int i_extra_size;
int i_format_tag;
+ st->sh.audio.channels = GetWLE( &oggpacket.packet[1+44] );
+ st->sh.audio.blockalign = GetWLE( &oggpacket.packet[1+48] );
+ st->sh.audio.avgbytespersec = GetDWLE( &oggpacket.packet[1+52] );
+
p_stream->fmt.i_cat = AUDIO_ES;
/* We need to get rid of the header packet */
ogg_stream_packetout( &p_stream->os, &oggpacket );
- p_stream->fmt.i_extra = GetQWLE(&st->size) -
- sizeof(stream_header);
- if( p_stream->fmt.i_extra )
+ i_extra_size = st->size - 56;
+
+ if( i_extra_size > 0 &&
+ i_extra_size < oggpacket.bytes - 1 - 56 )
{
- p_stream->fmt.p_extra =
- malloc( p_stream->fmt.i_extra );
- memcpy( p_stream->fmt.p_extra, st + 1,
- p_stream->fmt.i_extra );
+ p_stream->fmt.i_extra = i_extra_size;
+ p_stream->fmt.p_extra = malloc( p_stream->fmt.i_extra );
+ if( p_stream->fmt.p_extra )
+ memcpy( p_stream->fmt.p_extra, st + 1,
+ p_stream->fmt.i_extra );
+ else
+ p_stream->fmt.i_extra = 0;
}
memcpy( p_buffer, st->subtype, 4 );
p_buffer[4] = '\0';
i_format_tag = strtol(p_buffer,NULL,16);
- p_stream->fmt.audio.i_channels =
- GetWLE(&st->sh.audio.channels);
- p_stream->f_rate = p_stream->fmt.audio.i_rate =
- GetQWLE(&st->samples_per_unit);
- p_stream->fmt.i_bitrate =
- GetDWLE(&st->sh.audio.avgbytespersec) * 8;
- p_stream->fmt.audio.i_blockalign =
- GetWLE(&st->sh.audio.blockalign);
- p_stream->fmt.audio.i_bitspersample =
- GetWLE(&st->bits_per_sample);
+ p_stream->fmt.audio.i_channels = st->sh.audio.channels;
+ if( st->time_unit <= 0 )
+ st->time_unit = 10000000;
+ p_stream->f_rate = p_stream->fmt.audio.i_rate = st->samples_per_unit * 10000000 / st->time_unit;
+ p_stream->fmt.i_bitrate = st->sh.audio.avgbytespersec * 8;
+ p_stream->fmt.audio.i_blockalign = st->sh.audio.blockalign;
+ p_stream->fmt.audio.i_bitspersample = st->bits_per_sample;
wf_tag_to_fourcc( i_format_tag,
&p_stream->fmt.i_codec, 0 );
msg_Dbg( p_demux, "found text subtitles header" );
p_stream->fmt.i_cat = SPU_ES;
- p_stream->fmt.i_codec = VLC_FOURCC('s','u','b','t');
- p_stream->f_rate = 1000; /* granulepos is in milisec */
+ p_stream->fmt.i_codec = VLC_CODEC_SUBT;
+ p_stream->f_rate = 1000; /* granulepos is in millisec */
}
else
{
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;
}
+ /* we'll need to get all headers for all of those streams
+ that we have to backup headers for */
+ p_ogg->i_bos = 0;
+ for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
+ {
+ if( p_ogg->pp_stream[i_stream]->b_force_backup )
+ p_ogg->i_bos++;
+ }
+
+
/* This is the first data page, which means we are now finished
* with the initial pages. We just need to store it in the relevant
* bitstream. */
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;
}
}
return VLC_SUCCESS;
}
}
-#undef p_stream
return VLC_EGENERIC;
}
static int Ogg_BeginningOfStream( demux_t *p_demux )
{
demux_sys_t *p_ogg = p_demux->p_sys ;
+ logical_stream_t *p_old_stream = p_ogg->p_old_stream;
int i_stream;
/* Find the logical streams embedded in the physical stream and
for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
{
-#define p_stream p_ogg->pp_stream[i_stream]
- p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt );
+ logical_stream_t *p_stream = p_ogg->pp_stream[i_stream];
- if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
+ p_stream->p_es = NULL;
+
+ /* initialise kframe index */
+ p_stream->idx=NULL;
+
+ /* Try first to reuse an old ES */
+ if( p_old_stream &&
+ p_old_stream->fmt.i_cat == p_stream->fmt.i_cat &&
+ p_old_stream->fmt.i_codec == p_stream->fmt.i_codec )
+ {
+ msg_Dbg( p_demux, "will reuse old stream to avoid glitch" );
+
+ p_stream->p_es = p_old_stream->p_es;
+ es_format_Copy( &p_stream->fmt_old, &p_old_stream->fmt );
+
+ p_old_stream->p_es = NULL;
+ p_old_stream = NULL;
+ }
+
+ if( !p_stream->p_es )
+ {
+ /* Better be safe than sorry when possible with ogm */
+ if( p_stream->fmt.i_codec == VLC_CODEC_MPGA ||
+ p_stream->fmt.i_codec == VLC_CODEC_A52 )
+ p_stream->fmt.b_packetized = false;
+
+ 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_CODEC_CMML )
{
/* Set the CMML stream active */
es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es );
p_stream->i_pcr = p_stream->i_previous_pcr =
p_stream->i_interpolated_pcr = -1;
- p_stream->b_reinit = 0;
-#undef p_stream
+ p_stream->b_reinit = false;
+ }
+
+ if( p_ogg->p_old_stream )
+ {
+ if( p_ogg->p_old_stream->p_es )
+ msg_Dbg( p_demux, "old stream not reused" );
+ Ogg_LogicalStreamDelete( p_demux, p_ogg->p_old_stream );
+ p_ogg->p_old_stream = NULL;
}
+
+ /* get total frame count for video stream; we will need this for seeking */
+ p_ogg->i_total_frames = 0;
+
return VLC_SUCCESS;
}
demux_sys_t *p_ogg = p_demux->p_sys ;
int i_stream;
-#define p_stream p_ogg->pp_stream[i_stream]
for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
- {
- if( p_stream->p_es )
- es_out_Del( p_demux->out, p_stream->p_es );
+ Ogg_LogicalStreamDelete( p_demux, p_ogg->pp_stream[i_stream] );
+ free( p_ogg->pp_stream );
+
+ /* Reinit p_ogg */
+ p_ogg->i_bitrate = 0;
+ p_ogg->i_streams = 0;
+ p_ogg->pp_stream = NULL;
+
+ /* */
+ if( p_ogg->p_meta )
+ vlc_meta_Delete( p_ogg->p_meta );
+ p_ogg->p_meta = NULL;
+}
- p_ogg->i_bitrate -= p_stream->fmt.i_bitrate;
+/**
+ * This function delete and release all data associated to a logical_stream_t
+ */
+static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream )
+{
+ if( p_stream->p_es )
+ es_out_Del( p_demux->out, p_stream->p_es );
- ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os );
- free( p_ogg->pp_stream[i_stream]->p_headers );
+ ogg_stream_clear( &p_stream->os );
+ free( p_stream->p_headers );
- es_format_Clean( &p_stream->fmt );
+ es_format_Clean( &p_stream->fmt_old );
+ es_format_Clean( &p_stream->fmt );
- free( p_ogg->pp_stream[i_stream] );
+ if ( p_stream->idx != NULL)
+ {
+ oggseek_index_entries_free( p_stream->idx );
}
-#undef p_stream
- /* Reinit p_ogg */
- free( p_ogg->pp_stream );
- p_ogg->pp_stream = NULL;
- p_ogg->i_streams = 0;
+ free( p_stream );
+}
+/**
+ * This function check if a we need to reset a decoder in case we are
+ * reusing an old ES
+ */
+static bool Ogg_IsVorbisFormatCompatible( const es_format_t *p_new, const es_format_t *p_old )
+{
+ unsigned pi_new_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_new_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_new_count;
+ if( xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) )
+ i_new_count = 0;
+
+ unsigned pi_old_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_old_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_old_count;
+ if( xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra ) )
+ i_old_count = 0;
+
+ bool b_match = i_new_count == i_old_count;
+ for( unsigned i = 0; i < i_new_count && b_match; i++ )
+ {
+ /* Ignore vorbis comment */
+ if( i == 1 )
+ continue;
+ if( pi_new_size[i] != pi_old_size[i] ||
+ memcmp( pp_new_data[i], pp_old_data[i], pi_new_size[i] ) )
+ b_match = false;
+ }
+
+ for( unsigned i = 0; i < i_new_count; i++ )
+ free( pp_new_data[i] );
+ for( unsigned i = 0; i < i_old_count; i++ )
+ free( pp_old_data[i] );
+ return b_match;
+}
+static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream )
+{
+ bool b_compatible = false;
+ if( !p_stream->fmt_old.i_cat || !p_stream->fmt_old.i_codec )
+ return true;
+
+ /* Only vorbis is supported */
+ if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS )
+ b_compatible = Ogg_IsVorbisFormatCompatible( &p_stream->fmt, &p_stream->fmt_old );
+
+ if( !b_compatible )
+ msg_Warn( p_demux, "cannot reuse old stream, resetting the decoder" );
+
+ return !b_compatible;
+}
+static void Ogg_ExtractXiphMeta( demux_t *p_demux, const void *p_headers, unsigned i_headers, unsigned i_skip )
+{
+ demux_sys_t *p_ogg = p_demux->p_sys;
+
+ unsigned pi_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_count;
+ if( xiph_SplitHeaders( pi_size, pp_data, &i_count, i_headers, p_headers ) )
+ return;
+
+ /* TODO how to handle multiple comments properly ? */
+ if( i_count >= 2 && pi_size[1] > i_skip )
+ vorbis_ParseComment( &p_ogg->p_meta, (uint8_t*)pp_data[1] + i_skip, pi_size[1] - i_skip );
+
+ for( unsigned i = 0; i < i_count; i++ )
+ free( pp_data[i] );
+}
+static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers )
+{
+ demux_sys_t *p_ogg = p_demux->p_sys;
+
+ switch( i_codec )
+ {
+ /* 3 headers with the 2° one being the comments */
+ case VLC_CODEC_VORBIS:
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 );
+ break;
+ case VLC_CODEC_THEORA:
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 );
+ break;
+ case VLC_CODEC_SPEEX:
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0 );
+ break;
+
+ /* N headers with the 2° one being the comments */
+ case VLC_CODEC_KATE:
+ /* 1 byte for header type, 7 bytes for magic, 1 reserved zero byte */
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+7+1 );
+ break;
+
+ /* TODO */
+ case VLC_CODEC_FLAC:
+ msg_Warn( p_demux, "Ogg_ExtractMeta does not support %4.4s", (const char*)&i_codec );
+ break;
+
+ /* No meta data */
+ case VLC_CODEC_CMML: /* CMML is XML text, doesn't have Vorbis comments */
+ case VLC_CODEC_DIRAC:
+ default:
+ break;
+ }
+ if( p_ogg->p_meta )
+ p_demux->info.i_update |= INPUT_UPDATE_META;
}
static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream,
int i_fps_numerator;
int i_fps_denominator;
int i_keyframe_frequency_force;
+ int i_major;
+ int i_minor;
+ int i_subminor;
+ int i_version;
p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' );
+ p_stream->fmt.i_codec = VLC_CODEC_THEORA;
/* Signal that we want to keep a backup of the theora
* stream headers. They will be used when switching between
/* Cheat and get additionnal info ;) */
bs_init( &bitstream, p_oggpacket->packet, p_oggpacket->bytes );
bs_skip( &bitstream, 56 );
- bs_read( &bitstream, 8 ); /* major version num */
- bs_read( &bitstream, 8 ); /* minor version num */
- bs_read( &bitstream, 8 ); /* subminor version num */
+
+ i_major = bs_read( &bitstream, 8 ); /* major version num */
+ i_minor = bs_read( &bitstream, 8 ); /* minor version num */
+ i_subminor = bs_read( &bitstream, 8 ); /* subminor version num */
+
bs_read( &bitstream, 16 ) /*<< 4*/; /* width */
bs_read( &bitstream, 16 ) /*<< 4*/; /* height */
bs_read( &bitstream, 24 ); /* frame width */
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;
}
+ i_version = i_major * 1000000 + i_minor * 1000 + i_subminor;
+ p_stream->i_keyframe_offset = 0;
+
+ if ( i_version >= 3002001 )
+ {
+ p_stream->i_keyframe_offset = 1;
+ }
+
p_stream->f_rate = ((float)i_fps_numerator) / i_fps_denominator;
}
oggpack_buffer opb;
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' );
+ p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
/* Signal that we want to keep a backup of the vorbis
* stream headers. They will be used when switching between
oggpack_buffer opb;
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' );
+ p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
/* Signal that we want to keep a backup of the speex
* stream headers. They will be used when switching between
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" );
+ else
+ {
+ msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" );
+ }
/* Fake this as the last metadata block */
*((uint8_t*)p_oggpacket->packet) |= 0x80;
}
}
+static void Ogg_ReadKateHeader( logical_stream_t *p_stream,
+ ogg_packet *p_oggpacket )
+{
+ oggpack_buffer opb;
+ int32_t gnum;
+ int32_t gden;
+ int n;
+ char *psz_desc;
+
+ p_stream->fmt.i_cat = SPU_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_KATE;
+
+ /* 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 */
+
+ /* Now find a localized user readable description for this category */
+ psz_desc = strdup(FindKateCategoryName(p_stream->fmt.psz_description));
+ if( psz_desc )
+ {
+ free( p_stream->fmt.psz_description );
+ p_stream->fmt.psz_description = psz_desc;
+ }
+ }
+ 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 )
granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] );
granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] );
- p_stream->secondary_header_packets =
+ p_stream->i_secondary_header_packets =
GetDWLE( &p_oggpacket->packet[24] );
/* we are guaranteed that the first header field will be
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",
+ sscanf( (char*)(&p_oggpacket->packet[42]), "%1023s\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->i_secondary_header_packets, content_type_string );
p_stream->f_rate = (float) granule_rate_numerator /
(float) granule_rate_denominator;
else if( !strncmp(content_type_string, "audio/x-vorbis", 14) )
{
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' );
+ p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
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->fmt.i_codec = VLC_CODEC_SPEEX;
p_stream->b_force_backup = 1;
}
else if( !strncmp(content_type_string, "video/x-theora", 14) )
{
p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' );
+ p_stream->fmt.i_codec = VLC_CODEC_THEORA;
p_stream->b_force_backup = 1;
}
{
/* n.b. MPEG streams are unsupported right now */
p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
+ p_stream->fmt.i_codec = VLC_CODEC_MPGV;
}
else if( !strncmp(content_type_string, "text/x-cmml", 11) )
{
ogg_stream_packetout( &p_stream->os, p_oggpacket );
p_stream->fmt.i_cat = SPU_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'c','m','m','l' );
+ p_stream->fmt.i_codec = VLC_CODEC_CMML;
}
}
}
+
+static uint32_t dirac_uint( bs_t *p_bs )
+{
+ uint32_t u_count = 0, u_value = 0;
+
+ while( !bs_eof( p_bs ) && !bs_read( p_bs, 1 ) )
+ {
+ u_count++;
+ u_value <<= 1;
+ u_value |= bs_read( p_bs, 1 );
+ }
+
+ return (1<<u_count) - 1 + u_value;
+}
+
+static int dirac_bool( bs_t *p_bs )
+{
+ return bs_read( p_bs, 1 );
+}
+
+static bool Ogg_ReadDiracHeader( logical_stream_t *p_stream,
+ ogg_packet *p_oggpacket )
+{
+ static const struct {
+ uint32_t u_n /* numerator */, u_d /* denominator */;
+ } p_dirac_frate_tbl[] = { /* table 10.3 */
+ {1,1}, /* this first value is never used */
+ {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1},
+ {50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2},
+ };
+ static const size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl);
+
+ static const uint32_t pu_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,
+ };
+ static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate);
+
+ bs_t bs;
+
+ p_stream->i_granule_shift = 22; /* not 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( u_video_format >= u_dirac_vidfmt_frate )
+ {
+ /* don't know how to parse this ogg dirac stream */
+ return false;
+ }
+
+ 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 ) )
+ {
+ dirac_uint( &bs ); /* scan_format */
+ }
+
+ uint32_t u_n = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_n;
+ uint32_t u_d = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_d;
+ if( dirac_bool( &bs ) )
+ {
+ uint32_t u_frame_rate_index = dirac_uint( &bs );
+ if( u_frame_rate_index >= u_dirac_frate_tbl )
+ {
+ /* something is wrong with this stream */
+ return false;
+ }
+ u_n = p_dirac_frate_tbl[u_frame_rate_index].u_n;
+ u_d = p_dirac_frate_tbl[u_frame_rate_index].u_d;
+ if( u_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;
+
+ /* probably is an ogg dirac es */
+ p_stream->fmt.i_cat = VIDEO_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_DIRAC;
+
+ return true;
+}
projects / vlc / blobdiff