X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fogg.c;h=95bda99d98a98bff7e7373e1b162bae1363dd540;hb=5f2b369ce56dd68a3278022bdc3e97518d140a7e;hp=19dae8ac4443a1ffd912a3c52e3015cabb6483b9;hpb=36ec573e68e53f14cf1d24c62d7c8713dd91f845;p=vlc diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c index 19dae8ac44..95bda99d98 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 @@ -47,7 +49,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); vlc_module_begin(); - set_description( _("Ogg/ogm muxer") ); + set_description( N_("Ogg/OGM muxer") ); set_capability( "sout mux", 10 ); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_MUX ); @@ -66,13 +68,12 @@ 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 */ @@ -136,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++ ) { @@ -147,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; @@ -169,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 { @@ -256,17 +256,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 */ @@ -282,19 +282,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: @@ -369,7 +370,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 ); /* ??? */ @@ -387,7 +388,7 @@ 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; @@ -411,7 +412,7 @@ 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; } @@ -434,7 +435,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, @@ -465,16 +466,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,7 +498,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 && @@ -517,9 +519,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--; } } @@ -582,7 +584,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; @@ -596,7 +598,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 ); @@ -648,7 +650,7 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts ) 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; @@ -729,7 +731,8 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux, mtime_t i_dts ) /* 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; @@ -776,13 +779,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++ ) @@ -884,15 +887,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; } @@ -901,7 +904,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 ); @@ -950,13 +953,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 ) @@ -967,10 +970,10 @@ 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->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 ) @@ -984,7 +987,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) if( p_stream->i_cat == SPU_ES || p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ) { - /* 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 */ p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts ); }