#include <vlc_codecs.h>
#include <vlc_bits.h>
+#include <vlc_charset.h>
+#include "vorbis.h"
+#include "kate_categories.h"
/*****************************************************************************
* Module descriptor
mtime_t i_previous_pcr;
/* Misc */
- int b_reinit;
+ bool b_reinit;
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;
+ int i_secondary_header_packets;
} logical_stream_t;
/* after reading all headers, the first data page is stuffed into the relevant stream, ready to use */
bool b_page_waiting;
+
+ /* */
+ vlc_meta_t *p_meta;
};
/* OggDS headers for the new header format (used in ogm files) */
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_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 bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * );
/*****************************************************************************
* Open: initializes ogg demux structures
ogg_sync_init( &p_sys->oy );
p_sys->b_page_waiting = false;
+ /* */
+ p_sys->p_meta = NULL;
+
return VLC_SUCCESS;
}
* Demux an ogg page from the stream
*/
if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
- {
return 0; /* EOF */
- }
/* Test for End of Stream */
- if( ogg_page_eos( &oggpage ) ) p_sys->i_eos++;
+ if( ogg_page_eos( &oggpage ) )
+ p_sys->i_eos++;
}
/* 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( &oggpage ) != p_stream->os.serialno )
+ {
+ msg_Err( p_demux, "Broken Ogg stream (serialno) mismatch" );
+ ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &oggpage ) );
+
+ 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, &oggpage ) != 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;
}
}
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 )
{
}
if( !p_sys->b_page_waiting )
- {
break;
- }
}
/* if a page was waiting, it's now processed */
p_sys->b_page_waiting = false;
- i_stream = 0; p_sys->i_pcr = -1;
- for( ; i_stream < p_sys->i_streams; i_stream++ )
+ 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];
}
if( p_sys->i_pcr >= 0 )
- {
es_out_Control( p_demux->out, ES_OUT_SET_PCR, 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;
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 );
- /* suspicious lack of break - reading the code, I believe it's intended though */
+ /* 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,
/* 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->fmt.i_codec == VLC_FOURCC( 'k','a','t','e' ) )
+ 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_granule_shift;
p_stream->i_pcr = ( iframe + pframe ) * INT64_C(1000000)
/ p_stream->f_rate;
}
- else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) )
+ 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->f_rate;
}
+ p_stream->i_pcr += 1;
p_stream->i_interpolated_pcr = p_stream->i_pcr;
}
else
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 */
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;
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 );
b_store_size = false;
break;
- case VLC_FOURCC( 'k','a','t','e' ):
+ case VLC_CODEC_KATE:
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;
free( p_stream->fmt.p_extra );
p_stream->fmt.i_extra = p_stream->i_headers;
- p_stream->fmt.p_extra =
- realloc( p_stream->fmt.p_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 );
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--;
}
}
/* 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 )
{
}
}
- 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;
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;
- else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) )
+ 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;
p_block->i_pts = 0;
}
- 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' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'd','r','a','c' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'k','a','t','e' ) )
+ 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,
* We found the beginning of our first logical stream. */
while( ogg_page_bos( &oggpage ) )
{
- logical_stream_t **pp_sav = p_ogg->pp_stream;
logical_stream_t *p_stream;
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;
+ p_stream->i_secondary_header_packets = 0;
es_format_Init( &p_stream->fmt, 0, 0 );
es_format_Init( &p_stream->fmt_old, 0, 0 );
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 );
}
else if( oggpacket.bytes >= 5 &&
! memcmp( oggpacket.packet, "BBCD\x00", 5 ) )
{
- Ogg_ReadDiracHeader( p_stream, &oggpacket );
- msg_Dbg( p_demux, "found dirac header" );
+ 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 &&
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);
/* 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;
else if( !strncmp( st->streamtype, "audio", 5 ) )
{
char p_buffer[5];
- unsigned int i_extra_size;
+ int i_extra_size;
int i_format_tag;
st->sh.audio.channels = GetWLE( &oggpacket.packet[1+44] );
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->fmt.i_codec = VLC_CODEC_SUBT;
p_stream->f_rate = 1000; /* granulepos is in millisec */
}
else
}
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_FOURCC('c','m','m','l') )
+ 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;
+ p_stream->b_reinit = false;
}
if( p_ogg->p_old_stream )
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;
}
/**
return true;
/* Only vorbis is supported */
- if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) )
+ if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS )
b_compatible = Ogg_IsVorbisFormatCompatible( &p_stream->fmt, &p_stream->fmt_old );
if( !b_compatible )
return !b_compatible;
}
+static void Ogg_ExtractXiphMeta( demux_t *p_demux, const uint8_t *p_headers, int i_headers, int i_skip, bool b_has_num_headers )
+{
+ demux_sys_t *p_ogg = p_demux->p_sys;
+
+ if (b_has_num_headers)
+ {
+ if (i_headers <= 0)
+ return;
+ /* number of headers on a byte, we're interested in the second header, so should be at least 2 to go on */
+ if (*p_headers++ < 2)
+ return;
+ --i_headers;
+ }
+
+ if( i_headers <= 2 )
+ return;
+
+ /* Skip first packet */
+ const int i_tmp = GetWBE( &p_headers[0] );
+ if( i_tmp > i_headers-2 )
+ return;
+ p_headers += 2 + i_tmp;
+ i_headers -= 2 + i_tmp;
+
+ if( i_headers <= 2 )
+ return;
+
+ /* */
+ int i_comment = GetWBE( &p_headers[0] );
+ const uint8_t *p_comment = &p_headers[2];
+ if( i_comment > i_headers - 2 )
+ return;
+
+ if( i_comment <= i_skip )
+ return;
+
+ /* TODO how to handle multiple comments properly ? */
+ vorbis_ParseComment( &p_ogg->p_meta, &p_comment[i_skip], i_comment - i_skip );
+}
+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, false );
+ break;
+ case VLC_CODEC_THEORA:
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6, false );
+ break;
+ case VLC_CODEC_SPEEX:
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0, false );
+ break;
+
+ /* N headers with the 2° one being the comments */
+ case VLC_CODEC_KATE:
+ /* 1 byte for header type, 7 bit for magic, 1 reserved zero byte */
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+7+1, true );
+ 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,
ogg_packet *p_oggpacket )
int i_keyframe_frequency_force;
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
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;
int32_t gnum;
int32_t gden;
int n;
+ char *psz_desc;
p_stream->fmt.i_cat = SPU_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'k','a','t','e' );
+ 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
p_stream->f_rate = (double)gnum/gden;
p_stream->fmt.psz_language = malloc(16);
- if (p_stream->fmt.psz_language)
+ if( p_stream->fmt.psz_language )
{
- for (n=0;n<16;++n)
+ 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)
+ for( n = 0; n < 16; n++ )
oggpack_read(&opb,8);
}
p_stream->fmt.psz_description = malloc(16);
- if (p_stream->fmt.psz_description)
+ if( p_stream->fmt.psz_description )
{
- for (n=0;n<16;++n)
+ 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)
+ for( n = 0; n < 16; n++ )
oggpack_read(&opb,8);
}
}
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 count = 0, value = 0;
- while( !bs_read ( p_bs, 1 ) ) {
- count++;
- value <<= 1;
- value |= bs_read ( p_bs, 1 );
- }
-
- return (1<<count) - 1 + value;
+ 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 );
+ return bs_read( p_bs, 1 );
}
-static void Ogg_ReadDiracHeader( logical_stream_t *p_stream,
+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->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'd','r','a','c' );
- p_stream->i_granule_shift = 32;
+ 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 */
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 )) {
+ if( dirac_bool( &bs ) )
+ {
dirac_uint( &bs ); /* frame_width */
dirac_uint( &bs ); /* frame_height */
}
- if (dirac_bool( &bs )) {
+ if( dirac_bool( &bs ) )
+ {
dirac_uint( &bs ); /* chroma_format */
}
- if (dirac_bool( &bs )) {
+ if( dirac_bool( &bs ) )
+ {
dirac_uint( &bs ); /* scan_format */
}
- static const struct {
- uint32_t u_n /* numerator */, u_d /* denominator */;
- } 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 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) {
+ 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