X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=40825220a5ed4cf7c0b43155549c790b03c80aa4;hb=f8240b6ffe8d2e0d09490d6e0e4780319ffb2a8e;hp=eca46ae4fcc626bbc33b3810094510101c69ff04;hpb=5ca0ebcca2e3f55a1087811048684a3b9b1eecbf;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index eca46ae4fc..40825220a5 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -1,10 +1,11 @@ /***************************************************************************** - * ogg.c : ogg stream input module for vlc + * ogg.c : ogg stream demux module for vlc ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN - * $Id: ogg.c,v 1.52 2003/12/22 14:32:55 sam Exp $ + * Copyright (C) 2001-2007 the VideoLAN team + * $Id$ * - * Author: Gildas Bazin + * Authors: Gildas Bazin + * Andre Pang (Annodex support) * * 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 @@ -18,21 +19,37 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ #include -#include +#include +#include #include -#include "codecs.h" -#include "vlc_bits.h" +#include +#include + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +vlc_module_begin(); + set_shortname ( "OGG" ); + set_description( _("OGG demuxer" ) ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_capability( "demux2", 50 ); + set_callbacks( Open, Close ); + add_shortcut( "ogg" ); +vlc_module_end(); -#define OGG_BLOCK_SIZE 4096 /***************************************************************************** * Definitions of structures and functions used by this plugins @@ -46,14 +63,14 @@ typedef struct logical_stream_s double f_rate; int i_serial_no; - int b_activated; /* the header of some logical streams (eg vorbis) contain essential * data for the decoder. We back them up here in case we need to re-feed * them to the decoder. */ int b_force_backup; int i_packets_backup; - ogg_packet *p_packets_backup; + uint8_t *p_headers; + int i_headers; /* program clock reference (in units of 90kHz) derived from the previous * granulepos */ @@ -65,6 +82,9 @@ typedef struct logical_stream_s int b_reinit; int i_theora_keyframe_granule_shift; + /* for Annodex logical bitstreams */ + int secondary_header_packets; + } logical_stream_t; struct demux_sys_t @@ -77,10 +97,16 @@ struct demux_sys_t /* program clock reference (in units of 90kHz) derived from the pcr of * the sub-streams */ mtime_t i_pcr; - int i_old_synchro_state; /* stream state */ int i_eos; + + /* bitrate */ + int i_bitrate; + + /* attachments */ + int i_attachments; + input_attachment_t **attachments; }; /* OggDS headers for the new header format (used in ogm files) */ @@ -120,6 +146,8 @@ typedef struct stream_header } sh; } stream_header; +#define OGG_BLOCK_SIZE 4096 + /* Some defines from OggDS */ #define PACKET_TYPE_HEADER 0x01 #define PACKET_TYPE_BITS 0x07 @@ -130,74 +158,316 @@ typedef struct stream_header /***************************************************************************** * 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 ); +static int Demux ( demux_t * ); +static int Control( demux_t *, int, va_list ); /* Bitstream manipulation */ -static int Ogg_Check ( input_thread_t *p_input ); -static int Ogg_ReadPage ( input_thread_t *, demux_sys_t *, ogg_page * ); +static int Ogg_ReadPage ( demux_t *, ogg_page * ); 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 void Ogg_DecodePacket ( demux_t *, logical_stream_t *, ogg_packet * ); -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 ); +static int Ogg_BeginningOfStream( demux_t *p_demux ); +static int Ogg_FindLogicalStreams( demux_t *p_demux ); +static void Ogg_EndOfStream( demux_t *p_demux ); + +/* Logical bitstream headers */ +static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * ); +static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * ); /***************************************************************************** - * Module descriptor + * Open: initializes ogg demux structures *****************************************************************************/ -vlc_module_begin(); - set_description( _("ogg stream demuxer" ) ); - set_capability( "demux", 50 ); - set_callbacks( Activate, Deactivate ); - add_shortcut( "ogg" ); -vlc_module_end(); - -/**************************************************************************** - * Ogg_Check: Check we are dealing with an ogg stream. - ****************************************************************************/ -static int Ogg_Check( input_thread_t *p_input ) +static int Open( vlc_object_t * p_this ) { - uint8_t *p_peek; - int i_size = input_Peek( p_input, &p_peek, 4 ); + demux_t *p_demux = (demux_t *)p_this; + input_thread_t *p_input; + demux_sys_t *p_sys; + const uint8_t *p_peek; + - /* Check for the Ogg capture pattern */ - if( !(i_size>3) || !(p_peek[0] == 'O') || !(p_peek[1] == 'g') || - !(p_peek[2] == 'g') || !(p_peek[3] == 'S') ) + /* 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 ) ); - /* FIXME: Capture pattern might not be enough so we can also check for the - * the first complete page */ + memset( p_sys, 0, sizeof( demux_sys_t ) ); + p_sys->i_bitrate = 0; + p_sys->pp_stream = NULL; + + /* Begnning of stream, tell the demux to look for elementary streams. */ + p_sys->i_eos = 0; + + + p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); + if( p_input ) + { + p_demux->p_private = malloc( sizeof( demux_meta_t ) ); + if( !p_demux->p_private ) + { + vlc_object_release( p_input ); + return VLC_ENOMEM; + } + module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 ); + if( p_meta ) + { + demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private; + vlc_meta_Merge( input_GetItem(p_input)->p_meta, + p_demux_meta->p_meta ); + vlc_meta_Delete( p_demux_meta->p_meta ); + module_Unneed( p_demux, p_meta ); + p_sys->i_attachments = p_demux_meta->i_attachments; + p_sys->attachments = p_demux_meta->attachments; + } + vlc_object_release( p_input ); + free( p_demux->p_private ); + } + + /* Initialize the Ogg physical bitstream parser */ + ogg_sync_init( &p_sys->oy ); return VLC_SUCCESS; } +/***************************************************************************** + * Close: frees unused data + *****************************************************************************/ +static void Close( vlc_object_t *p_this ) +{ + demux_t *p_demux = (demux_t *)p_this; + demux_sys_t *p_sys = p_demux->p_sys ; + + /* Cleanup the bitstream parser */ + ogg_sync_clear( &p_sys->oy ); + + Ogg_EndOfStream( p_demux ); + + int i; + for( i = 0; i < p_sys->i_attachments; i++ ) + free( p_sys->attachments[i] ); + TAB_CLEAN( p_sys->i_attachments, p_sys->attachments); + + free( p_sys ); +} + +/***************************************************************************** + * Demux: reads and demuxes data packets + ***************************************************************************** + * Returns -1 in case of error, 0 in case of EOF, 1 otherwise + *****************************************************************************/ +static int Demux( demux_t * p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + ogg_page oggpage; + ogg_packet oggpacket; + int i_stream; + + + if( p_sys->i_eos == p_sys->i_streams ) + { + if( p_sys->i_eos ) + { + msg_Dbg( p_demux, "end of a group of logical streams" ); + Ogg_EndOfStream( p_demux ); + } + + 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_RESET_PCR ); + } + + /* + * 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++; + + + for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) + { + logical_stream_t *p_stream = p_sys->pp_stream[i_stream]; + + if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 ) + continue; + + 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->fmt.i_codec == VLC_FOURCC('t','h','e','o') && + oggpacket.bytes >= 7 && + ! memcmp( &oggpacket.packet[1], "theora", 6 ) ) + { + Ogg_ReadTheoraHeader( p_stream, &oggpacket ); + p_stream->secondary_header_packets = 0; + } + else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') && + oggpacket.bytes >= 7 && + ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) ) + { + Ogg_ReadVorbisHeader( p_stream, &oggpacket ); + p_stream->secondary_header_packets = 0; + } + else if ( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) + { + p_stream->secondary_header_packets = 0; + } + } + + 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( p_stream->i_pcr >= 0 ) + { + p_stream->b_reinit = 0; + } + else + { + p_stream->i_interpolated_pcr = -1; + continue; + } + + /* 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( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) + { + Ogg_DecodePacket( p_demux, p_stream, &oggpacket ); + } + else + { + es_out_Control( p_demux->out, ES_OUT_SET_PCR, + p_stream->i_pcr ); + } + continue; + } + } + + Ogg_DecodePacket( p_demux, p_stream, &oggpacket ); + } + break; + } + + i_stream = 0; p_sys->i_pcr = -1; + for( ; i_stream < p_sys->i_streams; i_stream++ ) + { + logical_stream_t *p_stream = p_sys->pp_stream[i_stream]; + + if( p_stream->fmt.i_cat == SPU_ES ) + continue; + if( p_stream->i_interpolated_pcr < 0 ) + continue; + + if( p_sys->i_pcr < 0 || p_stream->i_interpolated_pcr < p_sys->i_pcr ) + p_sys->i_pcr = p_stream->i_interpolated_pcr; + } + + if( p_sys->i_pcr >= 0 ) + { + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr ); + } + + + return 1; +} + +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( demux_t *p_demux, int i_query, va_list args ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + int64_t *pi64; + int i; + input_attachment_t ***ppp_attach; + int *pi_int; + + switch( i_query ) + { + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = p_sys->i_pcr; + return VLC_SUCCESS; + + case DEMUX_SET_TIME: + return VLC_EGENERIC; + + case DEMUX_SET_POSITION: + for( i = 0; i < p_sys->i_streams; i++ ) + { + logical_stream_t *p_stream = p_sys->pp_stream[i]; + + /* we'll trash all the data until we find the next pcr */ + p_stream->b_reinit = 1; + p_stream->i_pcr = -1; + p_stream->i_interpolated_pcr = -1; + ogg_stream_reset( &p_stream->os ); + } + ogg_sync_reset( &p_sys->oy ); + + case DEMUX_GET_ATTACHMENTS: + ppp_attach = + (input_attachment_t***)va_arg( args, input_attachment_t*** ); + pi_int = (int*)va_arg( args, int * ); + + if( p_sys->i_attachments <= 0 ) + return VLC_EGENERIC; + + *pi_int = p_sys->i_attachments; + *ppp_attach = malloc( sizeof(input_attachment_t**) * p_sys->i_attachments ); + for( i = 0; i < p_sys->i_attachments; i++ ) + (*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] ); + return VLC_SUCCESS; + + default: + return demux2_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate, + 1, i_query, args ); + } +} + /**************************************************************************** * Ogg_ReadPage: Read a full Ogg page from the physical bitstream. **************************************************************************** * Returns VLC_SUCCESS if a page has been read. An error might happen if we * are at the end of stream. ****************************************************************************/ -static int Ogg_ReadPage( input_thread_t *p_input, demux_sys_t *p_ogg, - ogg_page *p_oggpage ) +static int Ogg_ReadPage( demux_t *p_demux, ogg_page *p_oggpage ) { + demux_sys_t *p_ogg = p_demux->p_sys ; int i_read = 0; - data_packet_t *p_data; - byte_t *p_buffer; + char *p_buffer; while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 ) { - i_read = input_SplitBuffer( p_input, &p_data, OGG_BLOCK_SIZE ); + p_buffer = ogg_sync_buffer( &p_ogg->oy, OGG_BLOCK_SIZE ); + + i_read = stream_Read( p_demux->s, p_buffer, OGG_BLOCK_SIZE ); if( i_read <= 0 ) return VLC_EGENERIC; - p_buffer = ogg_sync_buffer( &p_ogg->oy, i_read ); - p_input->p_vlc->pf_memcpy( p_buffer, p_data->p_payload_start, i_read ); ogg_sync_wrote( &p_ogg->oy, i_read ); - input_DeletePacket( p_input->p_method_data, p_data ); } return VLC_SUCCESS; @@ -215,7 +485,7 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, { if( p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) ) { - p_stream->i_pcr = p_oggpacket->granulepos * 90000 + p_stream->i_pcr = p_oggpacket->granulepos * I64C(1000000) / p_stream->f_rate; } else @@ -225,7 +495,7 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, ogg_int64_t pframe = p_oggpacket->granulepos - ( iframe << p_stream->i_theora_keyframe_granule_shift ); - p_stream->i_pcr = ( iframe + pframe ) * 90000 + p_stream->i_pcr = ( iframe + pframe ) * I64C(1000000) / p_stream->f_rate; } @@ -239,152 +509,116 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, * 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 += (90000 / p_stream->f_rate); + p_stream->i_interpolated_pcr += (I64C(1000000) / p_stream->f_rate); else if( p_stream->fmt.i_bitrate ) - p_stream->i_interpolated_pcr += ( p_oggpacket->bytes * 90000 - / p_stream->fmt.i_bitrate / 8 ); + p_stream->i_interpolated_pcr += + ( p_oggpacket->bytes * I64C(1000000) / + p_stream->fmt.i_bitrate / 8 ); } } /**************************************************************************** * Ogg_DecodePacket: Decode an Ogg packet. ****************************************************************************/ -static void Ogg_DecodePacket( input_thread_t *p_input, +static void Ogg_DecodePacket( demux_t *p_demux, logical_stream_t *p_stream, ogg_packet *p_oggpacket ) { block_t *p_block; vlc_bool_t b_selected; int i_header_len = 0; - mtime_t i_pts; + mtime_t i_pts = -1, i_interpolated_pts; /* Sanity check */ if( !p_oggpacket->bytes ) { - msg_Dbg( p_input, "discarding 0 sized packet" ); + msg_Dbg( p_demux, "discarding 0 sized packet" ); + return; + } + + if( p_oggpacket->bytes >= 7 && + ! memcmp ( &p_oggpacket->packet[0], "Annodex", 7 ) ) + { + /* it's an Annodex packet -- skip it (do nothing) */ return; } + else if( p_oggpacket->bytes >= 7 && + ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) ) + { + /* it's an AnxData packet -- skip it (do nothing) */ + return; + } + + if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) && + p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return; + + /* Check the ES is selected */ + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, + p_stream->p_es, &b_selected ); if( p_stream->b_force_backup ) { - ogg_packet *p_packet_backup; + uint8_t *p_extra; + vlc_bool_t b_store_size = VLC_TRUE; + p_stream->i_packets_backup++; switch( p_stream->fmt.i_codec ) { case VLC_FOURCC( 'v','o','r','b' ): case VLC_FOURCC( 's','p','x',' ' ): case VLC_FOURCC( 't','h','e','o' ): - if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0; - break; + if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0; + break; case VLC_FOURCC( 'f','l','a','c' ): - if( p_stream->i_packets_backup == 1 ) return; - else if( p_stream->i_packets_backup == 2 ) - { - /* Parse the STREAMINFO metadata */ - bs_t s; - bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes ); - bs_read( &s, 1 ); - if( bs_read( &s, 7 ) == 0 ) - { - if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ ) - { - bs_skip( &s, 80 ); - p_stream->f_rate = p_stream->fmt.audio.i_rate = - bs_read( &s, 20 ); - p_stream->fmt.audio.i_channels = - bs_read( &s, 3 ) + 1; - - msg_Dbg( p_input, "Flac header, channels: %i, rate: %i", - p_stream->fmt.audio.i_channels, - (int)p_stream->f_rate ); - } - else - { - msg_Dbg( p_input, "FLAC STREAMINFO metadata too short" ); - } - - /* Store STREAMINFO for the decoder and packetizer */ - p_stream->fmt.i_extra = p_oggpacket->bytes + 4; - p_stream->fmt.p_extra = malloc( p_stream->fmt.i_extra ); - memcpy( p_stream->fmt.p_extra, "fLaC", 4); - memcpy( ((uint8_t *)p_stream->fmt.p_extra) + 4, - p_oggpacket->packet, p_oggpacket->bytes ); - - /* Fake this as the last metadata block */ - ((uint8_t*)p_stream->fmt.p_extra)[4] |= 0x80; - - p_stream->p_es = es_out_Add( p_input->p_es_out, - &p_stream->fmt ); - } - else - { - /* This ain't a STREAMINFO metadata */ - msg_Dbg( p_input, "Invalid FLAC STREAMINFO metadata" ); - } - p_stream->b_force_backup = 0; - p_stream->i_packets_backup = 0; - - if( p_oggpacket->granulepos >= 0 ) - Ogg_UpdatePCR( p_stream, p_oggpacket ); - - p_stream->i_previous_pcr = 0; - return; - } - break; + if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 ) + { + Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket ); + p_stream->b_force_backup = 0; + } + else if( p_stream->fmt.audio.i_rate ) + { + p_stream->b_force_backup = 0; + if( p_oggpacket->bytes >= 9 ) + { + p_oggpacket->packet += 9; + p_oggpacket->bytes -= 9; + } + } + b_store_size = VLC_FALSE; + break; default: - p_stream->b_force_backup = 0; - break; + p_stream->b_force_backup = 0; + break; } /* Backup the ogg packet (likely an header packet) */ - p_stream->p_packets_backup = - realloc( p_stream->p_packets_backup, p_stream->i_packets_backup * - sizeof(ogg_packet) ); - - p_packet_backup = - &p_stream->p_packets_backup[p_stream->i_packets_backup - 1]; - - p_packet_backup->bytes = p_oggpacket->bytes; - p_packet_backup->granulepos = p_oggpacket->granulepos; - - if( p_oggpacket->granulepos >= 0 ) + p_stream->p_headers = + realloc( p_stream->p_headers, p_stream->i_headers + + p_oggpacket->bytes + (b_store_size ? 2 : 0) ); + p_extra = p_stream->p_headers + p_stream->i_headers; + if( b_store_size ) { - /* 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_extra++) = p_oggpacket->bytes >> 8; + *(p_extra++) = p_oggpacket->bytes & 0xFF; } + memcpy( p_extra, p_oggpacket->packet, p_oggpacket->bytes ); + p_stream->i_headers += p_oggpacket->bytes + (b_store_size ? 2 : 0); - p_packet_backup->packet = malloc( p_oggpacket->bytes ); - if( !p_packet_backup->packet ) return; - memcpy( p_packet_backup->packet, p_oggpacket->packet, - p_oggpacket->bytes ); - } - - /* Check the ES is selected */ - es_out_Control( p_input->p_es_out, ES_OUT_GET_ES_STATE, - p_stream->p_es, &b_selected ); - - if( b_selected && !p_stream->b_activated ) - { - p_stream->b_activated = VLC_TRUE; - - /* Newly activated stream, feed the backup headers to the decoder */ if( !p_stream->b_force_backup ) { - 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] ); - } + /* Last header received, commit changes */ + p_stream->fmt.i_extra = p_stream->i_headers; + p_stream->fmt.p_extra = + realloc( p_stream->fmt.p_extra, p_stream->i_headers ); + memcpy( p_stream->fmt.p_extra, p_stream->p_headers, + p_stream->i_headers ); + es_out_Control( p_demux->out, ES_OUT_SET_FMT, + p_stream->p_es, &p_stream->fmt ); } + + b_selected = VLC_FALSE; /* Discard the header packet */ } /* Convert the pcr into a pts */ @@ -397,77 +631,74 @@ static void Ogg_DecodePacket( input_thread_t *p_input, /* 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_pcr > 3 * DEFAULT_PTS_DELAY ) + { + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + + /* Call the pace control */ + es_out_Control( p_demux->out, ES_OUT_SET_PCR, + p_stream->i_pcr ); + } 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; } + } - /* 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 */ + i_interpolated_pts = p_stream->i_interpolated_pcr; + Ogg_UpdatePCR( p_stream, p_oggpacket ); - /* Convert the granulepos into the next pcr */ - Ogg_UpdatePCR( p_stream, p_oggpacket ); - } - else + if( p_stream->i_pcr >= 0 ) { - /* 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 ) { - /* 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; + es_out_Control( p_demux->out, ES_OUT_RESET_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 ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_stream->i_pcr ); } + } + + if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) && + p_stream->i_pcr >= 0 ) + { + p_stream->i_previous_pcr = 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 ); + i_pts = p_stream->i_pcr; } if( !b_selected ) { /* 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 */ - p_stream->b_activated = VLC_FALSE; return; } - if( !( p_block = block_New( p_input, p_oggpacket->bytes ) ) ) - { + if( p_oggpacket->bytes <= 0 ) return; - } + + if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return; + + /* Normalize PTS */ + if( i_pts == 0 ) i_pts = 1; + else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = 1; + else if( i_pts == -1 ) i_pts = 0; if( p_stream->fmt.i_cat == AUDIO_ES ) p_block->i_dts = p_block->i_pts = i_pts; else if( p_stream->fmt.i_cat == SPU_ES ) { - p_block->i_pts = i_pts; - p_block->i_dts = 0; + 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' ) ) p_block->i_dts = p_block->i_pts = i_pts; @@ -481,20 +712,47 @@ static void Ogg_DecodePacket( input_thread_t *p_input, 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( 't','h','e','o' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 'c','m','m','l' ) ) { - /* Remove the header from the packet */ + /* 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; - i_header_len++; - p_block->i_buffer -= i_header_len; + if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' )) + { + /* But with subtitles we need to retrieve the duration first */ + int i, lenbytes = 0; + + if( i_header_len > 0 && p_oggpacket->bytes >= i_header_len + 1 ) + { + for( i = 0, lenbytes = 0; i < i_header_len; i++ ) + { + lenbytes = lenbytes << 8; + lenbytes += *(p_oggpacket->packet + i_header_len - i); + } + } + if( p_oggpacket->bytes - 1 - i_header_len > 2 || + ( p_oggpacket->packet[i_header_len + 1] != ' ' && + p_oggpacket->packet[i_header_len + 1] != 0 && + p_oggpacket->packet[i_header_len + 1] != '\n' && + p_oggpacket->packet[i_header_len + 1] != '\r' ) ) + { + p_block->i_length = (mtime_t)lenbytes * 1000; + } + } + + i_header_len++; + if( p_block->i_buffer >= i_header_len ) + p_block->i_buffer -= i_header_len; + else + p_block->i_buffer = 0; } if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) ) { /* FIXME: the biggest hack I've ever done */ - msg_Warn( p_input, "tark pts: "I64Fd", granule: "I64Fd, + msg_Warn( p_demux, "tarkin pts: "I64Fd", granule: "I64Fd, p_block->i_pts, p_block->i_dts ); msleep(10000); } @@ -502,7 +760,7 @@ static void Ogg_DecodePacket( input_thread_t *p_input, memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len, p_oggpacket->bytes - i_header_len ); - es_out_Send( p_input->p_es_out, p_stream->p_es, p_block ); + es_out_Send( p_demux->out, p_stream->p_es, p_block ); } /**************************************************************************** @@ -515,15 +773,16 @@ static void Ogg_DecodePacket( input_thread_t *p_input, * * On success this function returns VLC_SUCCESS. ****************************************************************************/ -static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) +static int Ogg_FindLogicalStreams( demux_t *p_demux ) { + demux_sys_t *p_ogg = p_demux->p_sys ; ogg_packet oggpacket; ogg_page oggpage; int i_stream; #define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1] - while( Ogg_ReadPage( p_input, p_ogg, &oggpage ) == VLC_SUCCESS ) + while( Ogg_ReadPage( p_demux, &oggpage ) == VLC_SUCCESS ) { if( ogg_page_bos( &oggpage ) ) { @@ -539,9 +798,10 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) p_stream = malloc( sizeof(logical_stream_t) ); memset( p_stream, 0, sizeof(logical_stream_t) ); + p_stream->p_headers = 0; + p_stream->secondary_header_packets = 0; es_format_Init( &p_stream->fmt, 0, 0 ); - p_stream->b_activated = VLC_TRUE; /* Setup the logical stream */ p_stream->i_serial_no = ogg_page_serialno( &oggpage ); @@ -552,7 +812,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 ) { /* error. stream version mismatch perhaps */ - msg_Err( p_input, "Error reading first page of " + msg_Err( p_demux, "error reading first page of " "Ogg bitstream data" ); return VLC_EGENERIC; } @@ -562,64 +822,26 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) /* Check for Vorbis header */ if( oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) ) + ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) ) { - oggpack_buffer opb; - - msg_Dbg( p_input, "found vorbis header" ); - p_stream->fmt.i_cat = AUDIO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' ); - - /* 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, 88 ); - p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 ); - 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 ); + Ogg_ReadVorbisHeader( p_stream, &oggpacket ); + msg_Dbg( p_demux, "found vorbis header" ); } /* Check for Speex header */ else if( oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[0], "Speex", 5 ) ) + ! memcmp( &oggpacket.packet[0], "Speex", 5 ) ) { - oggpack_buffer opb; - - p_stream->fmt.i_cat = AUDIO_ES; - p_stream->fmt.i_codec = 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 = p_stream->fmt.audio.i_rate = - oggpack_read( &opb, 32 ); - oggpack_adv( &opb, 32 ); /* mode */ - oggpack_adv( &opb, 32 ); /* mode_bitstream_version */ - p_stream->fmt.audio.i_channels = oggpack_read( &opb, 32 ); - p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 ); - - msg_Dbg( p_input, "found speex header, channels: %i, " + Ogg_ReadSpeexHeader( p_stream, &oggpacket ); + msg_Dbg( p_demux, "found speex header, channels: %i, " "rate: %i, bitrate: %i", p_stream->fmt.audio.i_channels, (int)p_stream->f_rate, p_stream->fmt.i_bitrate ); } - /* Check for Flac header */ + /* Check for Flac header (< version 1.1.1) */ else if( oggpacket.bytes >= 4 && - ! strncmp( &oggpacket.packet[0], "fLaC", 4 ) ) + ! memcmp( &oggpacket.packet[0], "fLaC", 4 ) ) { - msg_Dbg( p_input, "found Flac header" ); + msg_Dbg( p_demux, "found FLAC header" ); /* Grrrr!!!! Did they really have to put all the * important info in the second header packet!!! @@ -629,74 +851,42 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) p_stream->fmt.i_cat = AUDIO_ES; p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' ); } - /* Check for Theora header */ - else if( oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[1], "theora", 6 ) ) + /* Check for Flac header (>= version 1.1.1) */ + else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F && + ! memcmp( &oggpacket.packet[1], "FLAC", 4 ) && + ! memcmp( &oggpacket.packet[9], "fLaC", 4 ) ) { - bs_t bitstream; - int i_fps_numerator; - int i_fps_denominator; - int i_keyframe_frequency_force; - - msg_Dbg( p_input, "found theora header" ); - p_stream->fmt.i_cat = VIDEO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' ); + int i_packets = ((int)oggpacket.packet[7]) << 8 | + oggpacket.packet[8]; + msg_Dbg( p_demux, "found FLAC header version %i.%i " + "(%i header packets)", + oggpacket.packet[5], oggpacket.packet[6], + i_packets ); - /* 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 ;) */ - bs_init( &bitstream, oggpacket.packet, oggpacket.bytes ); - bs_skip( &bitstream, 56 ); - bs_read( &bitstream, 8 ); /* major version num */ - bs_read( &bitstream, 8 ); /* minor version num */ - bs_read( &bitstream, 8 ); /* subminor version num */ - bs_read( &bitstream, 16 ) /*<< 4*/; /* width */ - bs_read( &bitstream, 16 ) /*<< 4*/; /* height */ - bs_read( &bitstream, 24 ); /* frame width */ - bs_read( &bitstream, 24 ); /* frame height */ - bs_read( &bitstream, 8 ); /* x offset */ - bs_read( &bitstream, 8 ); /* y offset */ - - i_fps_numerator = bs_read( &bitstream, 32 ); - i_fps_denominator = bs_read( &bitstream, 32 ); - bs_read( &bitstream, 24 ); /* aspect_numerator */ - bs_read( &bitstream, 24 ); /* aspect_denominator */ - i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 ); - bs_read( &bitstream, 8 ); /* colorspace */ - p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 ); - bs_read( &bitstream, 6 ); /* quality */ - - /* granule_shift = i_log( frequency_force -1 ) */ - p_stream->i_theora_keyframe_granule_shift = 0; - i_keyframe_frequency_force--; - while( i_keyframe_frequency_force ) - { - p_stream->i_theora_keyframe_granule_shift++; - i_keyframe_frequency_force >>= 1; - } + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' ); + oggpacket.packet += 13; oggpacket.bytes -= 13; + Ogg_ReadFlacHeader( p_demux, p_stream, &oggpacket ); + } + /* Check for Theora header */ + else if( oggpacket.bytes >= 7 && + ! memcmp( &oggpacket.packet[1], "theora", 6 ) ) + { + Ogg_ReadTheoraHeader( p_stream, &oggpacket ); - p_stream->f_rate = ((float)i_fps_numerator) / - i_fps_denominator; - msg_Dbg( p_input, + msg_Dbg( p_demux, "found theora header, bitrate: %i, rate: %f", p_stream->fmt.i_bitrate, p_stream->f_rate ); - - /* Save this data in p_extra for ffmpeg */ - p_stream->fmt.i_extra = oggpacket.bytes; - p_stream->fmt.p_extra = malloc( oggpacket.bytes ); - memcpy( p_stream->fmt.p_extra, - oggpacket.packet, oggpacket.bytes ); } /* Check for Tarkin header */ else if( oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[1], "tarkin", 6 ) ) + ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) ) { oggpack_buffer opb; - msg_Dbg( p_input, "found tarkin header" ); + 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' ); @@ -706,12 +896,29 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) oggpack_adv( &opb, 104 ); p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 ); p_stream->f_rate = 2; /* FIXME */ - msg_Dbg( p_input, + msg_Dbg( p_demux, "found tarkin header, bitrate: %i, rate: %f", p_stream->fmt.i_bitrate, p_stream->f_rate ); } + /* Check for Annodex header */ + else if( oggpacket.bytes >= 7 && + ! memcmp( &oggpacket.packet[0], "Annodex", 7 ) ) + { + Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, + &oggpacket ); + /* kill annodex track */ + free( p_stream ); + p_ogg->i_streams--; + } + /* Check for Annodex header */ + else if( oggpacket.bytes >= 7 && + ! memcmp( &oggpacket.packet[0], "AnxData", 7 ) ) + { + Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, + &oggpacket ); + } else if( oggpacket.bytes >= 142 && - !strncmp( &oggpacket.packet[1], + !memcmp( &oggpacket.packet[1], "Direct Show Samples embedded in Ogg", 35 )) { /* Old header type */ @@ -726,9 +933,12 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) oggpacket.packet[69], oggpacket.packet[70], oggpacket.packet[71] ); - msg_Dbg( p_input, "found video header of type: %.4s", + msg_Dbg( p_demux, "found video header of type: %.4s", (char *)&p_stream->fmt.i_codec ); + p_stream->fmt.video.i_frame_rate = 10000000; + p_stream->fmt.video.i_frame_rate_base = + GetQWLE((oggpacket.packet+164)); p_stream->f_rate = 10000000.0 / GetQWLE((oggpacket.packet+164)); p_stream->fmt.video.i_bits_per_pixel = @@ -741,7 +951,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) p_stream->fmt.video.i_height = GetDWLE((oggpacket.packet+180)); - msg_Dbg( p_input, + msg_Dbg( p_demux, "fps: %f, width:%i; height:%i, bitcount:%i", p_stream->f_rate, p_stream->fmt.video.i_width, @@ -778,38 +988,20 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) p_stream->fmt.audio.i_bitspersample = GetWLE((oggpacket.packet+138)); - switch( i_format_tag ) + wf_tag_to_fourcc( i_format_tag, + &p_stream->fmt.i_codec, 0 ); + + if( p_stream->fmt.i_codec == + VLC_FOURCC('u','n','d','f') ) { - case WAVE_FORMAT_PCM: - p_stream->fmt.i_codec = - VLC_FOURCC( 'a', 'r', 'a', 'w' ); - break; - case WAVE_FORMAT_MPEG: - case WAVE_FORMAT_MPEGLAYER3: - p_stream->fmt.i_codec = - VLC_FOURCC( 'm', 'p', 'g', 'a' ); - break; - case WAVE_FORMAT_A52: - p_stream->fmt.i_codec = - VLC_FOURCC( 'a', '5', '2', ' ' ); - break; - case WAVE_FORMAT_WMA1: - p_stream->fmt.i_codec = - VLC_FOURCC( 'w', 'm', 'a', '1' ); - break; - case WAVE_FORMAT_WMA2: - p_stream->fmt.i_codec = - VLC_FOURCC( 'w', 'm', 'a', '2' ); - break; - default: p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's', ( i_format_tag >> 8 ) & 0xff, i_format_tag & 0xff ); } - msg_Dbg( p_input, "found audio header of type: %.4s", + msg_Dbg( p_demux, "found audio header of type: %.4s", (char *)&p_stream->fmt.i_codec ); - msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz " + msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz " "%dbits/sample %dkb/s", i_format_tag, p_stream->fmt.audio.i_channels, @@ -820,7 +1012,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) } else { - msg_Dbg( p_input, "stream %d has an old header " + msg_Dbg( p_demux, "stream %d has an old header " "but is of an unknown type", p_ogg->i_streams-1 ); free( p_stream ); p_ogg->i_streams--; @@ -843,9 +1035,12 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) p_stream->fmt.i_codec = VLC_FOURCC( st->subtype[0], st->subtype[1], st->subtype[2], st->subtype[3] ); - msg_Dbg( p_input, "found video header of type: %.4s", + msg_Dbg( p_demux, "found video header of type: %.4s", (char *)&p_stream->fmt.i_codec ); + p_stream->fmt.video.i_frame_rate = 10000000; + p_stream->fmt.video.i_frame_rate_base = + GetQWLE(&st->time_unit); p_stream->f_rate = 10000000.0 / GetQWLE(&st->time_unit); p_stream->fmt.video.i_bits_per_pixel = @@ -855,7 +1050,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) p_stream->fmt.video.i_height = GetDWLE(&st->sh.video.height); - msg_Dbg( p_input, + msg_Dbg( p_demux, "fps: %f, width:%i; height:%i, bitcount:%i", p_stream->f_rate, p_stream->fmt.video.i_width, @@ -873,6 +1068,16 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) /* We need to get rid of the header packet */ ogg_stream_packetout( &p_stream->os, &oggpacket ); + p_stream->fmt.i_extra = GetQWLE(&st->size) - + sizeof(stream_header); + if( p_stream->fmt.i_extra ) + { + p_stream->fmt.p_extra = + malloc( p_stream->fmt.i_extra ); + memcpy( p_stream->fmt.p_extra, st + 1, + p_stream->fmt.i_extra ); + } + memcpy( p_buffer, st->subtype, 4 ); p_buffer[4] = '\0'; i_format_tag = strtol(p_buffer,NULL,16); @@ -887,38 +1092,20 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) p_stream->fmt.audio.i_bitspersample = GetWLE(&st->bits_per_sample); - switch( i_format_tag ) + wf_tag_to_fourcc( i_format_tag, + &p_stream->fmt.i_codec, 0 ); + + if( p_stream->fmt.i_codec == + VLC_FOURCC('u','n','d','f') ) { - case WAVE_FORMAT_PCM: - p_stream->fmt.i_codec = - VLC_FOURCC( 'a', 'r', 'a', 'w' ); - break; - case WAVE_FORMAT_MPEG: - case WAVE_FORMAT_MPEGLAYER3: - p_stream->fmt.i_codec = - VLC_FOURCC( 'm', 'p', 'g', 'a' ); - break; - case WAVE_FORMAT_A52: - p_stream->fmt.i_codec = - VLC_FOURCC( 'a', '5', '2', ' ' ); - break; - case WAVE_FORMAT_WMA1: - p_stream->fmt.i_codec = - VLC_FOURCC( 'w', 'm', 'a', '1' ); - break; - case WAVE_FORMAT_WMA2: - p_stream->fmt.i_codec = - VLC_FOURCC( 'w', 'm', 'a', '2' ); - break; - default: p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's', ( i_format_tag >> 8 ) & 0xff, i_format_tag & 0xff ); } - msg_Dbg( p_input, "found audio header of type: %.4s", + msg_Dbg( p_demux, "found audio header of type: %.4s", (char *)&p_stream->fmt.i_codec ); - msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz " + msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz " "%dbits/sample %dkb/s", i_format_tag, p_stream->fmt.audio.i_channels, @@ -932,14 +1119,14 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) /* We need to get rid of the header packet */ ogg_stream_packetout( &p_stream->os, &oggpacket ); - msg_Dbg( p_input, "found text subtitles header" ); + msg_Dbg( p_demux, "found text subtitles header" ); p_stream->fmt.i_cat = SPU_ES; p_stream->fmt.i_codec = VLC_FOURCC('s','u','b','t'); p_stream->f_rate = 1000; /* granulepos is in milisec */ } else { - msg_Dbg( p_input, "stream %d has a header marker " + msg_Dbg( p_demux, "stream %d has a header marker " "but is of an unknown type", p_ogg->i_streams-1 ); free( p_stream ); p_ogg->i_streams--; @@ -947,13 +1134,13 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) } else { - msg_Dbg( p_input, "stream %d is of unknown type", + msg_Dbg( p_demux, "stream %d is of unknown type", p_ogg->i_streams-1 ); free( p_stream ); p_ogg->i_streams--; } - if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS ) + if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS ) return VLC_EGENERIC; } @@ -977,108 +1164,40 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) return VLC_EGENERIC; } -/***************************************************************************** - * Activate: initializes ogg demux structures - *****************************************************************************/ -static int Activate( vlc_object_t * p_this ) -{ - 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 )&& - ( !strncmp( p_input->psz_demux, "ogg", 10 ) ) ) ? 1 : 0; - - /* Check if we are dealing with an ogg stream */ - if( !b_forced && ( Ogg_Check( p_input ) != VLC_SUCCESS ) ) - return -1; - - /* Allocate p_ogg */ - if( !( p_ogg = malloc( sizeof( demux_sys_t ) ) ) ) - { - msg_Err( p_input, "out of memory" ); - goto error; - } - memset( p_ogg, 0, sizeof( demux_sys_t ) ); - p_input->p_demux_data = p_ogg; - p_ogg->pp_stream = NULL; - - /* Initialize the Ogg physical bitstream parser */ - ogg_sync_init( &p_ogg->oy ); - - /* 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 ) - { - /* Improve speed. */ - p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE; - } - - /* Create one program */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot init stream" ); - goto error; - } - if( input_AddProgram( p_input, 0, 0) == NULL ) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot add program" ); - 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->i_eos = 0; - - p_ogg->i_old_synchro_state = !SYNCHRO_REINIT; - - 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) +static int Ogg_BeginningOfStream( demux_t *p_demux ) { + demux_sys_t *p_ogg = p_demux->p_sys ; 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 ) + if( Ogg_FindLogicalStreams( p_demux ) != VLC_SUCCESS ) { - msg_Warn( p_input, "couldn't find any ogg logical stream" ); + msg_Warn( p_demux, "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_ogg->i_bitrate = 0; for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ ) { #define p_stream p_ogg->pp_stream[i_stream] - if( p_stream->fmt.i_codec != VLC_FOURCC('f','l','a','c') ) - p_stream->p_es = es_out_Add( p_input->p_es_out, &p_stream->fmt ); + p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt ); - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.i_mux_rate += (p_stream->fmt.i_bitrate / ( 8 * 50 )); - vlc_mutex_unlock( &p_input->stream.stream_lock ); + if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) + { + /* 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; - p_stream->i_pcr = p_stream->i_previous_pcr = -1; + p_stream->i_pcr = p_stream->i_previous_pcr = + p_stream->i_interpolated_pcr = -1; p_stream->b_reinit = 0; #undef p_stream } @@ -1089,27 +1208,24 @@ static int Ogg_BeginningOfStream( input_thread_t *p_input, demux_sys_t *p_ogg) /**************************************************************************** * 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 ) +static void Ogg_EndOfStream( demux_t *p_demux ) { - int i_stream, j; + demux_sys_t *p_ogg = p_demux->p_sys ; + int i_stream; #define p_stream p_ogg->pp_stream[i_stream] for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ ) { if( p_stream->p_es ) - es_out_Del( p_input->p_es_out, p_stream->p_es ); + es_out_Del( p_demux->out, p_stream->p_es ); - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.i_mux_rate -= (p_stream->fmt.i_bitrate / ( 8 * 50 )); - vlc_mutex_unlock( &p_input->stream.stream_lock ); + p_ogg->i_bitrate -= p_stream->fmt.i_bitrate; 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( p_ogg->pp_stream[i_stream]->p_headers) + free( p_ogg->pp_stream[i_stream]->p_headers ); + + es_format_Clean( &p_stream->fmt ); free( p_ogg->pp_stream[i_stream] ); } @@ -1121,174 +1237,244 @@ static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg ) p_ogg->i_streams = 0; } -/***************************************************************************** - * Deactivate: frees unused data - *****************************************************************************/ -static void Deactivate( vlc_object_t *p_this ) +static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data ; - - if( p_ogg ) + bs_t bitstream; + int i_fps_numerator; + int i_fps_denominator; + int i_keyframe_frequency_force; + + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' ); + + /* 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; + + /* Cheat and get additionnal info ;) */ + bs_init( &bitstream, p_oggpacket->packet, p_oggpacket->bytes ); + bs_skip( &bitstream, 56 ); + bs_read( &bitstream, 8 ); /* major version num */ + bs_read( &bitstream, 8 ); /* minor version num */ + bs_read( &bitstream, 8 ); /* subminor version num */ + bs_read( &bitstream, 16 ) /*<< 4*/; /* width */ + bs_read( &bitstream, 16 ) /*<< 4*/; /* height */ + bs_read( &bitstream, 24 ); /* frame width */ + bs_read( &bitstream, 24 ); /* frame height */ + bs_read( &bitstream, 8 ); /* x offset */ + bs_read( &bitstream, 8 ); /* y offset */ + + i_fps_numerator = bs_read( &bitstream, 32 ); + i_fps_denominator = bs_read( &bitstream, 32 ); + bs_read( &bitstream, 24 ); /* aspect_numerator */ + bs_read( &bitstream, 24 ); /* aspect_denominator */ + + p_stream->fmt.video.i_frame_rate = i_fps_numerator; + p_stream->fmt.video.i_frame_rate_base = i_fps_denominator; + + bs_read( &bitstream, 8 ); /* colorspace */ + p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 ); + bs_read( &bitstream, 6 ); /* quality */ + + i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 ); + + /* granule_shift = i_log( frequency_force -1 ) */ + p_stream->i_theora_keyframe_granule_shift = 0; + i_keyframe_frequency_force--; + while( i_keyframe_frequency_force ) { - /* Cleanup the bitstream parser */ - ogg_sync_clear( &p_ogg->oy ); + p_stream->i_theora_keyframe_granule_shift++; + i_keyframe_frequency_force >>= 1; + } - Ogg_EndOfStream( p_input, p_ogg ); + p_stream->f_rate = ((float)i_fps_numerator) / i_fps_denominator; +} - free( p_ogg ); - } +static void Ogg_ReadVorbisHeader( logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + oggpack_buffer opb; + + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' ); + + /* 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, p_oggpacket->packet, p_oggpacket->bytes); + oggpack_adv( &opb, 88 ); + p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 ); + 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 ); } -/***************************************************************************** - * Demux: reads and demuxes data packets - ***************************************************************************** - * Returns -1 in case of error, 0 in case of EOF, 1 otherwise - *****************************************************************************/ -static int Demux( input_thread_t * p_input ) +static void Ogg_ReadSpeexHeader( logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) { - demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data; - ogg_page oggpage; - ogg_packet oggpacket; - int i_stream; + oggpack_buffer opb; + + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' ); + + /* 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; + + /* Cheat and get additionnal info ;) */ + oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes); + oggpack_adv( &opb, 224 ); + oggpack_adv( &opb, 32 ); /* speex_version_id */ + oggpack_adv( &opb, 32 ); /* header_size */ + p_stream->f_rate = p_stream->fmt.audio.i_rate = oggpack_read( &opb, 32 ); + oggpack_adv( &opb, 32 ); /* mode */ + oggpack_adv( &opb, 32 ); /* mode_bitstream_version */ + p_stream->fmt.audio.i_channels = oggpack_read( &opb, 32 ); + p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 ); +} -#define p_stream p_ogg->pp_stream[i_stream] +static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + /* Parse the STREAMINFO metadata */ + bs_t s; - if( p_ogg->i_eos == p_ogg->i_streams ) + bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes ); + + bs_read( &s, 1 ); + if( bs_read( &s, 7 ) == 0 ) { - if( p_ogg->i_eos ) + if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ ) { - msg_Dbg( p_input, "end of a group of logical streams" ); - Ogg_EndOfStream( p_input, p_ogg ); - } + 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; - if( Ogg_BeginningOfStream( p_input, p_ogg ) != VLC_SUCCESS ) return 0; - p_ogg->i_eos = 0; - - msg_Dbg( p_input, "beginning of a group of logical streams" ); + 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" ); - p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT; - input_ClockManageRef( p_input, p_input->stream.p_selected_program, 0 ); + /* Fake this as the last metadata block */ + *((uint8_t*)p_oggpacket->packet) |= 0x80; } - - if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) + else { - msg_Warn( p_input, "synchro reinit" ); - - if( p_ogg->i_old_synchro_state != SYNCHRO_REINIT ) - 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->b_reinit = 1; - p_stream->i_pcr = -1; - p_stream->i_interpolated_pcr = -1; - ogg_stream_reset( &p_stream->os ); - } - if( p_ogg->i_old_synchro_state != SYNCHRO_REINIT ) - ogg_sync_reset( &p_ogg->oy ); + /* This ain't a STREAMINFO metadata */ + msg_Dbg( p_demux, "Invalid FLAC STREAMINFO metadata" ); } +} - /* - * Demux an ogg page from the stream - */ - if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS ) +static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, + logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + if( p_oggpacket->bytes >= 28 && + !memcmp( &p_oggpacket->packet[0], "Annodex", 7 ) ) { - return 0; /* EOF */ - } + oggpack_buffer opb; - /* Test for End of Stream */ - if( ogg_page_eos( &oggpage ) ) p_ogg->i_eos++; + uint16_t major_version; + uint16_t minor_version; + uint64_t timebase_numerator; + uint64_t timebase_denominator; + Ogg_ReadTheoraHeader( p_stream, p_oggpacket ); - for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) + oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes); + oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */ + major_version = oggpack_read( &opb, 2*8 ); /* major version */ + minor_version = oggpack_read( &opb, 2*8 ); /* minor version */ + timebase_numerator = GetQWLE( &p_oggpacket->packet[16] ); + timebase_denominator = GetQWLE( &p_oggpacket->packet[24] ); + } + else if( p_oggpacket->bytes >= 42 && + !memcmp( &p_oggpacket->packet[0], "AnxData", 7 ) ) { - if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 ) - continue; + uint64_t granule_rate_numerator; + uint64_t granule_rate_denominator; + char content_type_string[1024]; - while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) - { - 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 ); + /* Read in Annodex header fields */ - if( p_stream->i_pcr >= 0 ) - { - p_stream->b_reinit = 0; - } - else - { - p_stream->i_interpolated_pcr = -1; - continue; - } + granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] ); + granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] ); + p_stream->secondary_header_packets = + GetDWLE( &p_oggpacket->packet[24] ); - /* 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( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) - { - Ogg_DecodePacket( p_input, p_stream, &oggpacket ); - } - else - { - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_stream->i_pcr ); - } - continue; - } - } - - Ogg_DecodePacket( p_input, p_stream, &oggpacket ); + /* we are guaranteed that the first header field will be + * the content-type (by the Annodex standard) */ + content_type_string[0] = '\0'; + if( !strncasecmp( (char*)(&p_oggpacket->packet[28]), "Content-Type: ", 14 ) ) + { + uint8_t *p = memchr( &p_oggpacket->packet[42], '\r', + p_oggpacket->bytes - 1 ); + if( p && p[0] == '\r' && p[1] == '\n' ) + sscanf( (char*)(&p_oggpacket->packet[42]), "%1024s\r\n", + content_type_string ); } - break; - } - i_stream = 0; p_ogg->i_pcr = -1; - for( ; i_stream < p_ogg->i_streams; i_stream++ ) - { - if( p_stream->fmt.i_cat == SPU_ES ) - continue; - if( p_stream->i_interpolated_pcr < 0 ) - continue; + msg_Dbg( p_this, "AnxData packet info: "I64Fd" / "I64Fd", %d, ``%s''", + granule_rate_numerator, granule_rate_denominator, + p_stream->secondary_header_packets, content_type_string ); - 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_ogg->i_pcr >= 0 ) - { - input_ClockManageRef( p_input, p_input->stream.p_selected_program, - p_ogg->i_pcr ); - } - -#undef p_stream + p_stream->f_rate = (float) granule_rate_numerator / + (float) granule_rate_denominator; - p_ogg->i_old_synchro_state = - p_input->stream.p_selected_program->i_synchro_state; + /* 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) ) + { + /* n.b. WAVs are unsupported right now */ + p_stream->fmt.i_cat = UNKNOWN_ES; + } + 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' ); - return 1; -} + 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',' ' ); -/***************************************************************************** - * 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; + 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' ); - 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; + p_stream->b_force_backup = 1; + } + else if( !strncmp(content_type_string, "video/x-xvid", 14) ) + { + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'x','v','i','d' ); - default: - return demux_vaControlDefault( p_input, i_query, args ); + p_stream->b_force_backup = 1; + } + else if( !strncmp(content_type_string, "video/mpeg", 14) ) + { + /* 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' ); + } + 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' ); + } } }