* ogg.c : ogg stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: ogg.c,v 1.29 2003/07/09 22:10:13 gbazin Exp $
+ * $Id: ogg.c,v 1.42 2003/10/25 00:49:14 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include <codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
#define OGG_BLOCK_SIZE 4096
-#define PAGES_READ_ONCE 1
/*****************************************************************************
- * Definitions of structures and functions used by this plugins
+ * Definitions of structures and functions used by this plugins
*****************************************************************************/
typedef struct logical_stream_s
{
* granulepos */
mtime_t i_pcr;
mtime_t i_interpolated_pcr;
+ mtime_t i_previous_pcr;
/* info from logical streams */
double f_rate;
/* program clock reference (in units of 90kHz) derived from the pcr of
* the sub-streams */
mtime_t i_pcr;
- mtime_t i_old_pcr;
-
- int b_seekable;
int b_reinit;
+
+ /* stream state */
+ int b_eos;
};
/* OggDS headers for the new header format (used in ogm files) */
ogg_int32_t width;
ogg_int32_t height;
} stream_header_video;
-
+
typedef struct stream_header_audio
{
ogg_int16_t channels;
#define PACKET_LEN_BITS2 0x02
#define PACKET_IS_SYNCPOINT 0x08
-/* Some functions to manipulate memory */
-static uint16_t GetWLE( uint8_t *p_buff )
-{
- return( (p_buff[0]) + ( p_buff[1] <<8 ) );
-}
-
-static uint32_t GetDWLE( uint8_t *p_buff )
-{
- return( p_buff[0] + ( p_buff[1] <<8 ) +
- ( p_buff[2] <<16 ) + ( p_buff[3] <<24 ) );
-}
-
-static uint64_t GetQWLE( uint8_t *p_buff )
-{
- return( GetDWLE( p_buff ) + ( ((uint64_t)GetDWLE( p_buff + 4 )) << 32 ) );
-}
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Activate ( vlc_object_t * );
static void Deactivate( vlc_object_t * );
static int Demux ( input_thread_t * );
+static int Control ( input_thread_t *, int, va_list );
/* Stream managment */
-static int Ogg_StreamStart ( input_thread_t *, demux_sys_t *, int );
-static void Ogg_StreamStop ( input_thread_t *, demux_sys_t *, int );
+static int Ogg_ElemStreamStart ( input_thread_t *, demux_sys_t *, int );
+static void Ogg_ElemStreamStop ( input_thread_t *, demux_sys_t *, int );
/* Bitstream manipulation */
static int Ogg_Check ( input_thread_t *p_input );
static void Ogg_UpdatePCR ( logical_stream_t *, ogg_packet * );
static void Ogg_DecodePacket ( input_thread_t *p_input,
logical_stream_t *p_stream, ogg_packet * );
-static int Ogg_FindLogicalStreams( input_thread_t *p_input,
- demux_sys_t *p_ogg );
+
+static int Ogg_BeginningOfStream( input_thread_t *p_input, demux_sys_t *p_ogg);
+static int Ogg_FindLogicalStreams( input_thread_t *p_input,demux_sys_t *p_ogg);
+static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg );
/*****************************************************************************
* Module descriptor
/*****************************************************************************
* Stream managment
*****************************************************************************/
-static int Ogg_StreamStart( input_thread_t *p_input,
- demux_sys_t *p_ogg, int i_stream )
+static int Ogg_ElemStreamStart( input_thread_t *p_input,
+ demux_sys_t *p_ogg, int i_stream )
{
#define p_stream p_ogg->pp_stream[i_stream]
if( !p_stream->p_es )
int i;
for( i = 0; i < p_stream->i_packets_backup; i++ )
{
+ /* Set correct starting date in header packets */
+ p_stream->p_packets_backup[i].granulepos =
+ p_stream->i_interpolated_pcr * p_stream->f_rate / 90000;
+
Ogg_DecodePacket( p_input, p_stream,
&p_stream->p_packets_backup[i] );
}
#undef p_stream
}
-static void Ogg_StreamStop( input_thread_t *p_input,
- demux_sys_t *p_ogg, int i_stream )
+static void Ogg_ElemStreamStop( input_thread_t *p_input,
+ demux_sys_t *p_ogg, int i_stream )
{
#define p_stream p_ogg->pp_stream[i_stream]
****************************************************************************/
static int Ogg_Check( input_thread_t *p_input )
{
- u8 *p_peek;
+ uint8_t *p_peek;
int i_size = input_Peek( p_input, &p_peek, 4 );
/* Check for the Ogg capture pattern */
static void Ogg_UpdatePCR( logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
-
- /* Convert the next granulepos into a pcr */
+ /* Convert the granulepos into a pcr */
if( p_oggpacket->granulepos >= 0 )
{
if( p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) )
}
else
{
- /* FIXME: ffmpeg doesn't like null pts */
- if( p_stream->i_cat == VIDEO_ES )
- /* 1 frame per packet */
- p_stream->i_pcr += (90000 / p_stream->f_rate);
- else
- p_stream->i_pcr = -1;
+ p_stream->i_pcr = -1;
/* no granulepos available, try to interpolate the pcr.
* If we can't then don't touch the old value. */
- if( p_stream->i_bitrate )
+ if( p_stream->i_cat == VIDEO_ES )
+ /* 1 frame per packet */
+ p_stream->i_interpolated_pcr += (90000 / p_stream->f_rate);
+ else if( p_stream->i_bitrate )
p_stream->i_interpolated_pcr += ( p_oggpacket->bytes * 90000
/ p_stream->i_bitrate / 8 );
}
data_packet_t *p_data;
vlc_bool_t b_trash = VLC_FALSE;
int i_header_len = 0;
+ mtime_t i_pts;
if( p_stream->b_force_backup )
{
- /* Backup the ogg packet (likely an header packet) */
ogg_packet *p_packet_backup;
p_stream->i_packets_backup++;
+ switch( p_stream->i_fourcc )
+ {
+ case VLC_FOURCC( 'v','o','r','b' ):
+ case VLC_FOURCC( 's','p','x',' ' ):
+ case VLC_FOURCC( 't','h','e','o' ):
+ if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
+ break;
+
+ default:
+ p_stream->b_force_backup = 0;
+ break;
+ }
+
+ /* Backup the ogg packet (likely an header packet) */
p_stream->p_packets_backup =
realloc( p_stream->p_packets_backup, p_stream->i_packets_backup *
sizeof(ogg_packet) );
p_packet_backup->bytes = p_oggpacket->bytes;
p_packet_backup->granulepos = p_oggpacket->granulepos;
+
+ if( p_oggpacket->granulepos >= 0 )
+ {
+ /* Because of vorbis granulepos scheme we must set the pcr for the
+ * 1st header packet so it doesn't get discarded in the
+ * packetizer */
+ Ogg_UpdatePCR( p_stream, p_oggpacket );
+ }
+
p_packet_backup->packet = malloc( p_oggpacket->bytes );
if( !p_packet_backup->packet ) return;
memcpy( p_packet_backup->packet, p_oggpacket->packet,
p_oggpacket->bytes );
-
- switch( p_stream->i_fourcc )
- {
- case VLC_FOURCC( 'v','o','r','b' ):
- case VLC_FOURCC( 't','h','e','o' ):
- if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
- break;
-
- default:
- p_stream->b_force_backup = 0;
- break;
- }
}
vlc_mutex_lock( &p_input->stream.control.control_lock );
}
vlc_mutex_unlock( &p_input->stream.control.control_lock );
- if( !p_stream->p_es->p_decoder_fifo || b_trash )
+ /* Convert the pcr into a pts */
+ if( p_stream->i_fourcc == VLC_FOURCC( 'v','o','r','b' ) ||
+ p_stream->i_fourcc == VLC_FOURCC( 's','p','x',' ' ) )
{
- /* This stream isn't currently selected so we don't need to decode it,
- * but we do need to store its pcr as it might be selected later on. */
+ 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 * 9/100 )
+ p_input->stream.p_selected_program->i_synchro_state =
+ SYNCHRO_REINIT;
+
+ p_stream->i_previous_pcr = p_stream->i_pcr;
+
+ /* Call the pace control */
+ if( p_input->stream.p_selected_program->i_synchro_state ==
+ SYNCHRO_REINIT )
+ input_ClockManageRef( p_input,
+ p_input->stream.p_selected_program,
+ p_stream->i_pcr );
+ }
+
+ /* The granulepos is the end date of the sample */
+ i_pts = ( p_stream->i_pcr < 0 ) ? 0 :
+ input_ClockGetTS( p_input, p_input->stream.p_selected_program,
+ p_stream->i_pcr );
+
+ /* Convert the granulepos into the next pcr */
+ Ogg_UpdatePCR( p_stream, p_oggpacket );
+ }
+ else
+ {
+ /* Convert the granulepos into the current pcr */
Ogg_UpdatePCR( p_stream, p_oggpacket );
+ 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 * 9/100 )
+ p_input->stream.p_selected_program->i_synchro_state =
+ SYNCHRO_REINIT;
+
+ p_stream->i_previous_pcr = p_stream->i_pcr;
+
+ /* Call the pace control */
+ if( p_input->stream.p_selected_program->i_synchro_state ==
+ SYNCHRO_REINIT )
+ input_ClockManageRef( p_input,
+ p_input->stream.p_selected_program,
+ p_stream->i_pcr );
+ }
+
+ /* The granulepos is the start date of the sample */
+ i_pts = ( p_stream->i_pcr < 0 ) ? 0 :
+ input_ClockGetTS( p_input, p_input->stream.p_selected_program,
+ p_stream->i_pcr );
+ }
+
+ if( !p_stream->p_es->p_decoder_fifo || b_trash )
+ {
+ /* This stream isn't currently selected so we don't need to decode it,
+ * but we did need to store its pcr as it might be selected later on */
return;
}
}
p_data->p_payload_end = p_data->p_payload_start + p_oggpacket->bytes;
- /* Convert the pcr into a pts */
- if( p_stream->i_cat != SPU_ES )
- {
- p_pes->i_pts = ( p_stream->i_pcr < 0 ) ? 0 :
- input_ClockGetTS( p_input, p_input->stream.p_selected_program,
- p_stream->i_pcr );
- }
- else
- {
- /* Of course subtitles had to be different! */
- p_pes->i_pts = ( p_oggpacket->granulepos < 0 ) ? 0 :
- input_ClockGetTS( p_input, p_input->stream.p_selected_program,
- p_oggpacket->granulepos * 90000 /
- p_stream->f_rate );
- }
-
- /* Convert the next granulepos into a pcr */
- Ogg_UpdatePCR( p_stream, p_oggpacket );
-
p_pes->i_nb_data = 1;
- p_pes->i_dts = p_oggpacket->granulepos;
+ p_pes->i_dts = p_pes->i_pts = i_pts;
p_pes->p_first = p_pes->p_last = p_data;
p_pes->i_pes_size = p_oggpacket->bytes;
+ if( p_stream->i_cat == SPU_ES ) p_pes->i_dts = 0;
+
if( p_stream->i_fourcc != VLC_FOURCC( 'v','o','r','b' ) &&
+ p_stream->i_fourcc != VLC_FOURCC( 's','p','x',' ' ) &&
p_stream->i_fourcc != VLC_FOURCC( 't','a','r','k' ) &&
p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) )
{
i_header_len++;
p_pes->i_pes_size -= i_header_len;
- p_pes->i_dts = 0;
}
if( p_stream->i_fourcc == VLC_FOURCC( 't','a','r','k' ) )
p_stream->i_bitrate );
}
}
+ /* Check for Speex header */
+ else if( oggpacket.bytes >= 7 &&
+ ! strncmp( &oggpacket.packet[0], "Speex", 5 ) )
+ {
+ oggpack_buffer opb;
+
+ p_stream->i_cat = AUDIO_ES;
+ p_stream->i_fourcc = VLC_FOURCC( 's','p','x',' ' );
+
+ /* 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;
+
+ /* Cheat and get additionnal info ;) */
+ oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
+ oggpack_adv( &opb, 224 );
+ oggpack_adv( &opb, 32 ); /* speex_version_id */
+ oggpack_adv( &opb, 32 ); /* header_size */
+ p_stream->f_rate = oggpack_read( &opb, 32 );
+ oggpack_adv( &opb, 32 ); /* mode */
+ oggpack_adv( &opb, 32 ); /* mode_bitstream_version */
+ p_stream->i_channels = oggpack_read( &opb, 32 );
+ p_stream->i_bitrate = oggpack_read( &opb, 32 );
+ {
+ char title[sizeof("Stream") + 10];
+ input_info_category_t *p_cat;
+ sprintf( title, "Stream %d", p_ogg->i_streams );
+ p_cat = input_InfoCategory( p_input, title );
+ input_AddInfo( p_cat, _("Type"), _("Audio") );
+ input_AddInfo( p_cat, _("Codec"), _("Speex") );
+ input_AddInfo( p_cat, _("Sample Rate"), "%f",
+ p_stream->f_rate );
+ input_AddInfo( p_cat, _("Channels"), "%d",
+ p_stream->i_channels );
+ input_AddInfo( p_cat, _("Bit Rate"), "%d",
+ p_stream->i_bitrate );
+ msg_Dbg( p_input, "found speex header, channels: %i, "
+ "rate: %i, bitrate: %i",
+ p_stream->i_channels,
+ (int)p_stream->f_rate, p_stream->i_bitrate );
+ }
+ }
/* Check for Theora header */
else if( oggpacket.bytes >= 7 &&
! strncmp( &oggpacket.packet[1], "theora", 6 ) )
i_keyframe_frequency_force >>= 1;
}
- p_stream->f_rate = (float)i_fps_numerator /
+ p_stream->f_rate = ((float)i_fps_numerator) /
i_fps_denominator;
msg_Dbg( p_input,
"found theora header, bitrate: %i, rate: %f",
"The theora stream won't be decoded." );
free( p_stream );
p_ogg->i_streams--;
- continue;
#endif /* HAVE_OGGPACKB */
}
/* Check for Tarkin header */
/* Mem allocation error, just ignore the stream */
free( p_stream );
p_ogg->i_streams--;
- continue;
+ break;
}
p_stream->p_bih->biSize = sizeof(BITMAPINFOHEADER);
p_stream->p_bih->biCompression= p_stream->i_fourcc =
/* Mem allocation error, just ignore the stream */
free( p_stream );
p_ogg->i_streams--;
- continue;
+ break;
}
p_stream->p_wf->wFormatTag =
sprintf( title, "Stream %d", p_ogg->i_streams );
p_cat = input_InfoCategory( p_input, title );
input_AddInfo( p_cat, _("Type"), _("Audio") );
- input_AddInfo( p_cat, _("Codec"), "%.4s",
+ input_AddInfo( p_cat, _("Codec"), "%.4s",
(char *)&p_stream->i_fourcc );
input_AddInfo( p_cat, _("Sample Rate"), "%d",
p_stream->p_wf->nSamplesPerSec );
}
}
else if( (*oggpacket.packet & PACKET_TYPE_BITS )
- == PACKET_TYPE_HEADER &&
+ == PACKET_TYPE_HEADER &&
oggpacket.bytes >= (int)sizeof(stream_header)+1 )
{
stream_header *st = (stream_header *)(oggpacket.packet+1);
/* Mem allocation error, just ignore the stream */
free( p_stream );
p_ogg->i_streams--;
- continue;
+ break;
}
p_stream->p_bih->biSize = sizeof(BITMAPINFOHEADER);
p_stream->p_bih->biCompression=
(char *)&p_stream->i_fourcc );
p_stream->f_rate = 10000000.0 /
- GetQWLE((uint8_t *)&st->time_unit);
+ GetQWLE(&st->time_unit);
p_stream->p_bih->biBitCount =
- GetWLE((uint8_t *)&st->bits_per_sample);
+ GetWLE(&st->bits_per_sample);
p_stream->p_bih->biWidth =
- GetDWLE((uint8_t *)&st->sh.video.width);
+ GetDWLE(&st->sh.video.width);
p_stream->p_bih->biHeight =
- GetDWLE((uint8_t *)&st->sh.video.height);
+ GetDWLE(&st->sh.video.height);
p_stream->p_bih->biPlanes= 1 ;
p_stream->p_bih->biSizeImage =
(p_stream->p_bih->biBitCount >> 3) *
/* Mem allocation error, just ignore the stream */
free( p_stream );
p_ogg->i_streams--;
- continue;
+ break;
}
memcpy( p_buffer, st->subtype, 4 );
p_buffer[4] = '\0';
p_stream->p_wf->wFormatTag = strtol(p_buffer,NULL,16);
p_stream->p_wf->nChannels =
- GetWLE((uint8_t *)&st->sh.audio.channels);
+ GetWLE(&st->sh.audio.channels);
p_stream->f_rate = p_stream->p_wf->nSamplesPerSec =
- GetQWLE((uint8_t *)&st->samples_per_unit);
+ GetQWLE(&st->samples_per_unit);
p_stream->i_bitrate = p_stream->p_wf->nAvgBytesPerSec =
- GetDWLE((uint8_t *)&st->sh.audio.avgbytespersec);
+ GetDWLE(&st->sh.audio.avgbytespersec);
p_stream->i_bitrate *= 8;
p_stream->p_wf->nBlockAlign =
- GetWLE((uint8_t *)&st->sh.audio.blockalign);
+ GetWLE(&st->sh.audio.blockalign);
p_stream->p_wf->wBitsPerSample =
- GetWLE((uint8_t *)&st->bits_per_sample);
+ GetWLE(&st->bits_per_sample);
p_stream->p_wf->cbSize = 0;
switch( p_stream->p_wf->wFormatTag )
sprintf( title, "Stream %d", p_ogg->i_streams );
p_cat = input_InfoCategory( p_input, title );
input_AddInfo( p_cat, _("Type"), _("Audio") );
- input_AddInfo( p_cat, _("Codec"), "%.4s",
+ input_AddInfo( p_cat, _("Codec"), "%.4s",
(char *)&p_stream->i_fourcc );
input_AddInfo( p_cat, _("Sample Rate"), "%d",
p_stream->p_wf->nSamplesPerSec );
*****************************************************************************/
static int Activate( vlc_object_t * p_this )
{
- int i_stream, b_forced;
- demux_sys_t *p_ogg;
input_thread_t *p_input = (input_thread_t *)p_this;
+ demux_sys_t *p_ogg;
+ int b_forced;
p_input->p_demux_data = NULL;
b_forced = ( ( *p_input->psz_demux )&&
}
memset( p_ogg, 0, sizeof( demux_sys_t ) );
p_input->p_demux_data = p_ogg;
-
- p_ogg->i_pcr = 0;
- p_ogg->b_seekable = ( ( p_input->stream.b_seekable )
- &&( p_input->stream.i_method == INPUT_METHOD_FILE ) );
+ p_ogg->pp_stream = NULL;
+ p_ogg->p_stream_video = NULL;
+ p_ogg->p_stream_audio = NULL;
+ p_ogg->p_stream_spu = NULL;
/* Initialize the Ogg physical bitstream parser */
ogg_sync_init( &p_ogg->oy );
- /* Find the logical streams embedded in the physical stream and
- * initialize our p_ogg structure. */
- if( Ogg_FindLogicalStreams( p_input, p_ogg ) != VLC_SUCCESS )
- {
- msg_Err( p_input, "couldn't find an ogg logical stream" );
- goto error;
- }
-
- /* Set the demux function */
+ /*Set exported functions */
p_input->pf_demux = Demux;
+ p_input->pf_demux_control = Control;
/* Initialize access plug-in structures. */
if( p_input->i_mtu == 0 )
goto error;
}
p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ /* Begnning of stream, tell the demux to look for elementary streams. */
+ p_ogg->b_eos = VLC_TRUE;
+
+ return 0;
+
+ error:
+ Deactivate( (vlc_object_t *)p_input );
+ return -1;
+
+}
+
+/****************************************************************************
+ * Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
+ * Elementary streams.
+ ****************************************************************************/
+static int Ogg_BeginningOfStream( input_thread_t *p_input, demux_sys_t *p_ogg)
+{
+ int i_stream;
+
+ /* Find the logical streams embedded in the physical stream and
+ * initialize our p_ogg structure. */
+ if( Ogg_FindLogicalStreams( p_input, p_ogg ) != VLC_SUCCESS )
+ {
+ msg_Warn( p_input, "couldn't find any ogg logical stream" );
+ return VLC_EGENERIC;
+ }
+
+ vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.i_mux_rate = 0;
vlc_mutex_unlock( &p_input->stream.stream_lock );
p_stream->p_es->i_fourcc = p_stream->i_fourcc;
p_stream->p_es->p_waveformatex = (void*)p_stream->p_wf;
p_stream->p_es->p_bitmapinfoheader = (void*)p_stream->p_bih;
+
+ p_stream->i_pcr = p_stream->i_previous_pcr = -1;
+ p_stream->b_reinit = 0;
#undef p_stream
}
{
p_ogg->p_stream_video = p_stream;
/* TODO add test to see if a decoder has been found */
- Ogg_StreamStart( p_input, p_ogg, i_stream );
+ Ogg_ElemStreamStart( p_input, p_ogg, i_stream );
}
break;
p_ogg->pp_stream[i_audio]->p_es->i_cat != AUDIO_ES )
{
p_ogg->p_stream_audio = p_stream;
- Ogg_StreamStart( p_input, p_ogg, i_stream );
+ Ogg_ElemStreamStart( p_input, p_ogg, i_stream );
}
}
break;
else if( i_spu == i_stream )
{
p_ogg->p_stream_spu = p_stream;
- Ogg_StreamStart( p_input, p_ogg, i_stream );
+ Ogg_ElemStreamStart( p_input, p_ogg, i_stream );
}
}
break;
p_input->stream.p_selected_program->b_is_ok = 1;
vlc_mutex_unlock( &p_input->stream.stream_lock );
- /* Call the pace control */
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
- p_ogg->i_pcr );
+ return VLC_SUCCESS;
+}
- return 0;
+/****************************************************************************
+ * Ogg_EndOfStream: clean up the ES when an End of Stream is detected.
+ ****************************************************************************/
+static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg )
+{
+ int i_stream, j;
- error:
- Deactivate( (vlc_object_t *)p_input );
- return -1;
+#define p_stream p_ogg->pp_stream[i_stream]
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ if( p_input->stream.i_pgrm_number )
+ while( p_input->stream.p_selected_program->i_es_number )
+ {
+ input_DelES( p_input,
+ p_input->stream.p_selected_program->pp_es[0] );
+ }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+#undef p_stream
+ for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
+ {
+#define p_stream p_ogg->pp_stream[i_stream]
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ p_input->stream.i_mux_rate -= (p_stream->i_bitrate / ( 8 * 50 ));
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+#undef p_stream
+
+ ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os );
+ for( j = 0; j < p_ogg->pp_stream[i_stream]->i_packets_backup; j++ )
+ {
+ free( p_ogg->pp_stream[i_stream]->p_packets_backup[j].packet );
+ }
+ if( p_ogg->pp_stream[i_stream]->p_packets_backup)
+ free( p_ogg->pp_stream[i_stream]->p_packets_backup );
+
+#if 0 /* hmmm, it's already freed in input_DelES() */
+ if( p_ogg->pp_stream[i]->p_bih )
+ free( p_ogg->pp_stream[i]->p_bih );
+ if( p_ogg->pp_stream[i]->p_wf )
+ free( p_ogg->pp_stream[i]->p_wf );
+#endif
+
+ free( p_ogg->pp_stream[i_stream] );
+ }
+
+ /* Reinit p_ogg */
+ if( p_ogg->pp_stream ) free( p_ogg->pp_stream );
+ p_ogg->pp_stream = NULL;
+ p_ogg->i_streams = 0;
+ p_ogg->p_stream_video = NULL;
+ p_ogg->p_stream_audio = NULL;
+ p_ogg->p_stream_spu = NULL;
}
/*****************************************************************************
static void Deactivate( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
- demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data ;
- int i, j;
+ demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data ;
if( p_ogg )
{
/* Cleanup the bitstream parser */
ogg_sync_clear( &p_ogg->oy );
- for( i = 0; i < p_ogg->i_streams; i++ )
- {
- ogg_stream_clear( &p_ogg->pp_stream[i]->os );
- for( j = 0; j < p_ogg->pp_stream[i]->i_packets_backup; j++ )
- {
- free( p_ogg->pp_stream[i]->p_packets_backup[j].packet );
- }
- if( p_ogg->pp_stream[i]->p_packets_backup)
- free( p_ogg->pp_stream[i]->p_packets_backup );
-#if 0 /* hmmm, it's already freed in input_DelES() */
- if( p_ogg->pp_stream[i]->p_bih )
- free( p_ogg->pp_stream[i]->p_bih );
- if( p_ogg->pp_stream[i]->p_wf )
- free( p_ogg->pp_stream[i]->p_wf );
-#endif
- free( p_ogg->pp_stream[i] );
- }
- if( p_ogg->pp_stream ) free( p_ogg->pp_stream );
+ Ogg_EndOfStream( p_input, p_ogg );
free( p_ogg );
}
*****************************************************************************/
static int Demux( input_thread_t * p_input )
{
- int i, i_stream, b_eos = 0;
+ demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data;
ogg_page oggpage;
ogg_packet oggpacket;
- demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data;
+ int i_stream;
+
+ if( p_ogg->b_eos )
+ {
+ if( Ogg_BeginningOfStream( p_input, p_ogg ) != VLC_SUCCESS ) return 0;
+ p_ogg->b_eos = VLC_FALSE;
+
+ msg_Dbg( p_input, "beginning of a group of logical streams" );
+
+ p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT;
+ input_ClockManageRef( p_input, p_input->stream.p_selected_program, 0 );
+ }
#define p_stream p_ogg->pp_stream[i_stream]
+
/* detect new selected/unselected streams */
for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
{
if( p_stream->p_es->p_decoder_fifo &&
!p_stream->i_activated )
{
- Ogg_StreamStart( p_input, p_ogg, i_stream );
+ Ogg_ElemStreamStart( p_input, p_ogg, i_stream );
}
else
if( !p_stream->p_es->p_decoder_fifo &&
p_stream->i_activated )
{
- Ogg_StreamStop( p_input, p_ogg, i_stream );
+ Ogg_ElemStreamStop( p_input, p_ogg, i_stream );
}
}
}
{
msg_Warn( p_input, "synchro reinit" );
- /* An ogg packet does only contain the starting date of the next
- * packet, not its own starting date.
- * As a quick work around, we just skip an oggpage */
-
for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
{
/* we'll trash all the data until we find the next pcr */
p_stream->i_pcr = -1;
p_stream->i_interpolated_pcr = -1;
}
- p_ogg->b_reinit = 1;
}
/*
- * Demux ogg pages from the stream
+ * Demux an ogg page from the stream
*/
- for( i = 0; i < PAGES_READ_ONCE || p_ogg->b_reinit; i++ )
+ if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
{
- if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
- {
- b_eos = 1;
- break;
- }
+ return 0; /* EOF */
+ }
- for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
+ /* Test for End of Stream */
+ if( ogg_page_eos( &oggpage ) )
+ {
+ msg_Dbg( p_input, "end of a group of logical streams" );
+
+ Ogg_EndOfStream( p_input, p_ogg );
+ p_ogg->b_eos = VLC_TRUE;
+ return 1;
+ }
+
+ for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
+ {
+ if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
+ continue;
+
+ while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
{
- if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
- continue;
+ if( !p_stream->p_es )
+ {
+ break;
+ }
- while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
+ if( p_stream->b_reinit )
{
- if( !p_stream->p_es )
+ /* 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( p_stream->i_pcr >= 0 )
{
- break;
+ p_stream->b_reinit = 0;
+ }
+ else
+ {
+ p_stream->i_interpolated_pcr = -1;
+ continue;
}
- if( p_stream->b_reinit )
+ /* An Ogg/vorbis packet contains an end date granulepos */
+ if( p_stream->i_fourcc == VLC_FOURCC( 'v','o','r','b' ) ||
+ p_stream->i_fourcc == VLC_FOURCC( 's','p','x',' ' ) )
{
- if( oggpacket.granulepos >= 0 )
+ if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
{
- p_stream->b_reinit = 0;
-
- /* Convert the next granulepos into a pcr */
- Ogg_UpdatePCR( p_stream, &oggpacket );
-
- /* Call the pace control to reinitialize
- * the system clock */
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
- p_stream->i_pcr );
-
- if( (!p_ogg->p_stream_video ||
- !p_ogg->p_stream_video->b_reinit) &&
- (!p_ogg->p_stream_audio ||
- !p_ogg->p_stream_audio->b_reinit) )
- {
- p_ogg->b_reinit = 0;
- }
+ Ogg_DecodePacket( p_input, p_stream, &oggpacket );
}
continue;
}
-
- Ogg_DecodePacket( p_input, p_stream, &oggpacket );
-
}
+
+ Ogg_DecodePacket( p_input, p_stream, &oggpacket );
}
+ break;
}
- i_stream = 0;
- p_ogg->i_old_pcr = p_ogg->i_pcr;
- p_ogg->i_pcr = p_stream->i_interpolated_pcr;
+ i_stream = 0; p_ogg->i_pcr = -1;
for( ; i_stream < p_ogg->i_streams; i_stream++ )
{
if( p_stream->i_cat == SPU_ES )
continue;
+ if( p_stream->i_interpolated_pcr < 0 )
+ continue;
- if( p_stream->i_interpolated_pcr > 0
- && p_stream->i_interpolated_pcr < p_ogg->i_pcr )
+ if( p_ogg->i_pcr < 0 || p_stream->i_interpolated_pcr < p_ogg->i_pcr )
p_ogg->i_pcr = p_stream->i_interpolated_pcr;
}
+
+ if( p_input->stream.p_selected_program->i_synchro_state != SYNCHRO_REINIT )
+ {
+ input_ClockManageRef( p_input, p_input->stream.p_selected_program,
+ p_ogg->i_pcr );
+ }
+
#undef p_stream
- /* This is for streams where the granulepos of the header packets
- * don't match these of the data packets (eg. ogg web radios). */
- if( p_ogg->i_old_pcr == 0 && p_ogg->i_pcr > 3 * DEFAULT_PTS_DELAY * 9/100 )
- p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT;
+ return 1;
+}
- /* Call the pace control */
- input_ClockManageRef( p_input, p_input->stream.p_selected_program,
- p_ogg->i_pcr );
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( input_thread_t *p_input, int i_query, va_list args )
+{
+ demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data;
+ int64_t *pi64;
- /* Did we reach the end of stream ? */
- return( b_eos ? 0 : 1 );
+ switch( i_query )
+ {
+ case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ *pi64 = p_ogg->i_pcr * 100 / 9;
+ return VLC_SUCCESS;
+
+ default:
+ return demux_vaControlDefault( p_input, i_query, args );
+ }
}
projects / vlc / blobdiff