X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmp4.c;h=d5a8614500094dde07a50c708cab0db391e812e6;hb=812707a1c273c88f62a89e1a6c153f08868ad62e;hp=17a411bff0521d3f5d11d866d04ddd6ec24a2d85;hpb=78880d35f3b4b38c909ede5b37b4879639bffb70;p=vlc diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c index 17a411bff0..d5a8614500 100644 --- a/modules/mux/mp4.c +++ b/modules/mux/mp4.c @@ -30,16 +30,15 @@ # 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 @@ -55,26 +54,26 @@ 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, - 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" ) + add_shortcut( "mov" ) + add_shortcut( "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 }; @@ -192,6 +191,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; @@ -396,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: @@ -421,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; @@ -449,44 +452,6 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_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, 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( block_FifoCount( p_fifo ) <= 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: *****************************************************************************/ @@ -497,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 ); } @@ -512,11 +477,11 @@ 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_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_data ); } @@ -530,7 +495,7 @@ again: 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; } @@ -594,8 +559,7 @@ 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 ) ); } @@ -740,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 ) @@ -778,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; @@ -871,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) */ @@ -1023,8 +987,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 */ @@ -1090,18 +1054,18 @@ static bo_t *GetSounBox( sout_mux_t *p_mux, mp4_stream_t *p_stream ) switch( p_stream->fmt.i_codec ) { - case VLC_FOURCC('m','p','4','a'): + case VLC_CODEC_MP4A: memcpy( fcc, "mp4a", 4 ); 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 = true; break; - case VLC_FOURCC('m','p','g','a'): + case VLC_CODEC_MPGA: if( p_sys->b_mov ) memcpy( fcc, ".mp3", 4 ); else @@ -1125,7 +1089,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; } @@ -1147,7 +1111,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 ); @@ -1163,11 +1127,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 ); } @@ -1193,36 +1157,36 @@ static bo_t *GetVideBox( 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; @@ -1266,8 +1230,8 @@ static bo_t *GetVideBox( 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 ); @@ -1276,7 +1240,7 @@ static bo_t *GetVideBox( mp4_stream_t *p_stream ) } break; - case VLC_FOURCC('H','2','6','3'): + case VLC_CODEC_H263: { bo_t *d263 = GetD263Tag(); @@ -1285,7 +1249,7 @@ static bo_t *GetVideBox( mp4_stream_t *p_stream ) } break; - case VLC_FOURCC('S','V','Q','3'): + case VLC_CODEC_SVQ3: { bo_t *esds = GetSVQ3Tag( p_stream ); @@ -1294,7 +1258,7 @@ static bo_t *GetVideBox( mp4_stream_t *p_stream ) } break; - case VLC_FOURCC('h','2','6','4'): + case VLC_CODEC_H264: box_gather( vide, GetAvcCTag( p_stream ) ); break; @@ -1448,13 +1412,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; } @@ -1532,7 +1496,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 ) @@ -1668,11 +1632,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 ); @@ -1689,12 +1654,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; } } @@ -1715,13 +1682,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 ); @@ -1734,13 +1701,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 ); @@ -1944,7 +1911,7 @@ static void bo_init( bo_t *p_bo, int i_size, uint8_t *p_buffer, 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 { @@ -1965,8 +1932,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; } @@ -2129,6 +2095,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 ); @@ -2152,13 +2119,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; }