X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fogg.c;h=b767ed634e6fe9f2657bb896331bb2a81ba98523;hb=0db07ccfec2855e54fc4b87475165f28d577e065;hp=a00daba177eea0e9f9b4bec26c9ebdcaae4ed35a;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c index a00daba177..b767ed634e 100644 --- a/modules/mux/ogg.c +++ b/modules/mux/ogg.c @@ -25,14 +25,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include #ifdef HAVE_TIME_H # include #endif -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include @@ -45,15 +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 ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_MUX ); - 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 () /***************************************************************************** @@ -65,8 +68,8 @@ 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 @@ -134,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++ ) { @@ -145,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; @@ -167,7 +169,7 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts ) } /***************************************************************************** - * Definitions of structures and functions used by this plugins + * Definitions of structures and functions used by this plugins *****************************************************************************/ typedef struct { @@ -181,6 +183,8 @@ 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 */ + uint64_t u_last_granulepos; /* Used for correct EOS page */ ogg_stream_state os; oggds_header_t *p_oggds_header; @@ -216,6 +220,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; @@ -254,7 +260,7 @@ 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++ ) @@ -280,19 +286,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: @@ -315,7 +322,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; @@ -345,9 +354,12 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) case VLC_FOURCC( 'W', 'M', 'V', '2' ): case VLC_FOURCC( 'W', 'M', 'V', '3' ): case VLC_FOURCC( 'S', 'N', 'O', 'W' ): - case VLC_FOURCC( 'd', 'r', 'a', 'c' ): - p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) ); - memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) ); + p_stream->p_oggds_header = calloc( 1, sizeof(oggds_header_t) ); + if( !p_stream->p_oggds_header ) + { + free( p_stream ); + return VLC_ENOMEM; + } p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER; memcpy( p_stream->p_oggds_header->stream_type, "video", 5 ); @@ -367,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 ); /* ??? */ @@ -380,6 +392,10 @@ 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; @@ -415,6 +431,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) 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; @@ -432,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, @@ -454,8 +475,12 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) switch( p_stream->i_fourcc ) { case VLC_FOURCC( 's', 'u','b', 't' ): - p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) ); - memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) ); + p_stream->p_oggds_header = calloc( 1, sizeof(oggds_header_t) ); + if( !p_stream->p_oggds_header ) + { + free( p_stream ); + return VLC_ENOMEM; + } p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER; memcpy( p_stream->p_oggds_header->stream_type, "text", 4 ); @@ -472,7 +497,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) return VLC_EGENERIC; } - p_stream->b_new = VLC_TRUE; + p_stream->b_new = true; p_sys->i_add_streams++; @@ -495,7 +520,8 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) { if( !p_stream->b_new ) { - while( p_input->p_fifo->i_depth ) MuxBlock( p_mux, p_input ); + while( block_FifoCount( p_input->p_fifo ) ) + MuxBlock( p_mux, p_input ); } if( !p_stream->b_new && @@ -533,6 +559,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; @@ -558,6 +585,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; @@ -580,7 +608,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; @@ -594,7 +622,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 ); @@ -643,6 +671,17 @@ 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) */ @@ -720,7 +759,8 @@ 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; @@ -775,13 +815,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++ ) @@ -810,7 +850,7 @@ static block_t *OggCreateFooter( sout_mux_t *p_mux, mtime_t i_dts ) op.bytes = 0; op.b_o_s = 0; op.e_o_s = 1; - op.granulepos = -1; + op.granulepos = p_stream->u_last_granulepos; op.packetno = p_stream->i_packet_no++; ogg_stream_packetin( &p_stream->os, &op ); @@ -825,7 +865,7 @@ static block_t *OggCreateFooter( sout_mux_t *p_mux, mtime_t i_dts ) op.bytes = 0; op.b_o_s = 0; op.e_o_s = 1; - op.granulepos = -1; + op.granulepos = p_sys->pp_del_streams[i]->u_last_granulepos; op.packetno = p_sys->pp_del_streams[i]->i_packet_no++; ogg_stream_packetin( &p_sys->pp_del_streams[i]->os, &op ); @@ -847,6 +887,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 ) @@ -883,7 +926,7 @@ 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++ ) @@ -900,7 +943,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 ); @@ -928,7 +971,8 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) 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( '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 @@ -949,13 +993,13 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) /* 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 / I64C(1000000); + (mtime_t)p_input->p_fmt->audio.i_rate / INT64_C(1000000); } else if( p_stream->p_oggds_header ) { /* 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 / I64C(1000000); + p_stream->p_oggds_header->i_samples_per_unit / INT64_C(1000000); } } else if( p_stream->i_cat == VIDEO_ES ) @@ -966,25 +1010,46 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) 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 / - I64C(1000000) ) << p_stream->i_keyframe_granule_shift; + INT64_C(1000000) ) << p_stream->i_keyframe_granule_shift; + } + else if( p_stream->i_fourcc == VLC_FOURCC( 'd', 'r', 'a', 'c' ) ) + { + 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 ) * I64C(10) / + 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 milisec */ + /* granulepos is in millisec */ op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) / 1000; } + p_stream->u_last_granulepos = op.granulepos; ogg_stream_packetin( &p_stream->os, &op ); if( p_stream->i_cat == SPU_ES || - p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ) + 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 + /* 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