X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fogg.c;h=242a3c762c4d85cdfc1df5d02ea16b5853951103;hb=7c593a9a7f927a9624f1d59d97d98c902b469c1f;hp=42fcefdb19e86a14fb6fb2dbddecdedef0bee9d5;hpb=9870f3d41d373478eb23c6d28fd6b857360b814f;p=vlc diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c index 42fcefdb19..242a3c762c 100644 --- a/modules/mux/ogg.c +++ b/modules/mux/ogg.c @@ -1,7 +1,7 @@ /***************************************************************************** * ogg.c: ogg muxer module for vlc ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN + * Copyright (C) 2001, 2002, 2006 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -19,24 +19,26 @@ * * 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_TIME_H # include #endif -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "codecs.h" +#include +#include +#include +#include +#include #include @@ -46,13 +48,15 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( _("Ogg/ogm muxer") ); - set_capability( "sout mux", 10 ); - add_shortcut( "ogg" ); - add_shortcut( "ogm" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Ogg/OGM muxer") ) + set_capability( "sout mux", 10 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_MUX ) + add_shortcut( "ogg" ) + add_shortcut( "ogm" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** @@ -62,14 +66,14 @@ static int Control ( sout_mux_t *, int, va_list ); static int AddStream( sout_mux_t *, sout_input_t * ); static int DelStream( sout_mux_t *, sout_input_t * ); static int Mux ( sout_mux_t * ); +static int MuxBlock ( sout_mux_t *, sout_input_t * ); -static block_t *OggCreateHeader( sout_mux_t *, mtime_t ); -static block_t *OggCreateFooter( sout_mux_t *, mtime_t ); +static block_t *OggCreateHeader( sout_mux_t * ); +static block_t *OggCreateFooter( sout_mux_t * ); /***************************************************************************** * Misc declarations *****************************************************************************/ -#define FREE( p ) if( p ) { free( p ); (p) = NULL; } /* Structures used for OggDS headers used in ogm files */ @@ -133,8 +137,7 @@ typedef struct static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts ) { mtime_t i_dts; - int i_stream; - int i; + int i_stream, i; for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ ) { @@ -144,9 +147,9 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts ) /* We don't really need to have anything in the SPU fifo */ if( p_mux->pp_inputs[i]->p_fmt->i_cat == SPU_ES && - p_fifo->i_depth == 0 ) continue; + block_FifoCount( p_fifo ) == 0 ) continue; - if( p_fifo->i_depth ) + if( block_FifoCount( p_fifo ) ) { block_t *p_buf; @@ -160,19 +163,13 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts ) else return -1; } - if( pi_stream ) - { - *pi_stream = i_stream; - } - if( pi_dts ) - { - *pi_dts = i_dts; - } + if( pi_stream ) *pi_stream = i_stream; + if( pi_dts ) *pi_dts = i_dts; return i_stream; } /***************************************************************************** - * Definitions of structures and functions used by this plugins + * Definitions of structures and functions used by this plugins *****************************************************************************/ typedef struct { @@ -186,6 +183,7 @@ typedef struct int i_packet_no; int i_serial_no; int i_keyframe_granule_shift; /* Theora only */ + int i_last_keyframe; /* dirac and eventually theora */ ogg_stream_state os; oggds_header_t *p_oggds_header; @@ -221,6 +219,8 @@ static int Open( vlc_object_t *p_this ) msg_Info( p_mux, "Open" ); p_sys = malloc( sizeof( sout_mux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; p_sys->i_streams = 0; p_sys->i_add_streams = 0; p_sys->i_del_streams = 0; @@ -259,17 +259,17 @@ static void Close( vlc_object_t * p_this ) /* Close the current ogg stream */ msg_Dbg( p_mux, "writing footer" ); - block_ChainAppend( &p_og, OggCreateFooter( p_mux, 0 ) ); + block_ChainAppend( &p_og, OggCreateFooter( p_mux ) ); /* Remove deleted logical streams */ for( i = 0; i < p_sys->i_del_streams; i++ ) { i_dts = p_sys->pp_del_streams[i]->i_dts; ogg_stream_clear( &p_sys->pp_del_streams[i]->os ); - FREE( p_sys->pp_del_streams[i]->p_oggds_header ); - FREE( p_sys->pp_del_streams[i] ); + FREENULL( p_sys->pp_del_streams[i]->p_oggds_header ); + FREENULL( p_sys->pp_del_streams[i] ); } - FREE( p_sys->pp_del_streams ); + FREENULL( p_sys->pp_del_streams ); p_sys->i_streams -= p_sys->i_del_streams; /* Write footer */ @@ -285,19 +285,20 @@ static void Close( vlc_object_t * p_this ) *****************************************************************************/ static int Control( sout_mux_t *p_mux, int i_query, va_list args ) { - vlc_bool_t *pb_bool; + VLC_UNUSED(p_mux); + bool *pb_bool; char **ppsz; switch( i_query ) { case MUX_CAN_ADD_STREAM_WHILE_MUXING: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_TRUE; + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = true; return VLC_SUCCESS; case MUX_GET_ADD_STREAM_WAIT: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_TRUE; + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = true; return VLC_SUCCESS; case MUX_GET_MIME: @@ -320,7 +321,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) msg_Dbg( p_mux, "adding input" ); - p_input->p_sys = p_stream = malloc( sizeof( ogg_stream_t ) ); + p_input->p_sys = p_stream = calloc( 1, sizeof( ogg_stream_t ) ); + if( !p_stream ) + return VLC_ENOMEM; p_stream->i_cat = p_input->p_fmt->i_cat; p_stream->i_fourcc = p_input->p_fmt->i_codec; @@ -351,6 +354,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) case VLC_FOURCC( 'W', 'M', 'V', '3' ): case VLC_FOURCC( 'S', 'N', 'O', 'W' ): p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) ); + if( !p_stream->p_oggds_header ) + { + free( p_stream ); + return VLC_ENOMEM; + } memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) ); p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER; @@ -371,7 +379,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) SetDWLE( &p_stream->p_oggds_header->i_size, sizeof( oggds_header_t ) - 1 ); SetQWLE( &p_stream->p_oggds_header->i_time_unit, - I64C(10000000) * p_input->p_fmt->video.i_frame_rate_base / + INT64_C(10000000) * p_input->p_fmt->video.i_frame_rate_base / (int64_t)p_input->p_fmt->video.i_frame_rate ); SetQWLE( &p_stream->p_oggds_header->i_samples_per_unit, 1 ); SetDWLE( &p_stream->p_oggds_header->i_default_len, 1 ); /* ??? */ @@ -384,12 +392,16 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) msg_Dbg( p_mux, "%4.4s stream", (char *)&p_stream->i_fourcc ); break; + case VLC_FOURCC( 'd', 'r', 'a', 'c' ): + msg_Dbg( p_mux, "dirac stream" ); + break; + case VLC_FOURCC( 't', 'h', 'e', 'o' ): msg_Dbg( p_mux, "theora stream" ); break; default: - FREE( p_input->p_sys ); + FREENULL( p_input->p_sys ); return VLC_EGENERIC; } break; @@ -413,12 +425,17 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) fourcc_to_wf_tag( p_stream->i_fourcc, &i_tag ); if( i_tag == WAVE_FORMAT_UNKNOWN ) { - FREE( p_input->p_sys ); + FREENULL( p_input->p_sys ); return VLC_EGENERIC; } p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) + p_input->p_fmt->i_extra ); + if( !p_stream->p_oggds_header ) + { + free( p_stream ); + return VLC_ENOMEM; + } memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) ); p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER; @@ -436,7 +453,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) memset( p_stream->p_oggds_header->sub_type, 0, 4 ); sprintf( p_stream->p_oggds_header->sub_type, "%-x", i_tag ); - SetQWLE( &p_stream->p_oggds_header->i_time_unit, I64C(10000000) ); + SetQWLE( &p_stream->p_oggds_header->i_time_unit, INT64_C(10000000) ); SetDWLE( &p_stream->p_oggds_header->i_default_len, 1 ); SetDWLE( &p_stream->p_oggds_header->i_buffer_size, 30*1024 ); SetQWLE( &p_stream->p_oggds_header->i_samples_per_unit, @@ -459,6 +476,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) { case VLC_FOURCC( 's', 'u','b', 't' ): p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) ); + if( !p_stream->p_oggds_header ) + { + free( p_stream ); + return VLC_ENOMEM; + } memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) ); p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER; @@ -467,16 +489,16 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) break; default: - FREE( p_input->p_sys ); + FREENULL( p_input->p_sys ); return VLC_EGENERIC; } break; default: - FREE( p_input->p_sys ); + FREENULL( p_input->p_sys ); return VLC_EGENERIC; } - p_stream->b_new = VLC_TRUE; + p_stream->b_new = true; p_sys->i_add_streams++; @@ -497,6 +519,12 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) /* flush all remaining data */ if( p_input->p_sys ) { + if( !p_stream->b_new ) + { + while( block_FifoCount( p_input->p_fifo ) ) + MuxBlock( p_mux, p_input ); + } + if( !p_stream->b_new && ( p_og = OggStreamFlush( p_mux, &p_stream->os, 0 ) ) ) { @@ -514,9 +542,9 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) } else { - /* Wasn't already added so get rid of it */ - FREE( p_stream->p_oggds_header ); - FREE( p_stream ); + /* wasn't already added so get rid of it */ + FREENULL( p_stream->p_oggds_header ); + FREENULL( p_stream ); p_sys->i_add_streams--; } } @@ -532,6 +560,7 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) static block_t *OggStreamFlush( sout_mux_t *p_mux, ogg_stream_state *p_os, mtime_t i_pts ) { + (void)p_mux; block_t *p_og, *p_og_first = NULL; ogg_page og; @@ -557,6 +586,7 @@ static block_t *OggStreamFlush( sout_mux_t *p_mux, static block_t *OggStreamPageOut( sout_mux_t *p_mux, ogg_stream_state *p_os, mtime_t i_pts ) { + (void)p_mux; block_t *p_og, *p_og_first = NULL; ogg_page og; @@ -579,7 +609,7 @@ static block_t *OggStreamPageOut( sout_mux_t *p_mux, return p_og_first; } -static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts ) +static block_t *OggCreateHeader( sout_mux_t *p_mux ) { block_t *p_hdr = NULL; block_t *p_og = NULL; @@ -593,7 +623,7 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts ) { sout_input_t *p_input = p_mux->pp_inputs[i]; ogg_stream_t *p_stream = (ogg_stream_t*)p_input->p_sys; - p_stream->b_new = VLC_FALSE; + p_stream->b_new = false; msg_Dbg( p_mux, "creating header for %4.4s", (char *)&p_stream->i_fourcc ); @@ -642,10 +672,21 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts ) } } } + else if( p_stream->i_fourcc == VLC_FOURCC( 'd', 'r', 'a', 'c' ) ) + { + op.packet = p_input->p_fmt->p_extra; + op.bytes = p_input->p_fmt->i_extra; + op.b_o_s = 1; + op.e_o_s = 0; + op.granulepos = ~0; + op.packetno = p_stream->i_packet_no++; + ogg_stream_packetin( &p_stream->os, &op ); + p_og = OggStreamFlush( p_mux, &p_stream->os, 0 ); + } else if( p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) ) { /* flac stream marker (yeah, only that in the 1st packet) */ - op.packet = "fLaC"; + op.packet = (unsigned char *)"fLaC"; op.bytes = 4; op.b_o_s = 1; op.e_o_s = 0; @@ -719,14 +760,16 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts ) block_ChainAppend( &p_hdr, p_og ); } } - else if( p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) ) + else if( p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) && + p_stream->i_fourcc != VLC_FOURCC( 'd', 'r', 'a', 'c' ) ) { uint8_t com[128]; int i_com; /* comment */ com[0] = PACKET_TYPE_COMMENT; - i_com = snprintf( &com[1], 128, PACKAGE_VERSION" stream output" ) + i_com = snprintf( (char *)(com+1), 127, + PACKAGE_VERSION" stream output" ) + 1; op.packet = com; op.bytes = i_com; @@ -773,13 +816,13 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts ) return p_hdr; } -static block_t *OggCreateFooter( sout_mux_t *p_mux, mtime_t i_dts ) +static block_t *OggCreateFooter( sout_mux_t *p_mux ) { sout_mux_sys_t *p_sys = p_mux->p_sys; block_t *p_hdr = NULL; block_t *p_og; ogg_packet op; - int i; + int i; /* flush all remaining data */ for( i = 0; i < p_mux->i_nb_inputs; i++ ) @@ -845,6 +888,9 @@ static void OggSetDate( block_t *p_og, mtime_t i_dts, mtime_t i_length ) { i_count++; } + + if( i_count == 0 ) return; /* ignore. */ + i_delta = i_length / i_count; for( p_tmp = p_og; p_tmp != NULL; p_tmp = p_tmp->p_next ) @@ -881,15 +927,15 @@ static int Mux( sout_mux_t *p_mux ) int i; msg_Dbg( p_mux, "writing footer" ); - block_ChainAppend( &p_og, OggCreateFooter( p_mux, 0 ) ); + block_ChainAppend( &p_og, OggCreateFooter( p_mux ) ); /* Remove deleted logical streams */ for( i = 0; i < p_sys->i_del_streams; i++ ) { - FREE( p_sys->pp_del_streams[i]->p_oggds_header ); - FREE( p_sys->pp_del_streams[i] ); + FREENULL( p_sys->pp_del_streams[i]->p_oggds_header ); + FREENULL( p_sys->pp_del_streams[i] ); } - FREE( p_sys->pp_del_streams ); + FREENULL( p_sys->pp_del_streams ); p_sys->i_streams = 0; } @@ -898,7 +944,7 @@ static int Mux( sout_mux_t *p_mux ) p_sys->i_streams = p_mux->i_nb_inputs; p_sys->i_del_streams = 0; p_sys->i_add_streams = 0; - block_ChainAppend( &p_og, OggCreateHeader( p_mux, i_dts ) ); + block_ChainAppend( &p_og, OggCreateHeader( p_mux ) ); /* Write header and/or footer */ OggSetDate( p_og, i_dts, 0 ); @@ -908,107 +954,126 @@ static int Mux( sout_mux_t *p_mux ) for( ;; ) { - sout_input_t *p_input; - ogg_stream_t *p_stream; - block_t *p_data; - ogg_packet op; + if( MuxGetStream( p_mux, &i_stream, 0 ) < 0 ) return VLC_SUCCESS; + MuxBlock( p_mux, p_mux->pp_inputs[i_stream] ); + } - if( MuxGetStream( p_mux, &i_stream, &i_dts) < 0 ) - { - return VLC_SUCCESS; - } + return VLC_SUCCESS; +} - p_input = p_mux->pp_inputs[i_stream]; - p_stream = (ogg_stream_t*)p_input->p_sys; - p_data = block_FifoGet( p_input->p_fifo ); +static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) +{ + sout_mux_sys_t *p_sys = p_mux->p_sys; + ogg_stream_t *p_stream = (ogg_stream_t*)p_input->p_sys; + block_t *p_data = block_FifoGet( p_input->p_fifo ); + block_t *p_og = NULL; + ogg_packet op; - if( p_stream->i_fourcc != VLC_FOURCC( 'v', 'o', 'r', 'b' ) && - p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) && - p_stream->i_fourcc != VLC_FOURCC( 's', 'p', 'x', ' ' ) && - p_stream->i_fourcc != VLC_FOURCC( 't', 'h', 'e', 'o' ) ) - { - p_data = block_Realloc( p_data, 1, p_data->i_buffer ); - p_data->p_buffer[0] = PACKET_IS_SYNCPOINT; // FIXME - } + if( p_stream->i_fourcc != VLC_FOURCC( 'v', 'o', 'r', 'b' ) && + p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) && + p_stream->i_fourcc != VLC_FOURCC( 's', 'p', 'x', ' ' ) && + p_stream->i_fourcc != VLC_FOURCC( 't', 'h', 'e', 'o' ) && + p_stream->i_fourcc != VLC_FOURCC( 'd', 'r', 'a', 'c' ) ) + { + p_data = block_Realloc( p_data, 1, p_data->i_buffer ); + p_data->p_buffer[0] = PACKET_IS_SYNCPOINT; // FIXME + } - op.packet = p_data->p_buffer; - op.bytes = p_data->i_buffer; - op.b_o_s = 0; - op.e_o_s = 0; - op.packetno = p_stream->i_packet_no++; + op.packet = p_data->p_buffer; + op.bytes = p_data->i_buffer; + op.b_o_s = 0; + op.e_o_s = 0; + op.packetno = p_stream->i_packet_no++; - if( p_stream->i_cat == AUDIO_ES ) - { - if( p_stream->i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) || - p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) || - p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ) - { - /* number of sample from begining + current packet */ - op.granulepos = - ( i_dts - p_sys->i_start_dts + p_data->i_length ) * - (mtime_t)p_input->p_fmt->audio.i_rate / I64C(1000000); - } - else if( p_stream->p_oggds_header ) - { - /* number of sample from begining */ - op.granulepos = ( i_dts - p_sys->i_start_dts ) * - p_stream->p_oggds_header->i_samples_per_unit / - I64C(1000000); - } - } - else if( p_stream->i_cat == VIDEO_ES ) + if( p_stream->i_cat == AUDIO_ES ) + { + if( p_stream->i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) || + p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) || + p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ) { - if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) ) - { - /* FIXME, we assume only keyframes */ - op.granulepos = ( ( i_dts - p_sys->i_start_dts ) * - p_input->p_fmt->video.i_frame_rate / - p_input->p_fmt->video.i_frame_rate_base / - I64C(1000000) ) << p_stream->i_keyframe_granule_shift; - } - else if( p_stream->p_oggds_header ) - op.granulepos = ( i_dts - p_sys->i_start_dts ) * I64C(10) / - p_stream->p_oggds_header->i_time_unit; + /* number of sample from begining + current packet */ + op.granulepos = + ( p_data->i_dts - p_sys->i_start_dts + p_data->i_length ) * + (mtime_t)p_input->p_fmt->audio.i_rate / INT64_C(1000000); } - else if( p_stream->i_cat == SPU_ES ) + else if( p_stream->p_oggds_header ) { - /* granulepos is in milisec */ - op.granulepos = ( i_dts - p_sys->i_start_dts ) / 1000; + /* number of sample from begining */ + op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) * + p_stream->p_oggds_header->i_samples_per_unit / INT64_C(1000000); } - - ogg_stream_packetin( &p_stream->os, &op ); - - if( p_stream->i_cat == SPU_ES || - p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ) + } + else if( p_stream->i_cat == VIDEO_ES ) + { + if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) ) { - /* Subtitles or Speex packets are quite small so they - * need to be flushed to be sent on time */ - p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts ); + /* FIXME, we assume only keyframes */ + op.granulepos = ( ( p_data->i_dts - p_sys->i_start_dts ) * + p_input->p_fmt->video.i_frame_rate / + p_input->p_fmt->video.i_frame_rate_base / + INT64_C(1000000) ) << p_stream->i_keyframe_granule_shift; } - else + else if( p_stream->i_fourcc == VLC_FOURCC( 'd', 'r', 'a', 'c' ) ) { - p_og = OggStreamPageOut( p_mux, &p_stream->os, p_data->i_dts ); + mtime_t dt = (p_data->i_dts - p_sys->i_start_dts + 1) + * p_input->p_fmt->video.i_frame_rate *2 + / p_input->p_fmt->video.i_frame_rate_base + / INT64_C(1000000); + mtime_t delay = (p_data->i_pts - p_data->i_dts + 1) + * p_input->p_fmt->video.i_frame_rate *2 + / p_input->p_fmt->video.i_frame_rate_base + / INT64_C(1000000); + if( p_data->i_flags & BLOCK_FLAG_TYPE_I ) + p_stream->i_last_keyframe = dt; + mtime_t dist = dt - p_stream->i_last_keyframe; + op.granulepos = dt << 31 | (dist&0xff00) << 14 + | (delay&0x1fff) << 9 | (dist&0xff); } + else if( p_stream->p_oggds_header ) + op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) * INT64_C(10) / + p_stream->p_oggds_header->i_time_unit; + } + else if( p_stream->i_cat == SPU_ES ) + { + /* granulepos is in millisec */ + op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) / 1000; + } - if( p_og ) - { - OggSetDate( p_og, p_stream->i_dts, p_stream->i_length ); - p_stream->i_dts = -1; - p_stream->i_length = 0; + ogg_stream_packetin( &p_stream->os, &op ); - sout_AccessOutWrite( p_mux->p_access, p_og ); - } - else + if( p_stream->i_cat == SPU_ES || + p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) || + p_stream->i_fourcc == VLC_FOURCC( 'd', 'r', 'a', 'c' ) ) + { + /* Subtitles or Speex packets are quite small so they + * need to be flushed to be sent on time */ + /* The OggDirac mapping suggests ever so strongly that a + * page flush occurs after each OggDirac packet, so to make + * the timestamps unambiguous */ + p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts ); + } + else + { + p_og = OggStreamPageOut( p_mux, &p_stream->os, p_data->i_dts ); + } + + if( p_og ) + { + OggSetDate( p_og, p_stream->i_dts, p_stream->i_length ); + p_stream->i_dts = -1; + p_stream->i_length = 0; + + sout_AccessOutWrite( p_mux->p_access, p_og ); + } + else + { + if( p_stream->i_dts < 0 ) { - if( p_stream->i_dts < 0 ) - { - p_stream->i_dts = p_data->i_dts; - } - p_stream->i_length += p_data->i_length; + p_stream->i_dts = p_data->i_dts; } - - block_Release( p_data ); + p_stream->i_length += p_data->i_length; } + block_Release( p_data ); return VLC_SUCCESS; }