#include <vlc_codecs.h>
#include <vlc_bits.h>
#include "xiph.h"
-#include "vorbis.h"
-#include "kate_categories.h"
+#include "xiph_metadata.h"
#include "ogg.h"
#include "oggseek.h"
} sh;
} stream_header_t;
-
-/* Some defines from OggDS */
-#define PACKET_TYPE_HEADER 0x01
-#define PACKET_TYPE_BITS 0x07
-#define PACKET_LEN_BITS01 0xc0
-#define PACKET_LEN_BITS2 0x02
-#define PACKET_IS_SYNCPOINT 0x08
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
/* Bitstream manipulation */
static int Ogg_ReadPage ( demux_t *, ogg_page * );
-static void Ogg_UpdatePCR ( logical_stream_t *, ogg_packet * );
+static void Ogg_UpdatePCR ( demux_t *, logical_stream_t *, ogg_packet * );
static void Ogg_DecodePacket ( demux_t *, logical_stream_t *, ogg_packet * );
static int Ogg_OpusPacketDuration( logical_stream_t *, ogg_packet * );
+static void Ogg_CreateES( demux_t *p_demux );
static int Ogg_BeginningOfStream( demux_t *p_demux );
static int Ogg_FindLogicalStreams( demux_t *p_demux );
static void Ogg_EndOfStream( demux_t *p_demux );
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 );
-static int64_t Ogg_GetLastPacket( demux_t *p_demux, logical_stream_t *p_stream, ogg_packet *p_oggpacket, double f_rate );
+static void Ogg_ExtractMeta( demux_t *p_demux, es_format_t *p_fmt, const uint8_t *p_headers, int i_headers );
/* Logical bitstream headers */
-static void Ogg_ReadTheoraHeader( demux_t *, logical_stream_t *, ogg_packet * );
-static void Ogg_ReadVorbisHeader( demux_t *, logical_stream_t *, ogg_packet * );
+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_ReadOpusHeader( demux_t *, logical_stream_t *, ogg_packet * );
+static void Ogg_ReadOpusHeader( 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( demux_t *, logical_stream_t *, ogg_packet * );
static bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * );
+static void Ogg_ReadSkeletonHeader( demux_t *, logical_stream_t *, ogg_packet * );
+
+/* Skeleton */
+static void Ogg_ReadSkeletonBones( demux_t *, ogg_packet * );
+static void Ogg_ReadSkeletonIndex( demux_t *, ogg_packet * );
+static void Ogg_FreeSkeleton( ogg_skeleton_t * );
+static void Ogg_ApplySkeleton( logical_stream_t * );
+
+static void fill_channels_info(audio_format_t *audio)
+{
+ static const int pi_channels_map[9] =
+ {
+ 0,
+ AOUT_CHAN_CENTER,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
+ AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
+ | AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARCENTER | AOUT_CHAN_MIDDLELEFT
+ | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_LFE,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT
+ | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT
+ | AOUT_CHAN_LFE,
+ };
+
+ unsigned chans = audio->i_channels;
+ if (chans < sizeof(pi_channels_map) / sizeof(pi_channels_map[0]))
+ audio->i_physical_channels =
+ audio->i_original_channels = pi_channels_map[chans];
+}
/*****************************************************************************
* Open: initializes ogg demux structures
demux_sys_t *p_sys;
const uint8_t *p_peek;
-
/* Check if we are dealing with an ogg stream */
if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
if( !p_demux->b_force && memcmp( p_peek, "OggS", 4 ) )
return VLC_EGENERIC;
}
- /* Set exported functions */
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ /* */
+ p_demux->p_sys = p_sys = calloc( 1, 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;
-
p_sys->i_length = -1;
+ p_sys->b_preparsing_done = false;
+
+ /* Set exported functions */
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
/* Initialize the Ogg physical bitstream parser */
ogg_sync_init( &p_sys->oy );
- p_sys->b_page_waiting = false;
/* */
- p_sys->p_meta = NULL;
TAB_INIT( p_sys->i_seekpoints, p_sys->pp_seekpoints );
+
+ while ( !p_sys->b_preparsing_done && p_demux->pf_demux( p_demux ) > 0 )
+ {}
+
return VLC_SUCCESS;
}
if( p_sys->p_old_stream )
Ogg_LogicalStreamDelete( p_demux, p_sys->p_old_stream );
- TAB_CLEAN( p_sys->i_seekpoints, p_sys->pp_seekpoints );
-
free( p_sys );
}
ogg_packet oggpacket;
int i_stream;
bool b_skipping = false;
+ bool b_canseek;
+ int i_active_streams = p_sys->i_streams;
+ for ( int i=0; i < p_sys->i_streams; i++ )
+ {
+ if ( p_sys->pp_stream[i]->b_finished )
+ i_active_streams--;
+ }
- if( p_sys->i_eos == p_sys->i_streams )
+ if ( i_active_streams == 0 )
{
- if( p_sys->i_eos )
+ if ( p_sys->i_streams ) /* All finished */
{
msg_Dbg( p_demux, "end of a group of logical streams" );
/* We keep the ES to try reusing it in Ogg_BeginningOfStream
TAB_CLEAN( p_sys->i_streams, p_sys->pp_stream );
}
Ogg_EndOfStream( p_demux );
+ p_sys->b_chained_boundary = true;
}
- p_sys->i_eos = 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_SET_PCR, VLC_TS_0 );
+
+ if ( !p_sys->b_chained_boundary )
+ {
+ /* Find the real duration */
+ stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_canseek );
+ if ( b_canseek )
+ Oggseek_ProbeEnd( p_demux );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 );
+ }
+ else
+ {
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ p_sys->b_chained_boundary = false;
+ }
+ }
+
+ if ( p_sys->b_preparsing_done )
+ {
+ for ( int i=0; i < p_sys->i_streams; i++ )
+ {
+ if ( !p_sys->pp_stream[i]->p_es )
+ {
+ Ogg_CreateES( p_demux );
+ break;
+ }
+ }
}
/*
*/
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++;
+ {
+ /* If we delayed restarting encoders/SET_ES_FMT for more
+ * skeleton provided configuration */
+ if ( p_sys->p_skelstream )
+ {
+ if ( p_sys->p_skelstream->i_serial_no == ogg_page_serialno(&p_sys->current_page) )
+ {
+ msg_Dbg( p_demux, "End of Skeleton" );
+ p_sys->b_preparsing_done = true;
+ for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
+ {
+ logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
+ Ogg_ApplySkeleton( p_stream );
+ }
+ }
+ }
+
+ for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
+ {
+ if ( p_sys->pp_stream[i_stream]->i_serial_no == ogg_page_serialno( &p_sys->current_page ) )
+ {
+ p_sys->pp_stream[i_stream]->b_finished = true;
+ break;
+ }
+ }
+ }
}
+ b_skipping = false;
+ for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
+ {
+ b_skipping |= p_sys->pp_stream[i_stream]->i_skip_frames;
+ }
for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{
es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0);
}
+ /* Does fail if serialno differs */
if( ogg_stream_pagein( &p_stream->os, &p_sys->current_page ) != 0 )
{
continue;
}
+ /* clear the finished flag if pages after eos (ex: after a seek) */
+ if ( ! ogg_page_eos( &p_sys->current_page ) ) p_stream->b_finished = false;
+
+ DemuxDebug(
+ if ( p_stream->fmt.i_cat == VIDEO_ES )
+ msg_Dbg(p_demux, "DEMUX READ pageno %ld g%"PRId64" (%d packets) cont %d %ld bytes",
+ ogg_page_pageno( &p_sys->current_page ),
+ ogg_page_granulepos( &p_sys->current_page ),
+ ogg_page_packets( &p_sys->current_page ),
+ ogg_page_continued(&p_sys->current_page),
+ p_sys->current_page.body_len )
+ );
+
while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
{
/* Read info from any secondary header packets, if there are any */
oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x80theora", 7 ) )
{
- Ogg_ReadTheoraHeader( p_demux, p_stream, &oggpacket );
+ Ogg_ReadTheoraHeader( p_stream, &oggpacket );
p_stream->i_secondary_header_packets = 0;
}
else if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS &&
oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
{
- Ogg_ReadVorbisHeader( p_demux, p_stream, &oggpacket );
+ Ogg_ReadVorbisHeader( p_stream, &oggpacket );
p_stream->i_secondary_header_packets = 0;
}
else if( p_stream->fmt.i_codec == VLC_CODEC_CMML )
/* 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;
-
+ * for those streams, but don't skip headers */
+ if ( b_skipping && p_stream->i_skip_frames == 0
+ && p_stream->i_secondary_header_packets ) continue;
if( p_stream->b_reinit )
{
- /* If synchro is re-initialized we need to drop all the packets
- * until we find a new dated one. */
- Ogg_UpdatePCR( p_stream, &oggpacket );
+ if ( Oggseek_PacketPCRFixup( p_stream, &p_sys->current_page,
+ &oggpacket ) )
+ {
+ DemuxDebug( msg_Dbg( p_demux, "PCR fixup for %"PRId64,
+ ogg_page_granulepos( &p_sys->current_page ) ) );
+ }
+ else
+ {
+ /* If synchro is re-initialized we need to drop all the packets
+ * until we find a new dated one. */
+ Ogg_UpdatePCR( p_demux, p_stream, &oggpacket );
+ }
if( p_stream->i_pcr >= 0 )
{
}
else
{
+ DemuxDebug(
+ msg_Dbg(p_demux, "DEMUX DROPS PACKET (? / %d) pageno %ld granule %"PRId64,
+ ogg_page_packets( &p_sys->current_page ),
+ ogg_page_pageno( &p_sys->current_page ), oggpacket.granulepos );
+ );
+
p_stream->i_interpolated_pcr = -1;
p_stream->i_previous_granulepos = -1;
continue;
}
}
+ DemuxDebug( if ( p_sys->b_seeked )
+ {
+ if ( Ogg_IsKeyFrame( p_stream, &oggpacket ) )
+ msg_Dbg(p_demux, "** DEMUX ON KEYFRAME **" );
+
+ ogg_int64_t iframe = ogg_page_granulepos( &p_sys->current_page ) >> p_stream->i_granule_shift;
+ ogg_int64_t pframe = ogg_page_granulepos( &p_sys->current_page ) - ( iframe << p_stream->i_granule_shift );
+
+ msg_Dbg(p_demux, "DEMUX PACKET (size %d) IS at iframe %"PRId64" pageno %ld pframe %"PRId64" OFFSET %"PRId64" PACKET NO %"PRId64" skipleft=%d",
+ ogg_page_packets( &p_sys->current_page ),
+ iframe, ogg_page_pageno( &p_sys->current_page ), pframe, p_sys->i_input_position, oggpacket.packetno, p_stream->i_skip_frames );
+ })
+
Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
}
+ DemuxDebug( p_sys->b_seeked = false; )
+
if( !p_sys->b_page_waiting )
break;
}
/* if a page was waiting, it's now processed */
p_sys->b_page_waiting = false;
+ if ( p_sys->p_skelstream && !p_sys->p_skelstream->b_finished )
+ p_sys->b_preparsing_done = false;
+ else
+ p_sys->b_preparsing_done = true;
+
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->b_preparsing_done && p_stream->b_initializing )
+ {
+ /* We have 1 or more streams needing more than 1 page for preparsing */
+ p_sys->b_preparsing_done = false;
+ }
+
if( p_stream->fmt.i_cat == SPU_ES )
continue;
if( p_stream->i_interpolated_pcr < 0 )
return 1;
}
+static void Ogg_ResetStreamHelper( demux_sys_t *p_sys )
+{
+ for( int 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 = true;
+ p_stream->i_pcr = -1;
+ p_stream->i_interpolated_pcr = -1;
+ p_stream->i_previous_granulepos = -1;
+ ogg_stream_reset( &p_stream->os );
+ }
+ ogg_sync_reset( &p_sys->oy );
+}
+
+static logical_stream_t * Ogg_GetSelectedStream( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ logical_stream_t *p_stream = NULL;
+ for( int i=0; i<p_sys->i_streams; i++ )
+ {
+ logical_stream_t *p_candidate = p_sys->pp_stream[i];
+
+ bool b_selected = false;
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
+ p_candidate->p_es, &b_selected );
+ if ( !b_selected ) continue;
+
+ if ( !p_stream && p_candidate->fmt.i_cat == AUDIO_ES )
+ {
+ p_stream = p_candidate;
+ continue; /* Try to find video anyway */
+ }
+
+ if ( p_candidate->fmt.i_cat == VIDEO_ES )
+ {
+ p_stream = p_candidate;
+ break;
+ }
+ }
+ return p_stream;
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
{
demux_sys_t *p_sys = p_demux->p_sys;
vlc_meta_t *p_meta;
- int64_t *pi64;
- bool *pb_bool;
- int i;
+ int64_t *pi64, i64;
+ double *pf, f;
+ bool *pb_bool, b;
switch( i_query )
{
return VLC_SUCCESS;
case DEMUX_SET_TIME:
- return VLC_EGENERIC;
+ i64 = (int64_t)va_arg( args, int64_t );
+ logical_stream_t *p_stream = Ogg_GetSelectedStream( p_demux );
+ if ( !p_stream )
+ {
+ msg_Err( p_demux, "No selected seekable stream found" );
+ return VLC_EGENERIC;
+ }
+ stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b );
+ if ( Oggseek_BlindSeektoAbsoluteTime( p_demux, p_stream, i64, b ) )
+ {
+ Ogg_ResetStreamHelper( p_sys );
+ es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME,
+ VLC_TS_0 + i64 );
+ return VLC_SUCCESS;
+ }
+ else
+ return VLC_EGENERIC;
case DEMUX_GET_ATTACHMENTS:
{
return VLC_EGENERIC;
*pi_int = p_sys->i_attachments;
- *ppp_attach = xmalloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
+ *ppp_attach = xmalloc( sizeof(input_attachment_t*) * p_sys->i_attachments );
for( int i = 0; i < p_sys->i_attachments; i++ )
(*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] );
return VLC_SUCCESS;
}
+ case DEMUX_GET_POSITION:
+ pf = (double*)va_arg( args, double * );
+ if( p_sys->i_length > 0 )
+ {
+ *pf = (double) p_sys->i_pcr /
+ (double) ( p_sys->i_length * (mtime_t)1000000 );
+ }
+ else if( stream_Size( p_demux->s ) > 0 )
+ {
+ i64 = stream_Tell( p_demux->s );
+ *pf = (double) i64 / stream_Size( p_demux->s );
+ }
+ else *pf = 0.0;
+ return VLC_SUCCESS;
+
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 )
+ for ( int i=0; i< p_sys->i_streams; i++ )
{
+ if ( p_sys->pp_stream[i]->b_initializing )
+ return VLC_EGENERIC;
+ }
+
+ p_stream = Ogg_GetSelectedStream( p_demux );
+ if ( !p_stream )
+ {
+ msg_Err( p_demux, "No selected seekable stream found" );
return VLC_EGENERIC;
}
- for( i = 0; i < p_sys->i_streams; i++ )
+ stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b );
+
+ f = (double)va_arg( args, double );
+ if ( p_sys->i_length <= 0 || !b /* || ! ACCESS_CAN_FASTSEEK */ )
{
- logical_stream_t *p_stream = p_sys->pp_stream[i];
+ Ogg_ResetStreamHelper( p_sys );
+ Oggseek_BlindSeektoPosition( p_demux, p_stream, f, b );
+ return VLC_SUCCESS;
+ }
- /* we'll trash all the data until we find the next pcr */
- p_stream->b_reinit = true;
- p_stream->i_pcr = -1;
- p_stream->i_interpolated_pcr = -1;
- p_stream->i_previous_granulepos = -1;
- ogg_stream_reset( &p_stream->os );
+ assert( p_sys->i_length > 0 );
+ i64 = CLOCK_FREQ * p_sys->i_length * f;
+ Ogg_ResetStreamHelper( p_sys );
+ if ( Oggseek_SeektoAbsolutetime( p_demux, p_stream, i64 ) >= 0 )
+ {
+ es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME,
+ VLC_TS_0 + i64 );
+ return VLC_SUCCESS;
}
- ogg_sync_reset( &p_sys->oy );
- return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
- 1, i_query, args );
+
+ return VLC_EGENERIC;
+
case DEMUX_GET_LENGTH:
if ( p_sys->i_length < 0 )
return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
if( p_sys->i_seekpoints > 0 )
{
*pi_int = 1;
- *ppp_title = malloc( sizeof( input_title_t**) );
+ *ppp_title = malloc( sizeof( input_title_t* ) );
input_title_t *p_title = (*ppp_title)[0] = vlc_input_title_New();
for( int i = 0; i < p_sys->i_seekpoints; i++ )
{
- TAB_APPEND( p_title->i_seekpoint, p_title->seekpoint, p_sys->pp_seekpoints[i] );
+ seekpoint_t *p_seekpoint_copy = vlc_seekpoint_Duplicate( p_sys->pp_seekpoints[i] );
+ if ( likely( p_seekpoint_copy ) )
+ TAB_APPEND( p_title->i_seekpoint, p_title->seekpoint, p_seekpoint_copy );
}
*pi_title_offset = 0;
*pi_seekpoint_offset = 0;
const int i_seekpoint = (int)va_arg( args, int );
if( i_seekpoint > p_sys->i_seekpoints )
return VLC_EGENERIC;
- return VLC_EGENERIC;// Seek( p_demux, p_sys->pp_seekpoints[i_seekpoint]->i_time_offset );
+
+ for ( int i=0; i< p_sys->i_streams; i++ )
+ {
+ if ( p_sys->pp_stream[i]->b_initializing )
+ return VLC_EGENERIC;
+ }
+
+ i64 = p_sys->pp_seekpoints[i_seekpoint]->i_time_offset;
+
+ p_stream = Ogg_GetSelectedStream( p_demux );
+ if ( !p_stream )
+ {
+ msg_Err( p_demux, "No selected seekable stream found" );
+ return VLC_EGENERIC;
+ }
+
+ stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b );
+ if ( Oggseek_BlindSeektoAbsoluteTime( p_demux, p_stream, i64, b ) )
+ {
+ Ogg_ResetStreamHelper( p_sys );
+ es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME,
+ VLC_TS_0 + i64 );
+ p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
+ p_demux->info.i_seekpoint = i_seekpoint;
+ return VLC_SUCCESS;
+ }
+ else
+ return VLC_EGENERIC;
}
default:
* Ogg_UpdatePCR: update the PCR (90kHz program clock reference) for the
* current stream.
****************************************************************************/
-static void Ogg_UpdatePCR( logical_stream_t *p_stream,
+static void Ogg_UpdatePCR( demux_t *p_demux, logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
+ demux_sys_t *p_ogg = p_demux->p_sys;
p_stream->i_end_trim = 0;
+
/* Convert the granulepos into a pcr */
if( p_oggpacket->granulepos >= 0 )
{
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;
- ogg_int64_t pframe = p_oggpacket->granulepos -
- ( iframe << p_stream->i_granule_shift );
-
- 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 )
+ p_stream->fmt.i_codec == VLC_CODEC_KATE ||
+ 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;
+ p_stream->i_pcr = Oggseek_GranuleToAbsTimestamp( p_stream,
+ p_oggpacket->granulepos, true );
}
else
{
sample -= p_stream->i_pre_skip;
else
sample = 0;
- p_stream->i_pcr = sample * INT64_C(1000000) / p_stream->f_rate;
+ p_stream->i_pcr = sample * CLOCK_FREQ / p_stream->f_rate;
}
- p_stream->i_pcr += VLC_TS_0;
+ if ( !p_ogg->i_pcr_offset )
+ p_stream->i_pcr += VLC_TS_0;
+ else
+ p_stream->i_pcr += p_ogg->i_pcr_offset;
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 += (INT64_C(1000000) / p_stream->f_rate);
+ p_stream->i_interpolated_pcr += (CLOCK_FREQ / p_stream->f_rate);
else if( p_stream->fmt.i_codec == VLC_CODEC_OPUS &&
p_stream->i_previous_granulepos >= 0 &&
( duration =
else
sample = 0;
p_stream->i_interpolated_pcr =
- VLC_TS_0 + sample * INT64_C(1000000) / p_stream->f_rate;
+ VLC_TS_0 + sample * CLOCK_FREQ / p_stream->f_rate;
+ p_stream->i_interpolated_pcr += p_ogg->i_pcr_offset;
}
else if( p_stream->fmt.i_bitrate )
{
p_stream->i_interpolated_pcr +=
- ( p_oggpacket->bytes * INT64_C(1000000) /
+ ( p_oggpacket->bytes * CLOCK_FREQ /
p_stream->fmt.i_bitrate / 8 );
+ p_stream->i_interpolated_pcr += p_ogg->i_pcr_offset;
}
}
p_stream->i_previous_granulepos = p_oggpacket->granulepos;
/* it's an AnxData packet -- skip it (do nothing) */
return;
}
+ else if( p_oggpacket->bytes >= 8 &&
+ ! memcmp ( p_oggpacket->packet, "fisbone", 8 ) )
+ {
+ Ogg_ReadSkeletonBones( p_demux, p_oggpacket );
+ return;
+ }
+ else if( p_oggpacket->bytes >= 6 &&
+ ! memcmp ( p_oggpacket->packet, "index", 6 ) )
+ {
+ Ogg_ReadSkeletonIndex( p_demux, p_oggpacket );
+ return;
+ }
if( p_stream->fmt.i_codec == VLC_CODEC_SUBT && p_oggpacket->bytes > 0 &&
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->p_es )
+ b_selected = true;
+ else
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
+ p_stream->p_es, &b_selected );
if( p_stream->b_force_backup )
{
switch( p_stream->fmt.i_codec )
{
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;
+ if( p_stream->i_packets_backup == 3 )
+ p_stream->b_force_backup = false;
+ b_xiph = true;
+ break;
+
+ case VLC_CODEC_SPEEX:
+ if( p_stream->i_packets_backup == 2 + p_stream->i_extra_headers_packets )
+ p_stream->b_force_backup = false;
b_xiph = true;
break;
case VLC_CODEC_OPUS:
- if( p_stream->i_packets_backup == 2 ) p_stream->b_force_backup = 0;
+ if( p_stream->i_packets_backup == 2 )
+ p_stream->b_force_backup = false;
b_xiph = true;
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;
+ p_stream->b_force_backup = false;
}
else if( p_stream->fmt.audio.i_rate )
{
- p_stream->b_force_backup = 0;
+ p_stream->b_force_backup = false;
if( p_oggpacket->bytes >= 9 )
{
p_oggpacket->packet += 9;
break;
case VLC_CODEC_KATE:
- if( p_stream->i_packets_backup == p_stream->i_kate_num_headers ) p_stream->b_force_backup = 0;
+ if( p_stream->i_packets_backup == p_stream->i_kate_num_headers )
+ p_stream->b_force_backup = false;
b_xiph = true;
break;
default:
- p_stream->b_force_backup = 0;
+ p_stream->b_force_backup = false;
b_xiph = false;
break;
}
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,
+ Ogg_ExtractMeta( p_demux, & p_stream->fmt,
p_stream->p_headers, p_stream->i_headers );
/* we're not at BOS anymore for this logical stream */
- p_ogg->i_bos--;
+ p_stream->b_initializing = false;
}
}
b_selected = false; /* Discard the header packet */
}
+ else
+ p_stream->b_initializing = false;
/* Convert the pcr into a pts */
if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
{
if( p_stream->i_pcr >= 0 )
{
- /* 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 )
- {
-
- /* Call the pace control */
- es_out_Control( p_demux->out, ES_OUT_SET_PCR,
- VLC_TS_0 + p_stream->i_pcr );
- }
-
p_stream->i_previous_pcr = p_stream->i_pcr;
-
/* The granulepos is the end date of the sample */
i_pts = p_stream->i_pcr;
}
/* Convert the granulepos into the next pcr */
i_interpolated_pts = p_stream->i_interpolated_pcr;
- Ogg_UpdatePCR( p_stream, p_oggpacket );
-
- /* SPU streams are typically discontinuous, do not mind large gaps */
- if( p_stream->fmt.i_cat != SPU_ES )
- {
- if( p_stream->i_pcr >= 0 )
- {
- /* 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 )
- {
-
- /* Call the pace control */
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr );
- }
- }
- }
+ Ogg_UpdatePCR( p_demux, p_stream, p_oggpacket );
if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
return;
}
- if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
+ if( !( p_block = block_Alloc( p_oggpacket->bytes ) ) ) return;
/* may need to preroll after a seek */
{
i_pts = VLC_TS_0 + (p_stream->i_previous_granulepos
- p_block->i_nb_samples - p_stream->i_pre_skip) *
- INT64_C(1000000) / p_stream->f_rate;
+ CLOCK_FREQ / p_stream->f_rate;
}
p_stream->i_skip_frames = 0;
}
if( i_pts == VLC_TS_INVALID ) i_pts = VLC_TS_0;
else if( i_pts == -1 && i_interpolated_pts == VLC_TS_INVALID )
i_pts = VLC_TS_0;
- else if( i_pts == -1 && p_stream->fmt.i_cat == VIDEO_ES )
- i_pts = i_interpolated_pts;
+ else if( i_pts == -1 && (p_stream->fmt.i_cat == VIDEO_ES || p_stream->fmt.i_codec == VLC_CODEC_OPUS) )
+ i_pts = i_interpolated_pts; /* FIXME : why is this incorrect for vorbis? */
else if( i_pts == -1 ) i_pts = VLC_TS_INVALID;
if( p_stream->fmt.i_cat == AUDIO_ES )
/* 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;
+ p_block->i_pts = u_pnum * CLOCK_FREQ / p_stream->f_rate / 2;
}
else
{
p_block->i_buffer = 0;
}
+
if( p_stream->fmt.i_codec == VLC_CODEC_TARKIN )
{
/* FIXME: the biggest hack I've ever done */
memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len,
p_oggpacket->bytes - i_header_len );
- es_out_Send( p_demux->out, p_stream->p_es, p_block );
+ if ( p_stream->p_es )
+ {
+ /* Because ES creation is delayed for preparsing */
+ if ( p_stream->p_preparse_block )
+ {
+ es_out_Send( p_demux->out, p_stream->p_es, p_stream->p_preparse_block );
+ p_stream->p_preparse_block = NULL;
+ }
+ es_out_Send( p_demux->out, p_stream->p_es, p_block );
+ }
+ else
+ block_ChainAppend( & p_stream->p_preparse_block, p_block );
}
/* Re-implemented to avoid linking against libopus from the demuxer. */
{
demux_sys_t *p_ogg = p_demux->p_sys ;
ogg_packet oggpacket;
- int i_stream;
+ int i_stream = 0;
p_ogg->i_total_length = stream_Size ( p_demux->s );
msg_Dbg( p_demux, "File length is %"PRId64" bytes", p_ogg->i_total_length );
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->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 );
+ p_stream->b_initializing = true;
/* Setup the logical stream */
p_stream->i_serial_no = ogg_page_serialno( &p_ogg->current_page );
if( oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
{
- Ogg_ReadVorbisHeader( p_demux, p_stream, &oggpacket );
+ Ogg_ReadVorbisHeader( p_stream, &oggpacket );
msg_Dbg( p_demux, "found vorbis header" );
}
/* Check for Speex header */
else if( oggpacket.bytes >= 8 &&
! memcmp( oggpacket.packet, "OpusHead", 8 ) )
{
- Ogg_ReadOpusHeader( p_demux, p_stream, &oggpacket );
+ Ogg_ReadOpusHeader( p_stream, &oggpacket );
msg_Dbg( p_demux, "found opus header, channels: %i, "
"pre-skip: %i",
p_stream->fmt.audio.i_channels,
/* Grrrr!!!! Did they really have to put all the
* important info in the second header packet!!!
* (STREAMINFO metadata is in the following packet) */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
p_stream->fmt.i_cat = AUDIO_ES;
p_stream->fmt.i_codec = VLC_CODEC_FLAC;
oggpacket.packet[5], oggpacket.packet[6],
i_packets );
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
p_stream->fmt.i_cat = AUDIO_ES;
p_stream->fmt.i_codec = VLC_CODEC_FLAC;
else if( oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x80theora", 7 ) )
{
- Ogg_ReadTheoraHeader( p_demux, p_stream, &oggpacket );
+ Ogg_ReadTheoraHeader( p_stream, &oggpacket );
msg_Dbg( p_demux,
"found theora header, bitrate: %i, rate: %f",
Ogg_ReadKateHeader( p_stream, &oggpacket );
msg_Dbg( p_demux, "found kate header" );
}
+ /* Check for OggDS */
else if( oggpacket.bytes >= 142 &&
!memcmp( &oggpacket.packet[1],
"Direct Show Samples embedded in Ogg", 35 ))
{
/* Old header type */
-
+ p_stream->b_oggds = true;
/* Check for video header (old format) */
if( GetDWLE((oggpacket.packet+96)) == 0x05589f80 &&
oggpacket.bytes >= 184 )
i_format_tag = GetWLE((oggpacket.packet+124));
p_stream->fmt.audio.i_channels =
GetWLE((oggpacket.packet+126));
+ fill_channels_info(&p_stream->fmt.audio);
p_stream->f_rate = p_stream->fmt.audio.i_rate =
GetDWLE((oggpacket.packet+128));
p_stream->fmt.i_bitrate =
p_ogg->i_streams--;
}
}
+ /* Check for OggDS */
else if( oggpacket.bytes >= 44+1 &&
(*oggpacket.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER )
{
stream_header_t tmp;
stream_header_t *st = &tmp;
+ p_stream->b_oggds = true;
+
memcpy( st->streamtype, &oggpacket.packet[1+0], 8 );
memcpy( st->subtype, &oggpacket.packet[1+8], 4 );
st->size = GetDWLE( &oggpacket.packet[1+12] );
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,
+ memcpy( p_stream->fmt.p_extra, oggpacket.packet + 57,
p_stream->fmt.i_extra );
else
p_stream->fmt.i_extra = 0;
p_buffer[4] = '\0';
i_format_tag = strtol(p_buffer,NULL,16);
p_stream->fmt.audio.i_channels = st->sh.audio.channels;
+ fill_channels_info(&p_stream->fmt.audio);
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;
/* We need to get rid of the header packet */
ogg_stream_packetout( &p_stream->os, &oggpacket );
- msg_Dbg( p_demux, "found text subtitles header" );
+ msg_Dbg( p_demux, "found text subtitle header" );
p_stream->fmt.i_cat = SPU_ES;
p_stream->fmt.i_codec = VLC_CODEC_SUBT;
p_stream->f_rate = 1000; /* granulepos is in millisec */
p_ogg->i_streams--;
}
}
- else if( oggpacket.bytes >= 7 &&
- ! memcmp( oggpacket.packet, "fishead", 7 ) )
+ else if( oggpacket.bytes >= 8 &&
+ ! memcmp( oggpacket.packet, "fishead\0", 8 ) )
{
/* Skeleton */
msg_Dbg( p_demux, "stream %d is a skeleton",
p_ogg->i_streams-1 );
- /* FIXME: https://trac.videolan.org/vlc/ticket/1412 */
+ Ogg_ReadSkeletonHeader( p_demux, p_stream, &oggpacket );
}
else
{
p_ogg->i_streams--;
}
+ /* we'll need to get all headers */
+ p_ogg->pp_stream[i_stream]->b_initializing &= p_ogg->pp_stream[i_stream]->b_force_backup;
+
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. */
return VLC_EGENERIC;
}
+/****************************************************************************
+ * Ogg_CreateES: Creates all Elementary streams once headers are parsed
+ ****************************************************************************/
+static void Ogg_CreateES( 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;
+
+ for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
+ {
+ logical_stream_t *p_stream = p_ogg->pp_stream[i_stream];
+
+ if ( p_stream->p_es == NULL )
+ {
+ /* 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;
+
+ /* 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;
+ p_stream->b_finished = false;
+ p_stream->b_reinit = false;
+ p_stream->b_initializing = false;
+ es_format_Copy( &p_stream->fmt_old, &p_old_stream->fmt );
+
+ p_old_stream->p_es = NULL;
+ p_old_stream = NULL;
+ es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
+ p_stream->p_es, &p_stream->fmt );
+ }
+ else
+ {
+ 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 );
+ }
+ }
+ }
+
+ 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;
+ }
+}
+
/****************************************************************************
* Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
* Elementary streams.
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
/* 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_ogg->i_bitrate += p_stream->fmt.i_bitrate;
+ if ( p_stream->fmt.i_bitrate == 0 &&
+ ( p_stream->fmt.i_cat == VIDEO_ES ||
+ p_stream->fmt.i_cat == AUDIO_ES ) )
+ p_ogg->b_partial_bitrate = true;
+ else
+ p_ogg->i_bitrate += p_stream->fmt.i_bitrate;
p_stream->i_pcr = p_stream->i_previous_pcr =
p_stream->i_interpolated_pcr = -1;
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;
p_ogg->i_bitrate = 0;
p_ogg->i_streams = 0;
p_ogg->pp_stream = NULL;
+ p_ogg->skeleton.major = 0;
+ p_ogg->skeleton.minor = 0;
+ p_ogg->b_preparsing_done = false;
+ p_ogg->i_pcr_offset = p_ogg->i_pcr;
/* */
if( p_ogg->p_meta )
vlc_meta_Delete( p_ogg->p_meta );
p_ogg->p_meta = NULL;
+
+ for ( int i=0; i < p_ogg->i_seekpoints; i++ )
+ {
+ if ( p_ogg->pp_seekpoints[i] )
+ vlc_seekpoint_Delete( p_ogg->pp_seekpoints[i] );
+ }
+ TAB_CLEAN( p_ogg->i_seekpoints, p_ogg->pp_seekpoints );
+ p_ogg->i_seekpoints = 0;
}
/**
oggseek_index_entries_free( p_stream->idx );
}
+ Ogg_FreeSkeleton( p_stream->p_skel );
+ p_stream->p_skel = NULL;
+ if ( p_demux->p_sys->p_skelstream == p_stream )
+ p_demux->p_sys->p_skelstream = NULL;
+
+ /* Shouldn't happen */
+ if ( unlikely( p_stream->p_preparse_block ) )
+ {
+ block_ChainRelease( p_stream->p_preparse_block );
+ p_stream->p_preparse_block = NULL;
+ }
+
free( p_stream );
}
/**
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;
}
memcmp(p_old_map, p_new_map,
i_new_channel_count*sizeof(*p_new_map)) == 0;
}
- 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;
}
return !b_compatible;
}
-static void Ogg_ExtractXiphMeta( demux_t *p_demux, const void *p_headers, unsigned i_headers, unsigned i_skip )
+static void Ogg_ExtractXiphMeta( demux_t *p_demux, es_format_t *p_fmt,
+ const void *p_headers, unsigned i_headers, unsigned i_skip )
{
demux_sys_t *p_ogg = p_demux->p_sys;
/* TODO how to handle multiple comments properly ? */
if( i_count >= 2 && pi_size[1] > i_skip )
+ {
+ int i_cover_score = 0;
+ int i_cover_idx = 0;
+ float pf_replay_gain[AUDIO_REPLAY_GAIN_MAX];
+ float pf_replay_peak[AUDIO_REPLAY_GAIN_MAX];
+ for(int i=0; i< AUDIO_REPLAY_GAIN_MAX; i++ )
+ {
+ pf_replay_gain[i] = 0;
+ pf_replay_peak[i] = 0;
+ }
vorbis_ParseComment( &p_ogg->p_meta, (uint8_t*)pp_data[1] + i_skip, pi_size[1] - i_skip,
&p_ogg->i_attachments, &p_ogg->attachments,
- &p_ogg->i_seekpoints, &p_ogg->pp_seekpoints );
+ &i_cover_score, &i_cover_idx,
+ &p_ogg->i_seekpoints, &p_ogg->pp_seekpoints,
+ &pf_replay_gain, &pf_replay_peak );
+ if( p_ogg->p_meta != NULL && i_cover_idx < p_ogg->i_attachments )
+ {
+ char psz_url[128];
+ snprintf( psz_url, sizeof(psz_url), "attachment://%s",
+ p_ogg->attachments[i_cover_idx]->psz_name );
+ vlc_meta_Set( p_ogg->p_meta, vlc_meta_ArtworkURL, psz_url );
+ }
+
+ for ( int i=0; i<AUDIO_REPLAY_GAIN_MAX;i++ )
+ {
+ if ( pf_replay_gain[i] != 0 )
+ {
+ p_fmt->audio_replay_gain.pb_gain[i] = true;
+ p_fmt->audio_replay_gain.pf_gain[i] = pf_replay_gain[i];
+ msg_Dbg( p_demux, "setting replay gain %d to %f", i, pf_replay_gain[i] );
+ }
+ if ( pf_replay_peak[i] != 0 )
+ {
+ p_fmt->audio_replay_gain.pb_peak[i] = true;
+ p_fmt->audio_replay_gain.pf_peak[i] = pf_replay_peak[i];
+ msg_Dbg( p_demux, "setting replay peak %d to %f", i, pf_replay_gain[i] );
+ }
+ }
+ }
if( p_ogg->i_seekpoints > 1 )
{
p_demux->info.i_update |= INPUT_UPDATE_TITLE_LIST;
}
-
- 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 )
+static void Ogg_ExtractMeta( demux_t *p_demux, es_format_t *p_fmt, const uint8_t *p_headers, int i_headers )
{
demux_sys_t *p_ogg = p_demux->p_sys;
- switch( i_codec )
+ switch( p_fmt->i_codec )
{
/* 3 headers with the 2° one being the comments */
case VLC_CODEC_VORBIS:
case VLC_CODEC_THEORA:
- Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 );
+ Ogg_ExtractXiphMeta( p_demux, p_fmt, p_headers, i_headers, 1+6 );
break;
case VLC_CODEC_OPUS:
- Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 8 );
+ Ogg_ExtractXiphMeta( p_demux, p_fmt, p_headers, i_headers, 8 );
break;
case VLC_CODEC_SPEEX:
- Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0 );
+ Ogg_ExtractXiphMeta( p_demux, p_fmt, 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 );
+ Ogg_ExtractXiphMeta( p_demux, p_fmt, 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 );
+ msg_Warn( p_demux, "Ogg_ExtractMeta does not support %4.4s", (const char*)&p_fmt->i_codec );
break;
/* No meta data */
p_demux->info.i_update |= INPUT_UPDATE_META;
}
-static int64_t Ogg_GetLastPacket( demux_t *p_demux, logical_stream_t *p_stream,
- ogg_packet *p_oggpacket, double f_rate )
-{
- int64_t last_packet = oggseek_get_last_frame( p_demux, p_stream );
- /*
- * Since there's quite a good chance that ogg_stream_packetout was called,
- * the given p_oggpacket may point to invalid data. Fill it with some valid ones
- */
- ogg_stream_packetpeek( &p_stream->os, p_oggpacket );
-
- return ( last_packet >= 0 ) ? last_packet / f_rate : -1;
-}
-
-static void Ogg_ReadTheoraHeader( demux_t *p_demux, logical_stream_t *p_stream,
+static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
bs_t bitstream;
/* Signal that we want to keep a backup of the theora
* stream headers. They will be used when switching between
* audio streams. */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
/* Cheat and get additionnal info ;) */
bs_init( &bitstream, p_oggpacket->packet, p_oggpacket->bytes );
i_fps_numerator = bs_read( &bitstream, 32 );
i_fps_denominator = bs_read( &bitstream, 32 );
+ i_fps_denominator = __MAX( i_fps_denominator, 1 );
bs_read( &bitstream, 24 ); /* aspect_numerator */
bs_read( &bitstream, 24 ); /* aspect_denominator */
{
p_stream->i_keyframe_offset = 1;
}
- if ( p_demux->p_sys->i_length < 0 )
- {
- int64_t last_packet = Ogg_GetLastPacket( p_demux, p_stream, p_oggpacket, p_stream->f_rate );
- if ( last_packet >= 0 )
- p_demux->p_sys->i_length = last_packet;
- }
-
}
-static void Ogg_ReadVorbisHeader( demux_t *p_demux, logical_stream_t *p_stream,
+static void Ogg_ReadVorbisHeader( logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
oggpack_buffer opb;
/* Signal that we want to keep a backup of the vorbis
* stream headers. They will be used when switching between
* audio streams. */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
oggpack_adv( &opb, 88 );
p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 );
+ fill_channels_info(&p_stream->fmt.audio);
p_stream->f_rate = p_stream->fmt.audio.i_rate =
oggpack_read( &opb, 32 );
oggpack_adv( &opb, 32 );
p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
-
- if ( p_demux->p_sys->i_length < 0 )
- {
- int64_t last_packet = Ogg_GetLastPacket( p_demux, p_stream, p_oggpacket, p_stream->f_rate );
- if ( last_packet >= 0 )
- p_demux->p_sys->i_length = last_packet;
- }
}
static void Ogg_ReadSpeexHeader( logical_stream_t *p_stream,
/* Signal that we want to keep a backup of the speex
* stream headers. They will be used when switching between
* audio streams. */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
oggpack_adv( &opb, 32 ); /* mode */
oggpack_adv( &opb, 32 ); /* mode_bitstream_version */
p_stream->fmt.audio.i_channels = oggpack_read( &opb, 32 );
+ fill_channels_info(&p_stream->fmt.audio);
p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
+ oggpack_adv( &opb, 32 ); /* frame_size */
+ oggpack_adv( &opb, 32 ); /* vbr */
+ oggpack_adv( &opb, 32 ); /* frames_per_packet */
+ p_stream->i_extra_headers_packets = oggpack_read( &opb, 32 ); /* extra_headers */
}
-static void Ogg_ReadOpusHeader( demux_t *p_demux,
- logical_stream_t *p_stream,
+static void Ogg_ReadOpusHeader( logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
oggpack_buffer opb;
/* Signal that we want to keep a backup of the opus
* stream headers. They will be used when switching between
* audio streams. */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
/* All OggOpus streams are timestamped at 48kHz and
* can be played at 48kHz. */
oggpack_adv( &opb, 64 );
oggpack_adv( &opb, 8 ); /* version_id */
p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 );
+ fill_channels_info(&p_stream->fmt.audio);
p_stream->i_pre_skip = oggpack_read( &opb, 16 );
-
- if ( p_demux->p_sys->i_length < 0 )
- {
- int64_t last_packet = Ogg_GetLastPacket( p_demux, p_stream, p_oggpacket, p_stream->f_rate );
- if ( last_packet >= 0 )
- p_demux->p_sys->i_length = last_packet;
- }
}
static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream,
bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes );
bs_read( &s, 1 );
- if( p_oggpacket->bytes > 0 && bs_read( &s, 7 ) == 0 )
+ if( p_oggpacket->bytes > 0 && 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, "Invalid FLAC STREAMINFO metadata" );
+ return;
+ }
- 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" );
- }
+ 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;
+ fill_channels_info(&p_stream->fmt.audio);
- /* Fake this as the last metadata block */
- *((uint8_t*)p_oggpacket->packet) |= 0x80;
+ msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i",
+ p_stream->fmt.audio.i_channels, (int)p_stream->f_rate );
}
else
{
- /* This ain't a STREAMINFO metadata */
- msg_Dbg( p_demux, "Invalid FLAC STREAMINFO metadata" );
+ 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,
/* 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;
+ p_stream->b_force_backup = true;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
}
}
+static void Ogg_ApplyContentType( logical_stream_t *p_stream, const char* psz_value,
+ bool *b_force_backup, bool *b_packet_out )
+{
+ if( !strncmp(psz_value, "audio/x-wav", 11) )
+ {
+ /* n.b. WAVs are unsupported right now */
+ p_stream->fmt.i_cat = UNKNOWN_ES;
+ free( p_stream->fmt.psz_description );
+ p_stream->fmt.psz_description = strdup("WAV Audio (Unsupported)");
+ }
+ else if( !strncmp(psz_value, "audio/x-vorbis", 14) ||
+ !strncmp(psz_value, "audio/vorbis", 12) )
+ {
+ p_stream->fmt.i_cat = AUDIO_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
+
+ *b_force_backup = true;
+ }
+ else if( !strncmp(psz_value, "audio/x-speex", 13) ||
+ !strncmp(psz_value, "audio/speex", 11) )
+ {
+ p_stream->fmt.i_cat = AUDIO_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
+
+ *b_force_backup = true;
+ }
+ else if( !strncmp(psz_value, "audio/flac", 10) )
+ {
+ p_stream->fmt.i_cat = AUDIO_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_FLAC;
+
+ *b_force_backup = true;
+ }
+ else if( !strncmp(psz_value, "video/x-theora", 14) ||
+ !strncmp(psz_value, "video/theora", 12) )
+ {
+ p_stream->fmt.i_cat = VIDEO_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_THEORA;
+
+ *b_force_backup = true;
+ }
+ else if( !strncmp(psz_value, "video/x-xvid", 12) )
+ {
+ p_stream->fmt.i_cat = VIDEO_ES;
+ p_stream->fmt.i_codec = VLC_FOURCC( 'x','v','i','d' );
+
+ *b_force_backup = true;
+ }
+ else if( !strncmp(psz_value, "video/mpeg", 10) )
+ {
+ /* n.b. MPEG streams are unsupported right now */
+ p_stream->fmt.i_cat = VIDEO_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_MPGV;
+ }
+ else if( !strncmp(psz_value, "text/x-cmml", 11) ||
+ !strncmp(psz_value, "text/cmml", 9) )
+ {
+ p_stream->fmt.i_cat = SPU_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_CMML;
+ *b_packet_out = true;
+ }
+ else if( !strncmp(psz_value, "application/kate", 16) )
+ {
+ /* ??? */
+ p_stream->fmt.i_cat = UNKNOWN_ES;
+ free( p_stream->fmt.psz_description );
+ p_stream->fmt.psz_description = strdup("OGG Kate Overlay (Unsupported)");
+ }
+}
+
static void Ogg_ReadAnnodexHeader( demux_t *p_demux,
logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
uint64_t timebase_numerator;
uint64_t timebase_denominator;
- Ogg_ReadTheoraHeader( p_demux, p_stream, p_oggpacket );
+ Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */
minor_version = oggpack_read( &opb, 2*8 ); /* minor version */
timebase_numerator = GetQWLE( &p_oggpacket->packet[16] );
timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
+
+ msg_Dbg( p_demux, "Annodex info: version %"PRIu16".%"PRIu16" "
+ "Timebase %"PRId64" / %"PRId64,
+ major_version, minor_version,
+ timebase_numerator, timebase_denominator );
}
else if( p_oggpacket->bytes >= 42 &&
!memcmp( p_oggpacket->packet, "AnxData", 7 ) )
/* What type of file do we have?
* strcmp is safe to use here because we've extracted
* content_type_string from the stream manually */
- if( !strncmp(content_type_string, "audio/x-wav", 11) )
+ bool b_dopacketout = false;
+ Ogg_ApplyContentType( p_stream, content_type_string,
+ &p_stream->b_force_backup, &b_dopacketout );
+ if ( b_dopacketout ) ogg_stream_packetout( &p_stream->os, p_oggpacket );
+ }
+}
+
+static void Ogg_ReadSkeletonHeader( demux_t *p_demux, logical_stream_t *p_stream,
+ ogg_packet *p_oggpacket )
+{
+ p_demux->p_sys->p_skelstream = p_stream;
+ /* There can be only 1 skeleton for streams */
+ p_demux->p_sys->skeleton.major = GetWLE( &p_oggpacket->packet[8] );
+ p_demux->p_sys->skeleton.minor = GetWLE( &p_oggpacket->packet[10] );
+ if ( asprintf( & p_stream->fmt.psz_description,
+ "OGG Skeleton version %" PRIu16 ".%" PRIu16,
+ p_demux->p_sys->skeleton.major,
+ p_demux->p_sys->skeleton.minor ) < 0 )
+ p_stream->fmt.psz_description = NULL;
+}
+
+static void Ogg_ReadSkeletonBones( demux_t *p_demux, ogg_packet *p_oggpacket )
+{
+ if ( p_demux->p_sys->skeleton.major < 3 || p_oggpacket->bytes < 52 ) return;
+
+ /* Find the matching stream for this skeleton data */
+ ogg_int32_t i_serialno = GetDWLE( &p_oggpacket->packet[12] );
+ logical_stream_t *p_target_stream = NULL;
+ for ( int i=0; i< p_demux->p_sys->i_streams; i++ )
+ {
+ if ( p_demux->p_sys->pp_stream[i]->i_serial_no == i_serialno )
{
- /* n.b. WAVs are unsupported right now */
- p_stream->fmt.i_cat = UNKNOWN_ES;
+ p_target_stream = p_demux->p_sys->pp_stream[i];
+ break;
}
- else if( !strncmp(content_type_string, "audio/x-vorbis", 14) )
- {
- p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
+ }
+ if ( !p_target_stream ) return;
- p_stream->b_force_backup = 1;
- }
- else if( !strncmp(content_type_string, "audio/x-speex", 13) )
- {
- p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
+ ogg_skeleton_t *p_skel = p_target_stream->p_skel;
+ if ( !p_skel )
+ {
+ p_skel = malloc( sizeof( ogg_skeleton_t ) );
+ if ( !p_skel ) return;
+ TAB_INIT( p_skel->i_messages, p_skel->ppsz_messages );
+ p_skel->p_index = NULL;
+ p_target_stream->p_skel = p_skel;
+ }
- p_stream->b_force_backup = 1;
- }
- else if( !strncmp(content_type_string, "video/x-theora", 14) )
+ const unsigned char *p_messages = p_oggpacket->packet + 8 + GetDWLE( &p_oggpacket->packet[8] );
+ const unsigned char *p_boundary = p_oggpacket->packet + p_oggpacket->bytes;
+ const unsigned char *p = p_messages;
+ while ( p <= p_boundary - 1 && p > p_oggpacket->packet )
+ {
+ if ( *p == 0x0D && *(p+1) == 0x0A )
{
- p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_CODEC_THEORA;
-
- p_stream->b_force_backup = 1;
+ char *psz_message = strndup( (const char *) p_messages,
+ p - p_messages );
+ if ( psz_message )
+ {
+ msg_Dbg( p_demux, "stream %" PRId32 " [%s]", i_serialno, psz_message );
+ TAB_APPEND( p_skel->i_messages, p_skel->ppsz_messages, psz_message );
+ }
+ if ( p < p_boundary - 1 ) p_messages = p + 2;
}
- else if( !strncmp(content_type_string, "video/x-xvid", 12) )
+ p++;
+ }
+
+}
+
+/* Unpacks the 7bit variable encoding used in skeleton indexes */
+unsigned const char * Read7BitsVariableLE( unsigned const char *p_begin,
+ unsigned const char *p_end,
+ uint64_t *pi_value )
+{
+ int i_shift = 0;
+ int64_t i_read = 0;
+ *pi_value = 0;
+
+ while ( p_begin < p_end )
+ {
+ i_read = *p_begin & 0x7F; /* High bit is start of integer */
+ *pi_value = *pi_value | ( i_read << i_shift );
+ i_shift += 7;
+ if ( (*p_begin++ & 0x80) == 0x80 ) break; /* see prev */
+ }
+
+ *pi_value = GetQWLE( pi_value );
+ return p_begin;
+}
+
+static void Ogg_ReadSkeletonIndex( demux_t *p_demux, ogg_packet *p_oggpacket )
+{
+ if ( p_demux->p_sys->skeleton.major < 4
+ || p_oggpacket->bytes < 44 /* Need at least 1 index value (42+1+1) */
+ ) return;
+
+ /* Find the matching stream for this skeleton data */
+ int32_t i_serialno = GetDWLE( &p_oggpacket->packet[6] );
+ logical_stream_t *p_stream = NULL;
+ for ( int i=0; i< p_demux->p_sys->i_streams; i++ )
+ {
+ if ( p_demux->p_sys->pp_stream[i]->i_serial_no == i_serialno )
{
- p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'x','v','i','d' );
+ p_stream = p_demux->p_sys->pp_stream[i];
+ break;
+ }
+ }
+ if ( !p_stream ) return;
+ uint64_t i_keypoints = GetQWLE( &p_oggpacket->packet[10] );
+ msg_Dbg( p_demux, "%" PRIi64 " index data for %" PRIi32, i_keypoints, i_serialno );
+ if ( !i_keypoints ) return;
+
+ p_stream->p_skel->i_indexstampden = GetQWLE( &p_oggpacket->packet[18] );
+ p_stream->p_skel->i_indexfirstnum = GetQWLE( &p_oggpacket->packet[24] );
+ p_stream->p_skel->i_indexlastnum = GetQWLE( &p_oggpacket->packet[32] );
+ unsigned const char *p_fwdbyte = &p_oggpacket->packet[42];
+ unsigned const char *p_boundary = p_oggpacket->packet + p_oggpacket->bytes;
+ uint64_t i_offset = 0;
+ uint64_t i_time = 0;
+ uint64_t i_keypoints_found = 0;
+
+ while( p_fwdbyte < p_boundary && i_keypoints_found < i_keypoints )
+ {
+ uint64_t i_val;
+ p_fwdbyte = Read7BitsVariableLE( p_fwdbyte, p_boundary, &i_val );
+ i_offset += i_val;
+ p_fwdbyte = Read7BitsVariableLE( p_fwdbyte, p_boundary, &i_val );
+ i_time += i_val * p_stream->p_skel->i_indexstampden;
+ i_keypoints_found++;
+ }
- p_stream->b_force_backup = 1;
+ if ( i_keypoints_found != i_keypoints )
+ {
+ msg_Warn( p_demux, "Invalid Index: missing entries" );
+ return;
+ }
+
+ p_stream->p_skel->p_index = malloc( p_oggpacket->bytes - 42 );
+ if ( !p_stream->p_skel->p_index ) return;
+ memcpy( p_stream->p_skel->p_index, &p_oggpacket->packet[42],
+ p_oggpacket->bytes - 42 );
+ p_stream->p_skel->i_index = i_keypoints_found;
+ p_stream->p_skel->i_index_size = p_oggpacket->bytes - 42;
+}
+
+static void Ogg_FreeSkeleton( ogg_skeleton_t *p_skel )
+{
+ if ( !p_skel ) return;
+ for ( int i=0; i< p_skel->i_messages; i++ )
+ free( p_skel->ppsz_messages[i] );
+ TAB_CLEAN( p_skel->i_messages, p_skel->ppsz_messages );
+ free( p_skel->p_index );
+ free( p_skel );
+}
+
+static void Ogg_ApplySkeleton( logical_stream_t *p_stream )
+{
+ if ( !p_stream->p_skel ) return;
+ for ( int i=0; i< p_stream->p_skel->i_messages; i++ )
+ {
+ const char *psz_message = p_stream->p_skel->ppsz_messages[i];
+ if ( ! strncmp( "Name: ", psz_message, 6 ) )
+ {
+ free( p_stream->fmt.psz_description );
+ p_stream->fmt.psz_description = strdup( psz_message + 6 );
}
- else if( !strncmp(content_type_string, "video/mpeg", 10) )
+ else if ( ! strncmp("Content-Type: ", psz_message, 14 ) )
{
- /* n.b. MPEG streams are unsupported right now */
- p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_CODEC_MPGV;
+ bool b_foo;
+ Ogg_ApplyContentType( p_stream, psz_message + 14, &b_foo, &b_foo );
}
- else if( !strncmp(content_type_string, "text/x-cmml", 11) )
+ }
+}
+
+/* Return true if there's a skeleton exact match */
+bool Ogg_GetBoundsUsingSkeletonIndex( logical_stream_t *p_stream, int64_t i_time,
+ int64_t *pi_lower, int64_t *pi_upper )
+{
+ if ( !p_stream || !p_stream->p_skel || !p_stream->p_skel->p_index )
+ return false;
+
+ /* Validate range */
+ if ( i_time < p_stream->p_skel->i_indexfirstnum
+ * p_stream->p_skel->i_indexstampden ||
+ i_time > p_stream->p_skel->i_indexlastnum
+ * p_stream->p_skel->i_indexstampden ) return false;
+
+ /* Then Lookup its index */
+ unsigned const char *p_fwdbyte = p_stream->p_skel->p_index;
+ struct
+ {
+ int64_t i_pos;
+ int64_t i_time;
+ } current = { 0, 0 }, prev = { -1, -1 };
+
+ uint64_t i_keypoints_found = 0;
+
+ while( p_fwdbyte < p_fwdbyte + p_stream->p_skel->i_index_size
+ && i_keypoints_found < p_stream->p_skel->i_index )
+ {
+ uint64_t i_val;
+ p_fwdbyte = Read7BitsVariableLE( p_fwdbyte,
+ p_fwdbyte + p_stream->p_skel->i_index_size, &i_val );
+ current.i_pos += i_val;
+ p_fwdbyte = Read7BitsVariableLE( p_fwdbyte,
+ p_fwdbyte + p_stream->p_skel->i_index_size, &i_val );
+ current.i_time += i_val * p_stream->p_skel->i_indexstampden;
+ if ( current.i_pos < 0 || current.i_time < 0 ) break;
+
+ i_keypoints_found++;
+
+ if ( i_time <= current.i_time )
{
- ogg_stream_packetout( &p_stream->os, p_oggpacket );
- p_stream->fmt.i_cat = SPU_ES;
- p_stream->fmt.i_codec = VLC_CODEC_CMML;
+ *pi_lower = prev.i_pos;
+ *pi_upper = current.i_pos;
+ return ( i_time == current.i_time );
}
+ prev = current;
}
+ return false;
}
static uint32_t dirac_uint( bs_t *p_bs )
/* Backing up stream headers is not required -- seqhdrs are repeated
* thoughout the stream at suitable decoding start points */
- p_stream->b_force_backup = 0;
+ p_stream->b_force_backup = false;
/* read in useful bits from sequence header */
bs_init( &bs, p_oggpacket->packet, p_oggpacket->bytes );
projects / vlc / blobdiff