X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=577934ccff6ba45108c991eef80150f2ee499cd5;hb=308153405596f3425c3b611ea7e9e11749f65383;hp=fa6b25167e5036fe3ac3f1267c9d342fa54dac0f;hpb=4ca92c145c57a5c7767ec628f627e9a270c2e79a;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index fa6b25167e..577934ccff 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -1,10 +1,11 @@ /***************************************************************************** * ogg.c : ogg stream demux module for vlc ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN - * $Id: ogg.c,v 1.54 2004/02/06 23:43:32 gbazin 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,45 @@ * * 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 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include #include -#include "codecs.h" -#include "vlc_bits.h" +#include +#include +#include +#include "vorbis.h" + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +vlc_module_begin () + set_shortname ( "OGG" ) + set_description( N_("OGG demuxer" ) ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 50 ) + set_callbacks( Open, Close ) + add_shortcut( "ogg" ) +vlc_module_end () -#define OGG_BLOCK_SIZE 4096 /***************************************************************************** * Definitions of structures and functions used by this plugins @@ -42,18 +67,19 @@ typedef struct logical_stream_s ogg_stream_state os; /* logical stream of packets */ es_format_t fmt; + es_format_t fmt_old; /* format of old ES is reused */ es_out_id_t *p_es; 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 */ @@ -62,8 +88,14 @@ typedef struct logical_stream_s mtime_t i_previous_pcr; /* Misc */ - int b_reinit; - int i_theora_keyframe_granule_shift; + bool b_reinit; + int i_granule_shift; + + /* kate streams have the number of headers in the ID header */ + int i_kate_num_headers; + + /* for Annodex logical bitstreams */ + int i_secondary_header_packets; } logical_stream_t; @@ -74,30 +106,42 @@ struct demux_sys_t int i_streams; /* number of logical bitstreams */ logical_stream_t **pp_stream; /* pointer to an array of logical streams */ + logical_stream_t *p_old_stream; /* pointer to a old logical stream to avoid recreating it */ + /* 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_bos; int i_eos; + + /* bitrate */ + int i_bitrate; + + /* after reading all headers, the first data page is stuffed into the relevant stream, ready to use */ + bool b_page_waiting; + + /* */ + vlc_meta_t *p_meta; }; /* OggDS headers for the new header format (used in ogm files) */ -typedef struct stream_header_video +typedef struct { ogg_int32_t width; ogg_int32_t height; -} stream_header_video; +} stream_header_video_t; -typedef struct stream_header_audio +typedef struct { ogg_int16_t channels; + ogg_int16_t padding; ogg_int16_t blockalign; ogg_int32_t avgbytespersec; -} stream_header_audio; +} stream_header_audio_t; -typedef struct stream_header +typedef struct { char streamtype[8]; char subtype[4]; @@ -110,15 +154,18 @@ typedef struct stream_header ogg_int32_t buffersize; ogg_int16_t bits_per_sample; + ogg_int16_t padding; union { /* Video specific */ - stream_header_video video; + stream_header_video_t video; /* Audio specific */ - stream_header_audio audio; + stream_header_audio_t audio; } sh; -} stream_header; +} stream_header_t; + +#define OGG_BLOCK_SIZE 4096 /* Some defines from OggDS */ #define PACKET_TYPE_HEADER 0x01 @@ -130,74 +177,342 @@ 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( demux_t *p_demux ); +static int Ogg_FindLogicalStreams( demux_t *p_demux ); +static void Ogg_EndOfStream( demux_t *p_demux ); -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 void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream ); +static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream ); + +/* */ +static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers ); + +/* Logical bitstream headers */ +static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadKateHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * ); +static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * ); +static bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * ); /***************************************************************************** - * 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; + 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 ) ); + if( !p_sys ) + return VLC_ENOMEM; + + memset( p_sys, 0, sizeof( demux_sys_t ) ); + p_sys->i_bitrate = 0; + p_sys->pp_stream = NULL; + p_sys->p_old_stream = NULL; + + /* Begnning of stream, tell the demux to look for elementary streams. */ + p_sys->i_bos = 0; + p_sys->i_eos = 0; + + /* Initialize the Ogg physical bitstream parser */ + ogg_sync_init( &p_sys->oy ); + p_sys->b_page_waiting = false; - /* FIXME: Capture pattern might not be enough so we can also check for the - * the first complete page */ + /* */ + p_sys->p_meta = NULL; 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 ); + + if( p_sys->p_old_stream ) + Ogg_LogicalStreamDelete( p_demux, p_sys->p_old_stream ); + + 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" ); + /* We keep the ES to try reusing it in Ogg_BeginningOfStream + * only 1 ES is supported (common case for ogg web radio) */ + if( p_sys->i_streams == 1 ) + { + p_sys->p_old_stream = p_sys->pp_stream[0]; + TAB_CLEAN( p_sys->i_streams, p_sys->pp_stream ); + } + Ogg_EndOfStream( p_demux ); + } + + p_sys->i_eos = 0; + if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS ) + return 0; + + msg_Dbg( p_demux, "beginning of a group of logical streams" ); + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + } + + /* + * The first data page of a physical stream is stored in the relevant logical stream + * in Ogg_FindLogicalStreams. Therefore, we must not read a page and only update the + * stream it belongs to if we haven't processed this first page yet. If we do, we + * will only process that first page whenever we find the second page for this stream. + * While this is fine for Vorbis and Theora, which are continuous codecs, which means + * the second page will arrive real quick, this is not fine for Kate, whose second + * data page will typically arrive much later. + * This means it is now possible to seek right at the start of a stream where the last + * logical stream is Kate, without having to wait for the second data page to unblock + * the first one, which is the one that triggers the 'no more headers to backup' code. + * And, as we all know, seeking without having backed up all headers is bad, since the + * codec will fail to initialize if it's missing its headers. + */ + if( !p_sys->b_page_waiting) + { + /* + * 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 we've just pulled page, look for the right logical stream */ + if( !p_sys->b_page_waiting ) + { + 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->i_secondary_header_packets > 0 ) + { + if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') && + oggpacket.bytes >= 7 && + ! memcmp( oggpacket.packet, "\x80theora", 7 ) ) + { + Ogg_ReadTheoraHeader( p_stream, &oggpacket ); + p_stream->i_secondary_header_packets = 0; + } + else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') && + oggpacket.bytes >= 7 && + ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) ) + { + Ogg_ReadVorbisHeader( p_stream, &oggpacket ); + p_stream->i_secondary_header_packets = 0; + } + else if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) + { + p_stream->i_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 = false; + } + 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 ); + } + + if( !p_sys->b_page_waiting ) + break; + } + + /* if a page was waiting, it's now processed */ + p_sys->b_page_waiting = false; + + p_sys->i_pcr = -1; + for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) + { + logical_stream_t *p_stream = p_sys->pp_stream[i_stream]; + + 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; + vlc_meta_t *p_meta; + int64_t *pi64; + bool *pb_bool; + int i; + + switch( i_query ) + { + case DEMUX_GET_META: + p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* ); + if( p_sys->p_meta ) + vlc_meta_Merge( p_meta, p_sys->p_meta ); + return VLC_SUCCESS; + + case DEMUX_HAS_UNSUPPORTED_META: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; + return VLC_SUCCESS; + + 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: + /* forbid seeking if we haven't initialized all logical bitstreams yet; + if we allowed, some headers would not get backed up and decoder init + would fail, making that logical stream unusable */ + if( p_sys->i_bos > 0 ) + { + return VLC_EGENERIC; + } + + for( i = 0; i < p_sys->i_streams; i++ ) + { + logical_stream_t *p_stream = p_sys->pp_stream[i]; + + /* we'll trash all the data until we find the next pcr */ + p_stream->b_reinit = true; + p_stream->i_pcr = -1; + p_stream->i_interpolated_pcr = -1; + ogg_stream_reset( &p_stream->os ); + } + ogg_sync_reset( &p_sys->oy ); + /* XXX The break/return is missing on purpose as + * demux_vaControlHelper will do the last part of the job */ + + default: + return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate, + 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; @@ -213,19 +528,26 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, /* Convert the granulepos into a pcr */ if( p_oggpacket->granulepos >= 0 ) { - if( p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) ) + if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) || + p_stream->fmt.i_codec == VLC_FOURCC( 'k','a','t','e' ) ) { - p_stream->i_pcr = p_oggpacket->granulepos * 90000 + 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 ) * INT64_C(1000000) / p_stream->f_rate; } + else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) ) + { + ogg_int64_t i_dts = p_oggpacket->granulepos >> 31; + /* NB, OggDirac granulepos values are in units of 2*picturerate */ + p_stream->i_pcr = (i_dts/2) * INT64_C(1000000) / p_stream->f_rate; + } else { - ogg_int64_t iframe = p_oggpacket->granulepos >> - p_stream->i_theora_keyframe_granule_shift; - 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 = p_oggpacket->granulepos * INT64_C(1000000) / p_stream->f_rate; } @@ -239,152 +561,151 @@ 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 += (INT64_C(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 * INT64_C(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; + bool b_selected; int i_header_len = 0; - mtime_t i_pts = 0; + mtime_t i_pts = -1, i_interpolated_pts; + demux_sys_t *p_ogg = p_demux->p_sys; /* 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, "Annodex", 7 ) ) + { + /* it's an Annodex packet -- skip it (do nothing) */ + return; + } + else if( p_oggpacket->bytes >= 7 && + ! memcmp ( p_oggpacket->packet, "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_sav; + bool b_store_size = true; + bool b_store_num_headers = false; + 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 = false; + break; + + case VLC_FOURCC( 'k','a','t','e' ): + if( p_stream->i_packets_backup == 1) + b_store_num_headers = true; + if( p_stream->i_packets_backup == p_stream->i_kate_num_headers ) p_stream->b_force_backup = 0; + 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_sav = p_stream->p_headers, p_stream->i_headers + + p_oggpacket->bytes + (b_store_size ? 2 : 0) + (b_store_num_headers ? 1 : 0) ); + if( p_stream->p_headers ) { - /* 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 ); - } + uint8_t *p_extra = p_stream->p_headers + p_stream->i_headers; - 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 ); - } + if( b_store_num_headers ) + { + /* Kate streams store the number of headers in the first header, + so we can't just test for 3 as Vorbis/Theora */ + *(p_extra++) = p_stream->i_kate_num_headers; + } + if( b_store_size ) + { + *(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) + (b_store_num_headers ? 1 : 0); - /* 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( !p_stream->b_force_backup ) + { + /* Last header received, commit changes */ + free( p_stream->fmt.p_extra ); + + p_stream->fmt.i_extra = p_stream->i_headers; + p_stream->fmt.p_extra = malloc( p_stream->i_headers ); + if( p_stream->fmt.p_extra ) + memcpy( p_stream->fmt.p_extra, p_stream->p_headers, + p_stream->i_headers ); + else + p_stream->fmt.i_extra = 0; - if( b_selected && !p_stream->b_activated ) - { - p_stream->b_activated = VLC_TRUE; + 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 ); - /* 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; + if( p_stream->i_headers > 0 ) + Ogg_ExtractMeta( p_demux, p_stream->fmt.i_codec, + p_stream->p_headers, p_stream->i_headers ); - Ogg_DecodePacket( p_input, p_stream, - &p_stream->p_packets_backup[i] ); + /* we're not at BOS anymore for this logical stream */ + p_ogg->i_bos--; } } + else + { + p_stream->p_headers = p_sav; + } + + b_selected = false; /* Discard the header packet */ } /* Convert the pcr into a pts */ @@ -397,79 +718,94 @@ 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 ); - p_stream->i_previous_pcr = p_stream->i_pcr; + /* Call the pace control */ + es_out_Control( p_demux->out, ES_OUT_SET_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 ); + p_stream->i_previous_pcr = p_stream->i_pcr; /* The granulepos is the end date of the sample */ - i_pts = input_ClockGetTS( p_input, - p_input->stream.p_selected_program, - p_stream->i_pcr ); + 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 ); - if( p_stream->i_pcr >= 0 ) + /* SPU streams are typically discontinuous, do not mind large gaps */ + if( p_stream->fmt.i_cat != SPU_ES ) { - /* This is for streams where the granulepos of the header packets - * doesn't match these of the data packets (eg. ogg web radios). */ - if( p_stream->i_previous_pcr == 0 && - p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY * 9/100 ) - p_input->stream.p_selected_program->i_synchro_state = - SYNCHRO_REINIT; - - /* 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 ); + 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 ) + { + 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 ); + } + } } - if( !p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) && - !p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) && - !p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) && + if( p_stream->fmt.i_codec != VLC_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 = 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; + else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) ) + { + ogg_int64_t dts = p_oggpacket->granulepos >> 31; + ogg_int64_t delay = (p_oggpacket->granulepos >> 9) & 0x1fff; + + uint64_t u_pnum = dts + delay; + + p_block->i_dts = p_stream->i_pcr; + p_block->i_pts = 0; + /* NB, OggDirac granulepos values are in units of 2*picturerate */ + if( -1 != p_oggpacket->granulepos ) + p_block->i_pts = u_pnum * INT64_C(1000000) / p_stream->f_rate / 2; + } else { p_block->i_dts = i_pts; @@ -480,20 +816,49 @@ 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' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 'd','r','a','c' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 'k','a','t','e' ) ) { - /* 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 >= (unsigned int)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, "tarkin pts: "I64Fd", granule: "I64Fd, + msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64, p_block->i_pts, p_block->i_dts ); msleep(10000); } @@ -501,7 +866,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 ); } /**************************************************************************** @@ -514,15 +879,14 @@ 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 ) ) { @@ -531,27 +895,31 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) * We found the beginning of our first logical stream. */ while( ogg_page_bos( &oggpage ) ) { - p_ogg->i_streams++; - p_ogg->pp_stream = - realloc( p_ogg->pp_stream, p_ogg->i_streams * - sizeof(logical_stream_t *) ); + logical_stream_t *p_stream; p_stream = malloc( sizeof(logical_stream_t) ); + if( !p_stream ) + return VLC_ENOMEM; + + TAB_APPEND( p_ogg->i_streams, p_ogg->pp_stream, p_stream ); + memset( p_stream, 0, sizeof(logical_stream_t) ); + p_stream->p_headers = 0; + p_stream->i_secondary_header_packets = 0; es_format_Init( &p_stream->fmt, 0, 0 ); - p_stream->b_activated = VLC_TRUE; + es_format_Init( &p_stream->fmt_old, 0, 0 ); /* Setup the logical stream */ p_stream->i_serial_no = ogg_page_serialno( &oggpage ); ogg_stream_init( &p_stream->os, p_stream->i_serial_no ); /* Extract the initial header from the first page and verify - * the codec type of tis Ogg bitstream */ + * the codec type of this Ogg bitstream */ 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; } @@ -561,64 +929,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, "\x01vorbis", 7 ) ) { - 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 ) ) + else if( oggpacket.bytes >= 5 && + ! memcmp( oggpacket.packet, "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, "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!!! @@ -628,74 +958,55 @@ 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, "\x80theora", 7 ) ) + { + 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 Dirac header */ + else if( oggpacket.bytes >= 5 && + ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) + { + if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) ) + msg_Dbg( p_demux, "found dirac header" ); + else + { + msg_Warn( p_demux, "found dirac header isn't decodable" ); + free( p_stream ); + p_ogg->i_streams--; + } } /* Check for Tarkin header */ else if( oggpacket.bytes >= 7 && - ! 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' ); @@ -705,12 +1016,36 @@ 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, "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, "AnxData", 7 ) ) + { + Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, + &oggpacket ); + } + /* Check for Kate header */ + else if( oggpacket.bytes >= 8 && + ! memcmp( &oggpacket.packet[1], "kate\0\0\0", 7 ) ) + { + Ogg_ReadKateHeader( p_stream, &oggpacket ); + msg_Dbg( p_demux, "found kate header" ); + } else if( oggpacket.bytes >= 142 && - !strncmp( &oggpacket.packet[1], + !memcmp( &oggpacket.packet[1], "Direct Show Samples embedded in Ogg", 35 )) { /* Old header type */ @@ -725,9 +1060,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 = @@ -740,7 +1078,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, @@ -757,12 +1095,15 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) p_stream->fmt.i_cat = AUDIO_ES; i_extra_size = GetWLE((oggpacket.packet+140)); - if( i_extra_size ) + if( i_extra_size > 0 && i_extra_size < oggpacket.bytes - 142 ) { p_stream->fmt.i_extra = i_extra_size; p_stream->fmt.p_extra = malloc( i_extra_size ); - memcpy( p_stream->fmt.p_extra, - oggpacket.packet + 142, i_extra_size ); + if( p_stream->fmt.p_extra ) + memcpy( p_stream->fmt.p_extra, + oggpacket.packet + 142, i_extra_size ); + else + p_stream->fmt.i_extra = 0; } i_format_tag = GetWLE((oggpacket.packet+124)); @@ -777,38 +1118,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, @@ -819,21 +1142,33 @@ 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--; } } - else if( (*oggpacket.packet & PACKET_TYPE_BITS ) - == PACKET_TYPE_HEADER && - oggpacket.bytes >= (int)sizeof(stream_header)+1 ) + else if( (*oggpacket.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER && + oggpacket.bytes >= 56+1 ) { - stream_header *st = (stream_header *)(oggpacket.packet+1); + stream_header_t tmp; + stream_header_t *st = &tmp; + + memcpy( st->streamtype, &oggpacket.packet[1+0], 8 ); + memcpy( st->subtype, &oggpacket.packet[1+8], 4 ); + st->size = GetDWLE( &oggpacket.packet[1+12] ); + st->time_unit = GetQWLE( &oggpacket.packet[1+16] ); + st->samples_per_unit = GetQWLE( &oggpacket.packet[1+24] ); + st->default_len = GetDWLE( &oggpacket.packet[1+32] ); + st->buffersize = GetDWLE( &oggpacket.packet[1+36] ); + st->bits_per_sample = GetWLE( &oggpacket.packet[1+40] ); // (padding 2) /* Check for video header (new format) */ if( !strncmp( st->streamtype, "video", 5 ) ) { + st->sh.video.width = GetDWLE( &oggpacket.packet[1+44] ); + st->sh.video.height = GetDWLE( &oggpacket.packet[1+48] ); + p_stream->fmt.i_cat = VIDEO_ES; /* We need to get rid of the header packet */ @@ -842,19 +1177,19 @@ 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->f_rate = 10000000.0 / - GetQWLE(&st->time_unit); - p_stream->fmt.video.i_bits_per_pixel = - GetWLE(&st->bits_per_sample); - p_stream->fmt.video.i_width = - GetDWLE(&st->sh.video.width); - p_stream->fmt.video.i_height = - GetDWLE(&st->sh.video.height); + p_stream->fmt.video.i_frame_rate = 10000000; + p_stream->fmt.video.i_frame_rate_base = st->time_unit; + if( st->time_unit <= 0 ) + st->time_unit = 400000; + p_stream->f_rate = 10000000.0 / st->time_unit; + p_stream->fmt.video.i_bits_per_pixel = st->bits_per_sample; + p_stream->fmt.video.i_width = st->sh.video.width; + p_stream->fmt.video.i_height = st->sh.video.height; - msg_Dbg( p_input, + msg_Dbg( p_demux, "fps: %f, width:%i; height:%i, bitcount:%i", p_stream->f_rate, p_stream->fmt.video.i_width, @@ -865,59 +1200,57 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) else if( !strncmp( st->streamtype, "audio", 5 ) ) { char p_buffer[5]; + unsigned int i_extra_size; int i_format_tag; + st->sh.audio.channels = GetWLE( &oggpacket.packet[1+44] ); + st->sh.audio.blockalign = GetWLE( &oggpacket.packet[1+48] ); + st->sh.audio.avgbytespersec = GetDWLE( &oggpacket.packet[1+52] ); + p_stream->fmt.i_cat = AUDIO_ES; /* We need to get rid of the header packet */ ogg_stream_packetout( &p_stream->os, &oggpacket ); + i_extra_size = st->size - 56; + + if( i_extra_size > 0 && + i_extra_size < oggpacket.bytes - 1 - 56 ) + { + p_stream->fmt.i_extra = i_extra_size; + p_stream->fmt.p_extra = malloc( p_stream->fmt.i_extra ); + if( p_stream->fmt.p_extra ) + memcpy( p_stream->fmt.p_extra, st + 1, + p_stream->fmt.i_extra ); + else + p_stream->fmt.i_extra = 0; + } + memcpy( p_buffer, st->subtype, 4 ); p_buffer[4] = '\0'; i_format_tag = strtol(p_buffer,NULL,16); - p_stream->fmt.audio.i_channels = - GetWLE(&st->sh.audio.channels); - p_stream->f_rate = p_stream->fmt.audio.i_rate = - GetQWLE(&st->samples_per_unit); - p_stream->fmt.i_bitrate = - GetDWLE(&st->sh.audio.avgbytespersec) * 8; - p_stream->fmt.audio.i_blockalign = - GetWLE(&st->sh.audio.blockalign); - p_stream->fmt.audio.i_bitspersample = - GetWLE(&st->bits_per_sample); - - switch( i_format_tag ) + p_stream->fmt.audio.i_channels = st->sh.audio.channels; + if( st->time_unit <= 0 ) + st->time_unit = 10000000; + p_stream->f_rate = p_stream->fmt.audio.i_rate = st->samples_per_unit * 10000000 / st->time_unit; + p_stream->fmt.i_bitrate = st->sh.audio.avgbytespersec * 8; + p_stream->fmt.audio.i_blockalign = st->sh.audio.blockalign; + p_stream->fmt.audio.i_bitspersample = st->bits_per_sample; + + wf_tag_to_fourcc( i_format_tag, + &p_stream->fmt.i_codec, 0 ); + + 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, @@ -931,31 +1264,50 @@ 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 */ + p_stream->f_rate = 1000; /* granulepos is in millisec */ } 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--; } } + else if( oggpacket.bytes >= 7 && + ! memcmp( oggpacket.packet, "fishead", 7 ) ) + + { + /* Skeleton */ + msg_Dbg( p_demux, "stream %d is a skeleton", + p_ogg->i_streams-1 ); + /* FIXME: https://trac.videolan.org/vlc/ticket/1412 */ + } 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; } + /* 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. */ @@ -964,6 +1316,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os, &oggpage ) == 0 ) { + p_ogg->b_page_waiting = true; break; } } @@ -971,324 +1324,629 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) return VLC_SUCCESS; } } -#undef p_stream 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 ; + logical_stream_t *p_old_stream = p_ogg->p_old_stream; 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 ); + logical_stream_t *p_stream = p_ogg->pp_stream[i_stream]; + + p_stream->p_es = 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 ); - 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_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_FOURCC( 'm', 'p', 'g', 'a' ) || + p_stream->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', ' ' ) ) + p_stream->fmt.b_packetized = false; + + p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt ); + } + + // TODO: something to do here ? + if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) + { + /* 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 = p_stream->i_interpolated_pcr = -1; - p_stream->b_reinit = 0; -#undef p_stream + p_stream->b_reinit = false; } + if( p_ogg->p_old_stream ) + { + if( p_ogg->p_old_stream->p_es ) + msg_Dbg( p_demux, "old stream not reused" ); + Ogg_LogicalStreamDelete( p_demux, p_ogg->p_old_stream ); + p_ogg->p_old_stream = NULL; + } return VLC_SUCCESS; } /**************************************************************************** * 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++ ) + Ogg_LogicalStreamDelete( p_demux, p_ogg->pp_stream[i_stream] ); + free( p_ogg->pp_stream ); + + /* Reinit p_ogg */ + p_ogg->i_bitrate = 0; + p_ogg->i_streams = 0; + p_ogg->pp_stream = NULL; + + /* */ + if( p_ogg->p_meta ) + vlc_meta_Delete( p_ogg->p_meta ); + p_ogg->p_meta = NULL; +} + +/** + * This function delete and release all data associated to a logical_stream_t + */ +static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream ) +{ + if( p_stream->p_es ) + es_out_Del( p_demux->out, p_stream->p_es ); + + ogg_stream_clear( &p_stream->os ); + free( p_stream->p_headers ); + + es_format_Clean( &p_stream->fmt_old ); + es_format_Clean( &p_stream->fmt ); + + free( p_stream ); +} +/** + * This function check if a we need to reset a decoder in case we are + * reusing an old ES + */ +static bool Ogg_IsVorbisFormatCompatible( const es_format_t *p_new, const es_format_t *p_old ) +{ + int i_new = 0; + int i_old = 0; + int i; + + for( i = 0; i < 3; i++ ) { - if( p_stream->p_es ) - es_out_Del( p_input->p_es_out, p_stream->p_es ); + const uint8_t *p_new_extra = ( const uint8_t*)p_new->p_extra + i_new; + const uint8_t *p_old_extra = ( const uint8_t*)p_old->p_extra + i_old; - 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_new->i_extra < i_new+2 || p_old->i_extra < i_old+2 ) + return false; - ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os ); - for( j = 0; j < p_ogg->pp_stream[i_stream]->i_packets_backup; j++ ) + const int i_new_size = GetWBE( &p_new_extra[0] ); + const int i_old_size = GetWBE( &p_old_extra[0] ); + + if( i != 1 ) /* Ignore vorbis comment */ { - free( p_ogg->pp_stream[i_stream]->p_packets_backup[j].packet ); + if( i_new_size != i_old_size ) + return false; + if( memcmp( &p_new_extra[2], &p_old_extra[2], i_new_size ) ) + return false; } - if( p_ogg->pp_stream[i_stream]->p_packets_backup) - free( p_ogg->pp_stream[i_stream]->p_packets_backup ); - free( p_ogg->pp_stream[i_stream] ); + i_new += 2 + i_new_size; + i_old += 2 + i_old_size; } -#undef p_stream + return true; +} +static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream ) +{ + bool b_compatible = false; + if( !p_stream->fmt_old.i_cat || !p_stream->fmt_old.i_codec ) + return true; - /* Reinit p_ogg */ - if( p_ogg->pp_stream ) free( p_ogg->pp_stream ); - p_ogg->pp_stream = NULL; - p_ogg->i_streams = 0; + /* Only vorbis is supported */ + if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ) + b_compatible = Ogg_IsVorbisFormatCompatible( &p_stream->fmt, &p_stream->fmt_old ); + + if( !b_compatible ) + msg_Warn( p_demux, "cannot reuse old stream, resetting the decoder" ); + + return !b_compatible; } +static void Ogg_ExtractXiphMeta( demux_t *p_demux, const uint8_t *p_headers, int i_headers, int i_skip ) +{ + demux_sys_t *p_ogg = p_demux->p_sys; -/***************************************************************************** - * Deactivate: frees unused data - *****************************************************************************/ -static void Deactivate( vlc_object_t *p_this ) + if( i_headers <= 2 ) + return; + + /* Skip first packet */ + const int i_tmp = GetWBE( &p_headers[0] ); + if( i_tmp > i_headers-2 ) + return; + p_headers += 2 + i_tmp; + i_headers -= 2 + i_tmp; + + if( i_headers <= 2 ) + return; + + /* */ + int i_comment = GetWBE( &p_headers[0] ); + const uint8_t *p_comment = &p_headers[2]; + if( i_comment > i_headers - 2 ) + return; + + if( i_comment <= i_skip ) + return; + + /* TODO how to handle multiple comments properly ? */ + vorbis_ParseComment( &p_ogg->p_meta, &p_comment[i_skip], i_comment - i_skip ); +} +static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data ; + demux_sys_t *p_ogg = p_demux->p_sys; - if( p_ogg ) + switch( i_codec ) { - /* Cleanup the bitstream parser */ - ogg_sync_clear( &p_ogg->oy ); - - Ogg_EndOfStream( p_input, p_ogg ); + /* 3 headers with the 2° one being the comments */ + case VLC_FOURCC( 'v','o','r','b' ): + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 ); + break; + case VLC_FOURCC( 't','h','e','o' ): + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 ); + break; + case VLC_FOURCC( 's','p','x',' ' ): + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0 ); + break; - free( p_ogg ); + /* TODO */ + case VLC_FOURCC( 'k','a','t','e' ): + case VLC_FOURCC( 'f','l','a','c' ): + case VLC_FOURCC( 'c','m','m','l' ): + msg_Warn( p_demux, "Ogg_ExtractMeta does not support %4.4s", (const char*)&i_codec ); + break; + /* No meta data */ + case VLC_FOURCC( 'd','r','a','c' ): + default: + break; } + if( p_ogg->p_meta ) + p_demux->info.i_update |= INPUT_UPDATE_META; } -/***************************************************************************** - * 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_ReadTheoraHeader( 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; + 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_granule_shift = 0; + i_keyframe_frequency_force--; + while( i_keyframe_frequency_force ) + { + p_stream->i_granule_shift++; + i_keyframe_frequency_force >>= 1; + } -#define p_stream p_ogg->pp_stream[i_stream] + p_stream->f_rate = ((float)i_fps_numerator) / i_fps_denominator; +} - if( p_ogg->i_eos == p_ogg->i_streams ) - { - if( p_ogg->i_eos ) - { - msg_Dbg( p_input, "end of a group of logical streams" ); - Ogg_EndOfStream( p_input, 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 ); +} - if( Ogg_BeginningOfStream( p_input, p_ogg ) != VLC_SUCCESS ) return 0; - p_ogg->i_eos = 0; +static void Ogg_ReadSpeexHeader( 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( '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 ); +} - msg_Dbg( p_input, "beginning of a group of logical streams" ); +static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + /* Parse the STREAMINFO metadata */ + bs_t s; - p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT; - input_ClockManageRef( p_input, p_input->stream.p_selected_program, 0 ); - } + bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes ); - if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) + bs_read( &s, 1 ); + if( bs_read( &s, 7 ) == 0 ) { - msg_Warn( p_input, "synchro reinit" ); + 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; - if( p_ogg->i_old_synchro_state != SYNCHRO_REINIT ) - for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) + msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i", + p_stream->fmt.audio.i_channels, (int)p_stream->f_rate ); + } + else { - /* 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 ); + msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" ); } - if( p_ogg->i_old_synchro_state != SYNCHRO_REINIT ) - ogg_sync_reset( &p_ogg->oy ); + + /* Fake this as the last metadata block */ + *((uint8_t*)p_oggpacket->packet) |= 0x80; } + else + { + /* 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_ReadKateHeader( logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + oggpack_buffer opb; + int32_t gnum; + int32_t gden; + int n; + + p_stream->fmt.i_cat = SPU_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'k','a','t','e' ); + + /* Signal that we want to keep a backup of the kate + * stream headers. They will be used when switching between + * kate streams. */ + p_stream->b_force_backup = 1; + + /* Cheat and get additionnal info ;) */ + oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes); + oggpack_adv( &opb, 11*8 ); /* packet type, kate magic, version */ + p_stream->i_kate_num_headers = oggpack_read( &opb, 8 ); + oggpack_adv( &opb, 3*8 ); + p_stream->i_granule_shift = oggpack_read( &opb, 8 ); + oggpack_adv( &opb, 8*8 ); /* reserved */ + gnum = oggpack_read( &opb, 32 ); + gden = oggpack_read( &opb, 32 ); + p_stream->f_rate = (double)gnum/gden; + + p_stream->fmt.psz_language = malloc(16); + if( p_stream->fmt.psz_language ) + { + for( n = 0; n < 16; ++n ) + p_stream->fmt.psz_language[n] = oggpack_read(&opb,8); + p_stream->fmt.psz_language[15] = 0; /* just in case */ + } + else { - return 0; /* EOF */ + for( n = 0; n < 16; ++n ) + oggpack_read(&opb,8); } + p_stream->fmt.psz_description = malloc(16); + if( p_stream->fmt.psz_description ) + { + for( n = 0; n < 16; ++n ) + p_stream->fmt.psz_description[n] = oggpack_read(&opb,8); + p_stream->fmt.psz_description[15] = 0; /* just in case */ + } + else + { + for( n = 0; n < 16; ++n ) + oggpack_read(&opb,8); + } +} + +static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, + logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + if( p_oggpacket->bytes >= 28 && + !memcmp( p_oggpacket->packet, "Annodex", 7 ) ) + { + 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, "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 ) + /* Read in Annodex header fields */ + + granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] ); + granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] ); + p_stream->i_secondary_header_packets = + GetDWLE( &p_oggpacket->packet[24] ); + + /* 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 ) ) { - 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 ); + 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 ); + } - if( p_stream->i_pcr >= 0 ) - { - p_stream->b_reinit = 0; - } - else - { - p_stream->i_interpolated_pcr = -1; - continue; - } + msg_Dbg( p_this, "AnxData packet info: %"PRId64" / %"PRId64", %d, ``%s''", + granule_rate_numerator, granule_rate_denominator, + p_stream->i_secondary_header_packets, content_type_string ); - /* 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; - } - } + p_stream->f_rate = (float) granule_rate_numerator / + (float) granule_rate_denominator; - Ogg_DecodePacket( p_input, p_stream, &oggpacket ); + /* 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; } - break; - } + 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' ); - 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; + p_stream->b_force_backup = 1; + } + else if( !strncmp(content_type_string, "audio/x-speex", 14) ) + { + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' ); + + p_stream->b_force_backup = 1; + } + else if( !strncmp(content_type_string, "video/x-theora", 14) ) + { + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' ); + + p_stream->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' ); - if( p_ogg->i_pcr < 0 || p_stream->i_interpolated_pcr < p_ogg->i_pcr ) - p_ogg->i_pcr = p_stream->i_interpolated_pcr; + 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' ); + } } +} + +static uint32_t dirac_uint( bs_t *p_bs ) +{ + uint32_t u_count = 0, u_value = 0; - if( p_ogg->i_pcr >= 0 ) + while( !bs_eof( p_bs ) && !bs_read( p_bs, 1 ) ) { - input_ClockManageRef( p_input, p_input->stream.p_selected_program, - p_ogg->i_pcr ); + u_count++; + u_value <<= 1; + u_value |= bs_read( p_bs, 1 ); } -#undef p_stream - - p_ogg->i_old_synchro_state = - p_input->stream.p_selected_program->i_synchro_state; + return (1<p_demux_data; - int64_t *pi64; + static const struct { + uint32_t u_n /* numerator */, u_d /* denominator */; + } p_dirac_frate_tbl[] = { /* table 10.3 */ + {1,1}, /* this first value is never used */ + {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1}, + {50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2}, + }; + static const size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl); + + static const uint32_t pu_dirac_vidfmt_frate[] = { /* table C.1 */ + 1, 9, 10, 9, 10, 9, 10, 4, 3, 7, 6, 4, 3, 7, 6, 2, 2, 7, 6, 7, 6, + }; + static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate); + + bs_t bs; + + p_stream->i_granule_shift = 22; /* not 32 */ + + /* Backing up stream headers is not required -- seqhdrs are repeated + * thoughout the stream at suitable decoding start points */ + p_stream->b_force_backup = 0; + + /* read in useful bits from sequence header */ + bs_init( &bs, p_oggpacket->packet, p_oggpacket->bytes ); + bs_skip( &bs, 13*8); /* parse_info_header */ + dirac_uint( &bs ); /* major_version */ + dirac_uint( &bs ); /* minor_version */ + dirac_uint( &bs ); /* profile */ + dirac_uint( &bs ); /* level */ + + uint32_t u_video_format = dirac_uint( &bs ); /* index */ + if( u_video_format >= u_dirac_vidfmt_frate ) + { + /* don't know how to parse this ogg dirac stream */ + return false; + } - switch( i_query ) + if( dirac_bool( &bs ) ) { - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = p_ogg->i_pcr * 100 / 9; - return VLC_SUCCESS; + dirac_uint( &bs ); /* frame_width */ + dirac_uint( &bs ); /* frame_height */ + } - default: - return demux_vaControlDefault( p_input, i_query, args ); + if( dirac_bool( &bs ) ) + { + dirac_uint( &bs ); /* chroma_format */ + } + + if( dirac_bool( &bs ) ) + { + dirac_uint( &bs ); /* scan_format */ } + + uint32_t u_n = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_n; + uint32_t u_d = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_d; + if( dirac_bool( &bs ) ) + { + uint32_t u_frame_rate_index = dirac_uint( &bs ); + if( u_frame_rate_index >= u_dirac_frate_tbl ) + { + /* something is wrong with this stream */ + return false; + } + u_n = p_dirac_frate_tbl[u_frame_rate_index].u_n; + u_d = p_dirac_frate_tbl[u_frame_rate_index].u_d; + if( u_frame_rate_index == 0 ) + { + u_n = dirac_uint( &bs ); /* frame_rate_numerator */ + u_d = dirac_uint( &bs ); /* frame_rate_denominator */ + } + } + p_stream->f_rate = (float) u_n / u_d; + + /* probably is an ogg dirac es */ + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'd','r','a','c' ); + + return true; }