X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmp4.c;h=8af05589ec941cae2c4fd24bee7d339b1cb55896;hb=42f0232b694ea4ef13b3ffb68935bf0297c7105b;hp=db3249b9d19421f92102ce4b4cbbe4d00b112f56;hpb=51880eb16eed467a21c34b9e4bb962d1bd6a5be7;p=vlc diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c index db3249b9d1..8af05589ec 100644 --- a/modules/mux/mp4.c +++ b/modules/mux/mp4.c @@ -25,20 +25,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include -#include -#ifdef HAVE_TIME_H #include -#endif -#include "iso_lang.h" -#include "vlc_meta.h" +#include +#include /***************************************************************************** * Module descriptor @@ -54,26 +54,24 @@ static void Close ( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-mp4-" -vlc_module_begin(); - set_description( _("MP4/MOV muxer") ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_MUX ); - set_shortname( "MP4" ); +vlc_module_begin () + set_description( N_("MP4/MOV muxer") ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_MUX ) + set_shortname( "MP4" ) - add_bool( SOUT_CFG_PREFIX "faststart", 1, NULL, + add_bool( SOUT_CFG_PREFIX "faststart", true, NULL, FASTSTART_TEXT, FASTSTART_LONGTEXT, - VLC_TRUE ); - set_capability( "sout mux", 5 ); - add_shortcut( "mp4" ); - add_shortcut( "mov" ); - add_shortcut( "3gp" ); - set_callbacks( Open, Close ); -vlc_module_end(); + true ) + set_capability( "sout mux", 5 ) + add_shortcut( "mp4", "mov", "3gp" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { +static const char *const ppsz_sout_options[] = { "faststart", NULL }; @@ -113,7 +111,7 @@ typedef struct /* for later stco fix-up (fast start files) */ uint64_t i_stco_pos; - vlc_bool_t b_stco64; + bool b_stco64; /* for spu */ int64_t i_last_dts; @@ -122,10 +120,10 @@ typedef struct struct sout_mux_sys_t { - vlc_bool_t b_mov; - vlc_bool_t b_3gp; - vlc_bool_t b_64_ext; - vlc_bool_t b_fast_start; + bool b_mov; + bool b_3gp; + bool b_64_ext; + bool b_fast_start; uint64_t i_mdat_pos; uint64_t i_pos; @@ -138,7 +136,7 @@ struct sout_mux_sys_t typedef struct bo_t { - vlc_bool_t b_grow; + bool b_grow; int i_buffer_size; int i_buffer; @@ -146,7 +144,7 @@ typedef struct bo_t } bo_t; -static void bo_init ( bo_t *, int , uint8_t *, vlc_bool_t ); +static void bo_init ( bo_t *, int , uint8_t *, bool ); static void bo_add_8 ( bo_t *, uint8_t ); static void bo_add_16be ( bo_t *, uint16_t ); static void bo_add_24be ( bo_t *, uint32_t ); @@ -171,8 +169,8 @@ static block_t *bo_to_sout( sout_instance_t *p_sout, bo_t *box ); static bo_t *GetMoovBox( sout_mux_t *p_mux ); -static block_t *ConvertSUBT( sout_mux_t *, mp4_stream_t *, block_t *); -static block_t *ConvertAVC1( sout_mux_t *, mp4_stream_t *, block_t * ); +static block_t *ConvertSUBT( block_t *); +static block_t *ConvertAVC1( block_t * ); /***************************************************************************** * Open: @@ -183,7 +181,7 @@ static int Open( vlc_object_t *p_this ) sout_mux_sys_t *p_sys; bo_t *box; - msg_Dbg( p_mux, "Mp4 muxer opend" ); + msg_Dbg( p_mux, "Mp4 muxer opened" ); config_ChainParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg ); p_mux->pf_control = Control; @@ -191,6 +189,8 @@ static int Open( vlc_object_t *p_this ) p_mux->pf_delstream = DelStream; p_mux->pf_mux = Mux; p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; p_sys->i_pos = 0; p_sys->i_nb_streams = 0; p_sys->pp_streams = NULL; @@ -204,11 +204,13 @@ static int Open( vlc_object_t *p_this ) { /* Now add ftyp header */ box = box_new( "ftyp" ); - if( p_sys->b_3gp ) bo_add_fourcc( box, "3gp4" ); + if( p_sys->b_3gp ) bo_add_fourcc( box, "3gp6" ); else bo_add_fourcc( box, "isom" ); bo_add_32be ( box, 0 ); if( p_sys->b_3gp ) bo_add_fourcc( box, "3gp4" ); else bo_add_fourcc( box, "mp41" ); + bo_add_fourcc( box, "avc1" ); + bo_add_fourcc( box, "qt " ); box_fix( box ); p_sys->i_pos += box->i_buffer; @@ -219,7 +221,7 @@ static int Open( vlc_object_t *p_this ) /* FIXME FIXME * Quicktime actually doesn't like the 64 bits extensions !!! */ - p_sys->b_64_ext = VLC_FALSE; + p_sys->b_64_ext = false; /* Now add mdat header */ box = box_new( "mdat" ); @@ -249,7 +251,7 @@ static void Close( vlc_object_t * p_this ) msg_Dbg( p_mux, "Close" ); /* Update mdat size */ - bo_init( &bo, 0, NULL, VLC_TRUE ); + bo_init( &bo, 0, NULL, true ); if( p_sys->i_pos - p_sys->i_mdat_pos >= (((uint64_t)1)<<32) ) { /* Extended size */ @@ -295,7 +297,7 @@ static void Close( vlc_object_t * p_this ) { msg_Warn( p_this, "read() not supported by access output, " "won't create a fast start file" ); - p_sys->b_fast_start = VLC_FALSE; + p_sys->b_fast_start = false; block_Release( p_buf ); break; } @@ -339,7 +341,7 @@ static void Close( vlc_object_t * p_this ) moov->i_buffer = i_moov_size; i_moov_pos = p_sys->i_mdat_pos; - p_sys->b_fast_start = VLC_FALSE; + p_sys->b_fast_start = false; } /* Write MOOV header */ @@ -364,24 +366,25 @@ 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; - switch( i_query ) - { - case MUX_CAN_ADD_STREAM_WHILE_MUXING: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_FALSE; - return VLC_SUCCESS; + switch( i_query ) + { + case MUX_CAN_ADD_STREAM_WHILE_MUXING: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = false; + return VLC_SUCCESS; - case MUX_GET_ADD_STREAM_WAIT: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_TRUE; - return VLC_SUCCESS; + case MUX_GET_ADD_STREAM_WAIT: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = true; + return VLC_SUCCESS; - case MUX_GET_MIME: /* Not needed, as not streamable */ + case MUX_GET_MIME: /* Not needed, as not streamable */ default: return VLC_EGENERIC; - } + } } /***************************************************************************** @@ -394,22 +397,22 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) switch( p_input->p_fmt->i_codec ) { - case VLC_FOURCC( 'm', 'p', '4', 'a' ): - case VLC_FOURCC( 'm', 'p', '4', 'v' ): - case VLC_FOURCC( 'm', 'p', 'g', 'a' ): - case VLC_FOURCC( 'm', 'p', 'g', 'v' ): - case VLC_FOURCC( 'M', 'J', 'P', 'G' ): - case VLC_FOURCC( 'm', 'j', 'p', 'b' ): - case VLC_FOURCC( 'S', 'V', 'Q', '1' ): - case VLC_FOURCC( 'S', 'V', 'Q', '3' ): - case VLC_FOURCC( 'H', '2', '6', '3' ): - case VLC_FOURCC( 'h', '2', '6', '4' ): - case VLC_FOURCC( 's', 'a', 'm', 'r' ): - case VLC_FOURCC( 's', 'a', 'w', 'b' ): - case VLC_FOURCC( 'Y', 'V', '1', '2' ): - case VLC_FOURCC( 'Y', 'U', 'Y', '2' ): + case VLC_CODEC_MP4A: + case VLC_CODEC_MP4V: + case VLC_CODEC_MPGA: + case VLC_CODEC_MPGV: + case VLC_CODEC_MJPG: + case VLC_CODEC_MJPGB: + case VLC_CODEC_SVQ1: + case VLC_CODEC_SVQ3: + case VLC_CODEC_H263: + case VLC_CODEC_H264: + case VLC_CODEC_AMR_NB: + case VLC_CODEC_AMR_WB: + case VLC_CODEC_YV12: + case VLC_CODEC_YUYV: break; - case VLC_FOURCC( 's', 'u', 'b', 't' ): + case VLC_CODEC_SUBT: msg_Warn( p_mux, "subtitle track added like in .mov (even when creating .mp4)" ); break; default: @@ -419,6 +422,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) } p_stream = malloc( sizeof( mp4_stream_t ) ); + if( !p_stream ) + return VLC_ENOMEM; es_format_Copy( &p_stream->fmt, p_input->p_fmt ); p_stream->i_track_id = p_sys->i_nb_streams + 1; p_stream->i_length_neg = 0; @@ -442,49 +447,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) *****************************************************************************/ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) { + VLC_UNUSED(p_input); msg_Dbg( p_mux, "removing input" ); return VLC_SUCCESS; } -static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts ) -{ - mtime_t i_dts; - int i_stream; - int i; - - for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ ) - { - block_fifo_t *p_fifo = p_mux->pp_inputs[i]->p_fifo; - block_t *p_buf; - - if( p_fifo->i_depth <= 1 ) - { - if( p_mux->pp_inputs[i]->p_fmt->i_cat != SPU_ES ) - { - return -1; // wait that all fifo have at least 2 packets - } - /* For SPU, we wait only 1 packet */ - continue; - } - - p_buf = block_FifoShow( p_fifo ); - if( i_stream < 0 || p_buf->i_dts < i_dts ) - { - i_dts = p_buf->i_dts; - i_stream = i; - } - } - if( pi_stream ) - { - *pi_stream = i_stream; - } - if( pi_dts ) - { - *pi_dts = i_dts; - } - return i_stream; -} - /***************************************************************************** * Mux: *****************************************************************************/ @@ -495,12 +462,12 @@ static int Mux( sout_mux_t *p_mux ) for( ;; ) { sout_input_t *p_input; - int i_stream; mp4_stream_t *p_stream; block_t *p_data; mtime_t i_dts; - if( MuxGetStream( p_mux, &i_stream, &i_dts) < 0 ) + int i_stream = sout_MuxGetStream( p_mux, 2, &i_dts); + if( i_stream < 0 ) { return( VLC_SUCCESS ); } @@ -510,25 +477,25 @@ static int Mux( sout_mux_t *p_mux ) again: p_data = block_FifoGet( p_input->p_fifo ); - if( p_stream->fmt.i_codec == VLC_FOURCC( 'h', '2', '6', '4' ) ) + if( p_stream->fmt.i_codec == VLC_CODEC_H264 ) { - p_data = ConvertAVC1( p_mux, p_stream, p_data ); + p_data = ConvertAVC1( p_data ); } - else if( p_stream->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) ) + else if( p_stream->fmt.i_codec == VLC_CODEC_SUBT ) { - p_data = ConvertSUBT( p_mux, p_stream, p_data ); + p_data = ConvertSUBT( p_data ); } if( p_data == NULL ) goto again; if( p_stream->fmt.i_cat != SPU_ES ) { /* Fix length of the sample */ - if( p_input->p_fifo->i_depth > 0 ) + if( block_FifoCount( p_input->p_fifo ) > 0 ) { block_t *p_next = block_FifoShow( p_input->p_fifo ); int64_t i_diff = p_next->i_dts - p_data->i_dts; - if( i_diff < I64C(1000000 ) ) /* protection */ + if( i_diff < INT64_C(1000000 ) ) /* protection */ { p_data->i_length = i_diff; } @@ -592,13 +559,12 @@ again: if( p_stream->i_entry_count >= p_stream->i_entry_max - 1 ) { p_stream->i_entry_max += 1000; - p_stream->entry = - realloc( p_stream->entry, + p_stream->entry = xrealloc( p_stream->entry, p_stream->i_entry_max * sizeof( mp4_entry_t ) ); } /* update */ - p_stream->i_duration += p_data->i_length; + p_stream->i_duration = p_stream->i_last_dts - p_stream->i_dts_start + p_data->i_length; p_sys->i_pos += p_data->i_buffer; /* Save the DTS */ @@ -651,7 +617,7 @@ again: /***************************************************************************** * *****************************************************************************/ -static block_t *ConvertSUBT( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_block ) +static block_t *ConvertSUBT( block_t *p_block ) { p_block = block_Realloc( p_block, 2, p_block->i_buffer ); @@ -665,7 +631,7 @@ static block_t *ConvertSUBT( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_blo return p_block; } -static block_t *ConvertAVC1( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_block ) +static block_t *ConvertAVC1( block_t *p_block ) { uint8_t *last = p_block->p_buffer; /* Assume it starts with 0x00000001 */ uint8_t *dat = &p_block->p_buffer[4]; @@ -699,7 +665,7 @@ static block_t *ConvertAVC1( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_blo last[2] = ( i_size >> 8 )&0xff; last[3] = ( i_size )&0xff; - /* Skip blocks with SPS/PPS */ + /* Skip blocks with SPS/PPS */ if( (last[4]&0x1f) == 7 || (last[4]&0x1f) == 8 ) { ; // FIXME Find a way to skip dat without frelling everything @@ -738,14 +704,14 @@ static bo_t *GetESDS( mp4_stream_t *p_stream ) i_bitrate_avg += p_stream->entry[i].i_size; if( p_stream->entry[i].i_length > 0) { - int64_t i_bitrate = I64C(8000000) * p_stream->entry[i].i_size / p_stream->entry[i].i_length; + int64_t i_bitrate = INT64_C(8000000) * p_stream->entry[i].i_size / p_stream->entry[i].i_length; if( i_bitrate > i_bitrate_max ) i_bitrate_max = i_bitrate; } } if( p_stream->i_duration > 0 ) - i_bitrate_avg = I64C(8000000) * i_bitrate_avg / p_stream->i_duration; + i_bitrate_avg = INT64_C(8000000) * i_bitrate_avg / p_stream->i_duration; else i_bitrate_avg = 0; if( i_bitrate_max <= 1 ) @@ -776,18 +742,18 @@ static bo_t *GetESDS( mp4_stream_t *p_stream ) switch( p_stream->fmt.i_codec ) { - case VLC_FOURCC( 'm', 'p', '4', 'v' ): + case VLC_CODEC_MP4V: i_object_type_indication = 0x20; break; - case VLC_FOURCC( 'm', 'p', 'g', 'v' ): + case VLC_CODEC_MPGV: /* FIXME MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */ i_object_type_indication = 0x60; break; - case VLC_FOURCC( 'm', 'p', '4', 'a' ): + case VLC_CODEC_MP4A: /* FIXME for mpeg2-aac == 0x66->0x68 */ i_object_type_indication = 0x40; break; - case VLC_FOURCC( 'm', 'p', 'g', 'a' ): + case VLC_CODEC_MPGA: i_object_type_indication = p_stream->fmt.audio.i_rate < 32000 ? 0x69 : 0x6b; break; @@ -869,7 +835,7 @@ static bo_t *GetDamrTag( mp4_stream_t *p_stream ) bo_add_fourcc( damr, "REFC" ); bo_add_8( damr, 0 ); - if( p_stream->fmt.i_codec == VLC_FOURCC( 's', 'a', 'm', 'r' ) ) + if( p_stream->fmt.i_codec == VLC_CODEC_AMR_NB ) bo_add_16be( damr, 0x81ff ); /* Mode set (all modes for AMR_NB) */ else bo_add_16be( damr, 0x83ff ); /* Mode set (all modes for AMR_WB) */ @@ -880,7 +846,7 @@ static bo_t *GetDamrTag( mp4_stream_t *p_stream ) return damr; } -static bo_t *GetD263Tag( mp4_stream_t *p_stream ) +static bo_t *GetD263Tag( void ) { bo_t *d263; @@ -909,43 +875,50 @@ static bo_t *GetAvcCTag( mp4_stream_t *p_stream ) uint8_t *p_buffer = p_stream->fmt.p_extra; int i_buffer = p_stream->fmt.i_extra; - while( i_buffer > 4 && - p_buffer[0] == 0 && p_buffer[1] == 0 && - p_buffer[2] == 0 && p_buffer[3] == 1 ) + while( i_buffer > 3 ) { - const int i_nal_type = p_buffer[4]&0x1f; + /* seek startcode */ + while( p_buffer[0] != 0 || p_buffer[1] != 0 || + p_buffer[2] != 1 ) + { + i_buffer--; + p_buffer++; + } + const int i_nal_type = p_buffer[3]&0x1f; int i_offset = 1; int i_size = 0; int i_startcode = 0; - - //msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type ); - - for( i_offset = 1; i_offset+3 < i_buffer ; i_offset++) + + + for( i_offset = 1; i_offset+2 < i_buffer ; i_offset++) { - if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && - p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 ) + if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && + p_buffer[i_offset+2] == 1 ) { /* we found another startcode */ i_startcode = i_offset; + while( p_buffer[i_startcode-1] == 0 && i_startcode > 0 ) + i_startcode--; break; - } + } } i_size = i_startcode ? i_startcode : i_buffer; + if( i_nal_type == 7 ) { - p_sps = &p_buffer[4]; - i_sps_size = i_size - 4; + p_sps = &p_buffer[3]; + i_sps_size = i_size - 3; } if( i_nal_type == 8 ) { - p_pps = &p_buffer[4]; - i_pps_size = i_size - 4; + p_pps = &p_buffer[3]; + i_pps_size = i_size - 3; } i_buffer -= i_size; p_buffer += i_size; } } - + /* FIXME use better value */ avcC = box_new( "avcC" ); bo_add_8( avcC, 1 ); /* configuration version */ @@ -1021,8 +994,8 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux ) { mp4_stream_t *p_stream = p_sys->pp_streams[i_track]; - if( p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','v') || - p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','a') ) + if( p_stream->fmt.i_codec == VLC_CODEC_MP4V || + p_stream->fmt.i_codec == VLC_CODEC_MP4A ) { bo_t *box = box_new( "\251req" ); /* String length */ @@ -1081,31 +1054,31 @@ static bo_t *GetUdtaTag( sout_mux_t *p_mux ) static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) { sout_mux_sys_t *p_sys = p_mux->p_sys; - vlc_bool_t b_descr = VLC_FALSE; + bool b_descr = false; bo_t *soun; char fcc[4] = " "; int i; switch( p_stream->fmt.i_codec ) { - case VLC_FOURCC('m','p','4','a'): + case VLC_CODEC_MP4A: memcpy( fcc, "mp4a", 4 ); - b_descr = VLC_TRUE; + b_descr = true; break; - case VLC_FOURCC('s','a','m','r'): - case VLC_FOURCC('s','a','w','b'): + case VLC_CODEC_AMR_NB: + case VLC_CODEC_AMR_WB: memcpy( fcc, (char*)&p_stream->fmt.i_codec, 4 ); - b_descr = VLC_TRUE; + b_descr = true; break; - case VLC_FOURCC('m','p','g','a'): + case VLC_CODEC_MPGA: if( p_sys->b_mov ) memcpy( fcc, ".mp3", 4 ); else { memcpy( fcc, "mp4a", 4 ); - b_descr = VLC_TRUE; + b_descr = true; } break; @@ -1123,7 +1096,7 @@ static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) /* SoundDescription */ if( p_sys->b_mov && - p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','a') ) + p_stream->fmt.i_codec == VLC_CODEC_MP4A ) { bo_add_16be( soun, 1 ); // version 1; } @@ -1145,7 +1118,7 @@ static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) /* Extended data for SoundDescription V1 */ if( p_sys->b_mov && - p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','a') ) + p_stream->fmt.i_codec == VLC_CODEC_MP4A ) { /* samples per packet */ bo_add_32be( soun, p_stream->fmt.audio.i_frame_length ); @@ -1161,11 +1134,11 @@ static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) bo_t *box; if( p_sys->b_mov && - p_stream->fmt.i_codec == VLC_FOURCC('m','p','4','a') ) + p_stream->fmt.i_codec == VLC_CODEC_MP4A ) { box = GetWaveTag( p_stream ); } - else if( p_stream->fmt.i_codec == VLC_FOURCC('s','a','m','r') ) + else if( p_stream->fmt.i_codec == VLC_CODEC_AMR_NB ) { box = GetDamrTag( p_stream ); } @@ -1182,7 +1155,7 @@ static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) return soun; } -static bo_t *GetVideBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) +static bo_t *GetVideBox( mp4_stream_t *p_stream ) { bo_t *vide; @@ -1191,36 +1164,36 @@ static bo_t *GetVideBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) switch( p_stream->fmt.i_codec ) { - case VLC_FOURCC('m','p','4','v'): - case VLC_FOURCC('m','p','g','v'): + case VLC_CODEC_MP4V: + case VLC_CODEC_MPGV: memcpy( fcc, "mp4v", 4 ); break; - case VLC_FOURCC('M','J','P','G'): + case VLC_CODEC_MJPG: memcpy( fcc, "mjpa", 4 ); break; - case VLC_FOURCC('S','V','Q','1'): + case VLC_CODEC_SVQ1: memcpy( fcc, "SVQ1", 4 ); break; - case VLC_FOURCC('S','V','Q','3'): + case VLC_CODEC_SVQ3: memcpy( fcc, "SVQ3", 4 ); break; - case VLC_FOURCC('H','2','6','3'): + case VLC_CODEC_H263: memcpy( fcc, "s263", 4 ); break; - case VLC_FOURCC('h','2','6','4'): + case VLC_CODEC_H264: memcpy( fcc, "avc1", 4 ); break; - case VLC_FOURCC('Y','V','1','2'): + case VLC_CODEC_YV12: memcpy( fcc, "yv12", 4 ); break; - case VLC_FOURCC('Y','U','Y','2'): + case VLC_CODEC_YUYV: memcpy( fcc, "yuy2", 4 ); break; @@ -1264,8 +1237,8 @@ static bo_t *GetVideBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) /* add an ES Descriptor */ switch( p_stream->fmt.i_codec ) { - case VLC_FOURCC('m','p','4','v'): - case VLC_FOURCC('m','p','g','v'): + case VLC_CODEC_MP4V: + case VLC_CODEC_MPGV: { bo_t *esds = GetESDS( p_stream ); @@ -1274,16 +1247,16 @@ static bo_t *GetVideBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) } break; - case VLC_FOURCC('H','2','6','3'): + case VLC_CODEC_H263: { - bo_t *d263 = GetD263Tag( p_stream ); + bo_t *d263 = GetD263Tag(); box_fix( d263 ); box_gather( vide, d263 ); } break; - case VLC_FOURCC('S','V','Q','3'): + case VLC_CODEC_SVQ3: { bo_t *esds = GetSVQ3Tag( p_stream ); @@ -1292,7 +1265,7 @@ static bo_t *GetVideBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) } break; - case VLC_FOURCC('h','2','6','4'): + case VLC_CODEC_H264: box_gather( vide, GetAvcCTag( p_stream ) ); break; @@ -1305,7 +1278,7 @@ static bo_t *GetVideBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) return vide; } -static bo_t *GetTextBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) +static bo_t *GetTextBox( void ) { bo_t *text = box_new( "text" ); @@ -1363,12 +1336,12 @@ static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) } else if( p_stream->fmt.i_cat == VIDEO_ES ) { - bo_t *vide = GetVideBox( p_mux, p_stream ); + bo_t *vide = GetVideBox( p_stream ); box_gather( stsd, vide ); } else if( p_stream->fmt.i_cat == SPU_ES ) { - box_gather( stsd, GetTextBox( p_mux, p_stream ) ); + box_gather( stsd, GetTextBox() ); } box_fix( stsd ); @@ -1376,13 +1349,13 @@ static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) if( p_sys->i_pos >= (((uint64_t)0x1) << 32) ) { /* 64 bits version */ - p_stream->b_stco64 = VLC_TRUE; + p_stream->b_stco64 = true; stco = box_full_new( "co64", 0, 0 ); } else { /* 32 bits version */ - p_stream->b_stco64 = VLC_FALSE; + p_stream->b_stco64 = false; stco = box_full_new( "stco", 0, 0 ); } bo_add_32be( stco, 0 ); // entry-count (fixed latter) @@ -1446,13 +1419,13 @@ static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) /* first, create quantified length */ for( i = 0, i_dts = 0, i_dts_q = 0; i < p_stream->i_entry_count; i++ ) { - int64_t i_dts_deq = i_dts_q * I64C(1000000) / (int64_t)i_timescale; + int64_t i_dts_deq = i_dts_q * INT64_C(1000000) / (int64_t)i_timescale; int64_t i_delta = p_stream->entry[i].i_length + i_dts - i_dts_deq; i_dts += p_stream->entry[i].i_length; p_stream->entry[i].i_length = - i_delta * (int64_t)i_timescale / I64C(1000000); + i_delta * (int64_t)i_timescale / INT64_C(1000000); i_dts_q += p_stream->entry[i].i_length; } @@ -1530,7 +1503,7 @@ static bo_t *GetStblBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) static int64_t get_timestamp(void); -static uint32_t mvhd_matrix[9] = +static const uint32_t mvhd_matrix[9] = { 0x10000, 0, 0, 0, 0x10000, 0, 0, 0, 0x40000000 }; static bo_t *GetMoovBox( sout_mux_t *p_mux ) @@ -1542,6 +1515,7 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) uint32_t i_movie_timescale = 90000; int64_t i_movie_duration = 0; + int64_t i_timestamp = get_timestamp(); moov = box_new( "moov" ); @@ -1560,16 +1534,16 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) if( !p_sys->b_64_ext ) { mvhd = box_full_new( "mvhd", 0, 0 ); - bo_add_32be( mvhd, get_timestamp() ); // creation time - bo_add_32be( mvhd, get_timestamp() ); // modification time + bo_add_32be( mvhd, i_timestamp ); // creation time + bo_add_32be( mvhd, i_timestamp ); // modification time bo_add_32be( mvhd, i_movie_timescale); // timescale bo_add_32be( mvhd, i_movie_duration ); // duration } else { mvhd = box_full_new( "mvhd", 1, 0 ); - bo_add_64be( mvhd, get_timestamp() ); // creation time - bo_add_64be( mvhd, get_timestamp() ); // modification time + bo_add_64be( mvhd, i_timestamp ); // creation time + bo_add_64be( mvhd, i_timestamp ); // modification time bo_add_32be( mvhd, i_movie_timescale); // timescale bo_add_64be( mvhd, i_movie_duration ); // duration } @@ -1621,8 +1595,8 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) else tkhd = box_full_new( "tkhd", 0, 1 ); - bo_add_32be( tkhd, get_timestamp() ); // creation time - bo_add_32be( tkhd, get_timestamp() ); // modification time + bo_add_32be( tkhd, i_timestamp ); // creation time + bo_add_32be( tkhd, i_timestamp ); // modification time bo_add_32be( tkhd, p_stream->i_track_id ); bo_add_32be( tkhd, 0 ); // reserved 0 bo_add_32be( tkhd, p_stream->i_duration * @@ -1636,8 +1610,8 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) else tkhd = box_full_new( "tkhd", 1, 1 ); - bo_add_64be( tkhd, get_timestamp() ); // creation time - bo_add_64be( tkhd, get_timestamp() ); // modification time + bo_add_64be( tkhd, i_timestamp ); // creation time + bo_add_64be( tkhd, i_timestamp ); // modification time bo_add_32be( tkhd, p_stream->i_track_id ); bo_add_32be( tkhd, 0 ); // reserved 0 bo_add_64be( tkhd, p_stream->i_duration * @@ -1666,11 +1640,12 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) else if( p_stream->fmt.i_cat == VIDEO_ES ) { int i_width = p_stream->fmt.video.i_width << 16; - if( p_stream->fmt.video.i_aspect > 0 ) + if( p_stream->fmt.video.i_sar_num > 0 && + p_stream->fmt.video.i_sar_den > 0 ) { - i_width = (int64_t)p_stream->fmt.video.i_aspect * - ((int64_t)p_stream->fmt.video.i_height << 16) / - VOUT_ASPECT_FACTOR; + i_width = (int64_t)p_stream->fmt.video.i_sar_num * + ((int64_t)p_stream->fmt.video.i_width << 16) / + p_stream->fmt.video.i_sar_den; } // width (presentation) bo_add_32be( tkhd, i_width ); @@ -1687,12 +1662,14 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) mp4_stream_t *tk = p_sys->pp_streams[i]; if( tk->fmt.i_cat == VIDEO_ES ) { - if( p_stream->fmt.video.i_aspect ) - i_width = (int64_t)p_stream->fmt.video.i_aspect * - ((int64_t)p_stream->fmt.video.i_height<<16) / VOUT_ASPECT_FACTOR; + if( tk->fmt.video.i_sar_num > 0 && + tk->fmt.video.i_sar_den > 0 ) + i_width = (int64_t)tk->fmt.video.i_sar_num * + ((int64_t)tk->fmt.video.i_width << 16) / + tk->fmt.video.i_sar_den; else - i_width = p_stream->fmt.video.i_width << 16; - i_height = p_stream->fmt.video.i_height; + i_width = tk->fmt.video.i_width << 16; + i_height = tk->fmt.video.i_height; break; } } @@ -1713,13 +1690,13 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) if( p_sys->b_64_ext ) { bo_add_64be( elst, (p_stream->i_dts_start-p_sys->i_dts_start) * - i_movie_timescale / I64C(1000000) ); + i_movie_timescale / INT64_C(1000000) ); bo_add_64be( elst, -1 ); } else { bo_add_32be( elst, (p_stream->i_dts_start-p_sys->i_dts_start) * - i_movie_timescale / I64C(1000000) ); + i_movie_timescale / INT64_C(1000000) ); bo_add_32be( elst, -1 ); } bo_add_16be( elst, 1 ); @@ -1732,13 +1709,13 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) if( p_sys->b_64_ext ) { bo_add_64be( elst, p_stream->i_duration * - i_movie_timescale / I64C(1000000) ); + i_movie_timescale / INT64_C(1000000) ); bo_add_64be( elst, 0 ); } else { bo_add_32be( elst, p_stream->i_duration * - i_movie_timescale / I64C(1000000) ); + i_movie_timescale / INT64_C(1000000) ); bo_add_32be( elst, 0 ); } bo_add_16be( elst, 1 ); @@ -1756,8 +1733,8 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) if( !p_sys->b_64_ext ) { mdhd = box_full_new( "mdhd", 0, 0 ); - bo_add_32be( mdhd, get_timestamp() ); // creation time - bo_add_32be( mdhd, get_timestamp() ); // modification time + bo_add_32be( mdhd, i_timestamp ); // creation time + bo_add_32be( mdhd, i_timestamp ); // modification time bo_add_32be( mdhd, i_timescale); // timescale bo_add_32be( mdhd, p_stream->i_duration * (int64_t)i_timescale / (mtime_t)1000000 ); // duration @@ -1765,8 +1742,8 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) else { mdhd = box_full_new( "mdhd", 1, 0 ); - bo_add_64be( mdhd, get_timestamp() ); // creation time - bo_add_64be( mdhd, get_timestamp() ); // modification time + bo_add_64be( mdhd, i_timestamp ); // creation time + bo_add_64be( mdhd, i_timestamp ); // modification time bo_add_32be( mdhd, i_timescale); // timescale bo_add_64be( mdhd, p_stream->i_duration * (int64_t)i_timescale / (mtime_t)1000000 ); // duration @@ -1937,12 +1914,12 @@ static bo_t *GetMoovBox( sout_mux_t *p_mux ) /****************************************************************************/ static void bo_init( bo_t *p_bo, int i_size, uint8_t *p_buffer, - vlc_bool_t b_grow ) + bool b_grow ) { if( !p_buffer ) { p_bo->i_buffer_size = __MAX( i_size, 1024 ); - p_bo->p_buffer = malloc( p_bo->i_buffer_size ); + p_bo->p_buffer = xmalloc( p_bo->i_buffer_size ); } else { @@ -1963,8 +1940,7 @@ static void bo_add_8( bo_t *p_bo, uint8_t i ) else if( p_bo->b_grow ) { p_bo->i_buffer_size += 1024; - p_bo->p_buffer = realloc( p_bo->p_buffer, p_bo->i_buffer_size ); - + p_bo->p_buffer = xrealloc( p_bo->p_buffer, p_bo->i_buffer_size ); p_bo->p_buffer[p_bo->i_buffer] = i; } @@ -2029,9 +2005,9 @@ static void bo_add_descr( bo_t *p_bo, uint8_t tag, uint32_t i_size ) i_length = i_size; vals[3] = (unsigned char)(i_length & 0x7f); i_length >>= 7; - vals[2] = (unsigned char)((i_length & 0x7f) | 0x80); + vals[2] = (unsigned char)((i_length & 0x7f) | 0x80); i_length >>= 7; - vals[1] = (unsigned char)((i_length & 0x7f) | 0x80); + vals[1] = (unsigned char)((i_length & 0x7f) | 0x80); i_length >>= 7; vals[0] = (unsigned char)((i_length & 0x7f) | 0x80); @@ -2077,7 +2053,7 @@ static bo_t * box_new( const char *fcc ) if( ( box = malloc( sizeof( bo_t ) ) ) ) { - bo_init( box, 0, NULL, VLC_TRUE ); + bo_init( box, 0, NULL, true ); bo_add_32be ( box, 0 ); bo_add_fourcc( box, fcc ); @@ -2092,7 +2068,7 @@ static bo_t * box_full_new( const char *fcc, uint8_t v, uint32_t f ) if( ( box = malloc( sizeof( bo_t ) ) ) ) { - bo_init( box, 0, NULL, VLC_TRUE ); + bo_init( box, 0, NULL, true ); bo_add_32be ( box, 0 ); bo_add_fourcc( box, fcc ); @@ -2115,11 +2091,7 @@ static void box_fix( bo_t *box ) static void box_free( bo_t *box ) { - if( box->p_buffer ) - { - free( box->p_buffer ); - } - + free( box->p_buffer ); free( box ); } @@ -2131,6 +2103,7 @@ static void box_gather ( bo_t *box, bo_t *box2 ) static block_t * bo_to_sout( sout_instance_t *p_sout, bo_t *box ) { + (void)p_sout; block_t *p_buf; p_buf = block_New( p_sout, box->i_buffer ); @@ -2154,13 +2127,10 @@ static void box_send( sout_mux_t *p_mux, bo_t *box ) static int64_t get_timestamp(void) { - int64_t i_timestamp = 0; + int64_t i_timestamp = time(NULL); -#ifdef HAVE_TIME_H - i_timestamp = time(NULL); i_timestamp += 2082844800; // MOV/MP4 start date is 1/1/1904 // 208284480 is (((1970 - 1904) * 365) + 17) * 24 * 60 * 60 -#endif return i_timestamp; }