X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=output%2Fmp4.c;h=c852ce21f53b18e63da223014cb3a14088d8ec97;hb=d23d18655249944c1ca894b451e2c82c7a584c62;hp=0e3c2fc1096c2681b775504847e2355c8e4e2c68;hpb=f9bc2de28f637fa199424f544c94aeabc551eeb4;p=x264 diff --git a/output/mp4.c b/output/mp4.c index 0e3c2fc1..c852ce21 100644 --- a/output/mp4.c +++ b/output/mp4.c @@ -1,7 +1,7 @@ /***************************************************************************** - * mp4.c: x264 mp4 output module + * mp4.c: mp4 muxer ***************************************************************************** - * Copyright (C) 2003-2009 x264 project + * Copyright (C) 2003-2016 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -19,16 +19,16 @@ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA. + * + * This program is also available under a commercial proprietary license. + * For more information, contact us at licensing@x264.com. *****************************************************************************/ -#include "muxers.h" +#include "output.h" #include -#if HAVE_GF_MALLOC -#undef malloc -#undef free -#define malloc gf_malloc -#define free gf_free +#ifdef _WIN32 +#include #endif typedef struct @@ -38,10 +38,15 @@ typedef struct GF_ISOSample *p_sample; int i_track; uint32_t i_descidx; - uint32_t i_time_res; + uint64_t i_time_res; int64_t i_time_inc; + int64_t i_delay_time; + int64_t i_init_delta; int i_numframe; - int i_delay_time; + int i_delay_frames; + int b_dts_compress; + int i_dts_compress_multiplier; + int i_data_size; } mp4_hnd_t; static void recompute_bitrate_mp4( GF_ISOFile *p_file, int i_track ) @@ -61,12 +66,12 @@ static void recompute_bitrate_mp4( GF_ISOFile *p_file, int i_track ) timescale = gf_isom_get_media_timescale( p_file, i_track ); count = gf_isom_get_sample_count( p_file, i_track ); - for( int i = 0; i < count; i++ ) + for( u32 i = 0; i < count; i++ ) { GF_ISOSample *samp = gf_isom_get_sample_info( p_file, i_track, i+1, &di, &offset ); if( !samp ) { - fprintf( stderr, "mp4 [error]: failure reading back frame %u\n", i ); + x264_cli_log( "mp4", X264_LOG_ERROR, "failure reading back frame %u\n", i ); break; } @@ -118,33 +123,36 @@ static int close_file( hnd_t handle, int64_t largest_pts, int64_t second_largest if( p_mp4->p_file ) { - /* The mdhd duration is defined as CTS[final] - CTS[0] + duration of last frame. - * The mdhd duration (in seconds) should be able to be longer than the tkhd duration since the track is managed by edts. - * So, if mdhd duration is equal to the last DTS or less, we give the last composition time delta to the last sample duration. - * And then, the mdhd duration is updated, but it time-wise doesn't give the actual duration. - * The tkhd duration is the actual track duration. */ - uint64_t mdhd_duration = (2 * largest_pts - second_largest_pts) * p_mp4->i_time_inc; - if( mdhd_duration != gf_isom_get_media_duration( p_mp4->p_file, p_mp4->i_track ) ) - { - uint64_t last_dts = gf_isom_get_sample_dts( p_mp4->p_file, p_mp4->i_track, p_mp4->i_numframe ); - uint32_t last_duration = (uint32_t)( mdhd_duration > last_dts ? mdhd_duration - last_dts : (largest_pts - second_largest_pts) * p_mp4->i_time_inc ); - gf_isom_set_last_sample_duration( p_mp4->p_file, p_mp4->i_track, last_duration ); - } - - /* Write an Edit Box if the first CTS offset is positive. - * A media_time is given by not the mvhd timescale but rather the mdhd timescale. - * The reason is that an Edit Box maps the presentation time-line to the media time-line. - * Any demuxers should follow the Edit Box if it exists. */ - GF_ISOSample *sample = gf_isom_get_sample_info( p_mp4->p_file, p_mp4->i_track, 1, NULL, NULL ); - if( sample && sample->CTS_Offset > 0 ) + if( p_mp4->i_track ) { - uint32_t mvhd_timescale = gf_isom_get_timescale( p_mp4->p_file ); - uint64_t tkhd_duration = (uint64_t)( mdhd_duration * ( (double)mvhd_timescale / p_mp4->i_time_res ) ); - gf_isom_append_edit_segment( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL ); + /* The mdhd duration is defined as CTS[final] - CTS[0] + duration of last frame. + * The mdhd duration (in seconds) should be able to be longer than the tkhd duration since the track is managed by edts. + * So, if mdhd duration is equal to the last DTS or less, we give the last composition time delta to the last sample duration. + * And then, the mdhd duration is updated, but it time-wise doesn't give the actual duration. + * The tkhd duration is the actual track duration. */ + uint64_t mdhd_duration = (2 * largest_pts - second_largest_pts) * p_mp4->i_time_inc; + if( mdhd_duration != gf_isom_get_media_duration( p_mp4->p_file, p_mp4->i_track ) ) + { + uint64_t last_dts = gf_isom_get_sample_dts( p_mp4->p_file, p_mp4->i_track, p_mp4->i_numframe ); + uint32_t last_duration = (uint32_t)( mdhd_duration > last_dts ? mdhd_duration - last_dts : (largest_pts - second_largest_pts) * p_mp4->i_time_inc ); + gf_isom_set_last_sample_duration( p_mp4->p_file, p_mp4->i_track, last_duration ); + } + + /* Write an Edit Box if the first CTS offset is positive. + * A media_time is given by not the mvhd timescale but rather the mdhd timescale. + * The reason is that an Edit Box maps the presentation time-line to the media time-line. + * Any demuxers should follow the Edit Box if it exists. */ + GF_ISOSample *sample = gf_isom_get_sample_info( p_mp4->p_file, p_mp4->i_track, 1, NULL, NULL ); + if( sample && sample->CTS_Offset > 0 ) + { + uint32_t mvhd_timescale = gf_isom_get_timescale( p_mp4->p_file ); + uint64_t tkhd_duration = (uint64_t)( mdhd_duration * ( (double)mvhd_timescale / p_mp4->i_time_res ) ); + gf_isom_append_edit_segment( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL ); + } + gf_isom_sample_del( &sample ); + + recompute_bitrate_mp4( p_mp4->p_file, p_mp4->i_track ); } - gf_isom_sample_del( &sample ); - - recompute_bitrate_mp4( p_mp4->p_file, p_mp4->i_track ); gf_isom_set_pl_indication( p_mp4->p_file, GF_ISOM_PL_VISUAL, 0x15 ); gf_isom_set_storage_mode( p_mp4->p_file, GF_ISOM_STORE_FLAT ); gf_isom_close( p_mp4->p_file ); @@ -155,26 +163,30 @@ static int close_file( hnd_t handle, int64_t largest_pts, int64_t second_largest return 0; } -static int open_file( char *psz_filename, hnd_t *p_handle ) +static int open_file( char *psz_filename, hnd_t *p_handle, cli_output_opt_t *opt ) { - mp4_hnd_t *p_mp4; - *p_handle = NULL; - FILE *fh = fopen( psz_filename, "w" ); + FILE *fh = x264_fopen( psz_filename, "w" ); if( !fh ) return -1; - else if( !x264_is_regular_file( fh ) ) - { - fprintf( stderr, "mp4 [error]: MP4 output is incompatible with non-regular file `%s'\n", psz_filename ); - return -1; - } + int b_regular = x264_is_regular_file( fh ); fclose( fh ); + FAIL_IF_ERR( !b_regular, "mp4", "MP4 output is incompatible with non-regular file `%s'\n", psz_filename ) - if( !(p_mp4 = malloc( sizeof(mp4_hnd_t) )) ) + mp4_hnd_t *p_mp4 = calloc( 1, sizeof(mp4_hnd_t) ); + if( !p_mp4 ) return -1; - memset( p_mp4, 0, sizeof(mp4_hnd_t) ); +#ifdef _WIN32 + /* GPAC doesn't support Unicode filenames. */ + char ansi_filename[MAX_PATH]; + FAIL_IF_ERR( !x264_ansi_filename( psz_filename, ansi_filename, MAX_PATH, 1 ), "mp4", "invalid ansi filename\n" ) + p_mp4->p_file = gf_isom_open( ansi_filename, GF_ISOM_OPEN_WRITE, NULL ); +#else p_mp4->p_file = gf_isom_open( psz_filename, GF_ISOM_OPEN_WRITE, NULL ); +#endif + + p_mp4->b_dts_compress = opt->use_dts_compress; if( !(p_mp4->p_sample = gf_isom_sample_new()) ) { @@ -193,8 +205,12 @@ static int set_param( hnd_t handle, x264_param_t *p_param ) { mp4_hnd_t *p_mp4 = handle; - p_mp4->i_time_res = p_param->i_timebase_den; - p_mp4->i_time_inc = p_param->i_timebase_num; + p_mp4->i_delay_frames = p_param->i_bframe ? (p_param->i_bframe_pyramid ? 2 : 1) : 0; + p_mp4->i_dts_compress_multiplier = p_mp4->b_dts_compress * p_mp4->i_delay_frames + 1; + + p_mp4->i_time_res = (uint64_t)p_param->i_timebase_den * p_mp4->i_dts_compress_multiplier; + p_mp4->i_time_inc = (uint64_t)p_param->i_timebase_num * p_mp4->i_dts_compress_multiplier; + FAIL_IF_ERR( p_mp4->i_time_res > UINT32_MAX, "mp4", "MP4 media timescale %"PRIu64" exceeds maximum\n", p_mp4->i_time_res ) p_mp4->i_track = gf_isom_new_track( p_mp4->p_file, 0, GF_ISOM_MEDIA_VISUAL, p_mp4->i_time_res ); @@ -221,10 +237,27 @@ static int set_param( hnd_t handle, x264_param_t *p_param ) gf_isom_set_track_layout_info( p_mp4->p_file, p_mp4->i_track, dw, dh, 0, 0, 0 ); } - p_mp4->p_sample->data = malloc( p_param->i_width * p_param->i_height * 3 / 2 ); + p_mp4->i_data_size = p_param->i_width * p_param->i_height * 3 / 2; + p_mp4->p_sample->data = malloc( p_mp4->i_data_size ); if( !p_mp4->p_sample->data ) + { + p_mp4->i_data_size = 0; return -1; + } + + return 0; +} +static int check_buffer( mp4_hnd_t *p_mp4, int needed_size ) +{ + if( needed_size > p_mp4->i_data_size ) + { + void *ptr = realloc( p_mp4->p_sample->data, needed_size ); + if( !ptr ) + return -1; + p_mp4->p_sample->data = ptr; + p_mp4->i_data_size = needed_size; + } return 0; } @@ -272,25 +305,42 @@ static int write_headers( hnd_t handle, x264_nal_t *p_nal ) // SEI + if( check_buffer( p_mp4, p_mp4->p_sample->dataLength + sei_size ) ) + return -1; memcpy( p_mp4->p_sample->data + p_mp4->p_sample->dataLength, sei, sei_size ); p_mp4->p_sample->dataLength += sei_size; return sei_size + sps_size + pps_size; } + static int write_frame( hnd_t handle, uint8_t *p_nalu, int i_size, x264_picture_t *p_picture ) { mp4_hnd_t *p_mp4 = handle; int64_t dts; int64_t cts; + if( check_buffer( p_mp4, p_mp4->p_sample->dataLength + i_size ) ) + return -1; memcpy( p_mp4->p_sample->data + p_mp4->p_sample->dataLength, p_nalu, i_size ); p_mp4->p_sample->dataLength += i_size; if( !p_mp4->i_numframe ) p_mp4->i_delay_time = p_picture->i_dts * -1; - dts = (p_picture->i_dts + p_mp4->i_delay_time) * p_mp4->i_time_inc; - cts = (p_picture->i_pts + p_mp4->i_delay_time) * p_mp4->i_time_inc; + if( p_mp4->b_dts_compress ) + { + if( p_mp4->i_numframe == 1 ) + p_mp4->i_init_delta = (p_picture->i_dts + p_mp4->i_delay_time) * p_mp4->i_time_inc; + dts = p_mp4->i_numframe > p_mp4->i_delay_frames + ? p_picture->i_dts * p_mp4->i_time_inc + : p_mp4->i_numframe * (p_mp4->i_init_delta / p_mp4->i_dts_compress_multiplier); + cts = p_picture->i_pts * p_mp4->i_time_inc; + } + else + { + dts = (p_picture->i_dts + p_mp4->i_delay_time) * p_mp4->i_time_inc; + cts = (p_picture->i_pts + p_mp4->i_delay_time) * p_mp4->i_time_inc; + } p_mp4->p_sample->IsRAP = p_picture->b_keyframe; p_mp4->p_sample->DTS = dts;