/*****************************************************************************
* mp4.c: mp4/mov muxer
*****************************************************************************
- * Copyright (C) 2001, 2002, 2003 VideoLAN
+ * Copyright (C) 2001, 2002, 2003, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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 <stdlib.h>
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
-#ifdef HAVE_TIME_H
#include <time.h>
-#endif
-#include "iso_lang.h"
-#include "vlc_meta.h"
+#include <vlc_iso_lang.h>
+#include <vlc_meta.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define FASTSTART_TEXT N_("Create \"Fast start\" files")
+#define FASTSTART_TEXT N_("Create \"Fast Start\" files")
#define FASTSTART_LONGTEXT N_( \
- "When this option is turned on, \"Fast start\" files will be created. " \
- "(\"Fast start\" files are optimized for download, allowing the user " \
- "to start previewing the file while it is downloading).")
+ "Create \"Fast Start\" files. " \
+ "\"Fast Start\" files are optimized for downloads and allow the user " \
+ "to start previewing the file while it is downloading.")
+
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-mp4-"
-vlc_module_begin();
- set_description( _("MP4/MOV muxer") );
+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, FASTSTART_TEXT, FASTSTART_LONGTEXT,
- VLC_TRUE );
- set_capability( "sout mux", 5 );
- add_shortcut( "mp4" );
- add_shortcut( "mov" );
- set_callbacks( Open, Close );
-vlc_module_end();
+ add_bool( SOUT_CFG_PREFIX "faststart", true, NULL,
+ FASTSTART_TEXT, FASTSTART_LONGTEXT,
+ 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
};
/* for later stco fix-up (fast start files) */
uint64_t i_stco_pos;
- vlc_bool_t b_stco64;
-
- /* for h264 */
- struct
- {
- int i_profile;
- int i_level;
-
- int i_sps;
- uint8_t *sps;
- int i_pps;
- uint8_t *pps;
- } avc;
+ bool b_stco64;
/* for spu */
int64_t i_last_dts;
struct sout_mux_sys_t
{
- vlc_bool_t b_mov;
- 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;
typedef struct bo_t
{
- vlc_bool_t b_grow;
+ bool b_grow;
int i_buffer_size;
int i_buffer;
} 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 );
static void bo_add_32be ( bo_t *, uint32_t );
static void bo_add_64be ( bo_t *, uint64_t );
-static void bo_add_fourcc(bo_t *, char * );
+static void bo_add_fourcc(bo_t *, const char * );
static void bo_add_bo ( bo_t *, bo_t * );
static void bo_add_mem ( bo_t *, int , uint8_t * );
static void bo_add_descr( bo_t *, uint8_t , uint32_t );
static void bo_fix_32be ( bo_t *, int , uint32_t );
-static bo_t *box_new ( char *fcc );
-static bo_t *box_full_new( char *fcc, uint8_t v, uint32_t f );
+static bo_t *box_new ( const char *fcc );
+static bo_t *box_full_new( const char *fcc, uint8_t v, uint32_t f );
static void box_fix ( bo_t *box );
static void box_free ( bo_t *box );
static void box_gather ( bo_t *box, bo_t *box2 );
static bo_t *GetMoovBox( sout_mux_t *p_mux );
-static block_t *ConvertSUBT( sout_mux_t *, mp4_stream_t *, block_t *);
-static void ConvertAVC1( sout_mux_t *, mp4_stream_t *, block_t * );
+static block_t *ConvertSUBT( block_t *);
+static block_t *ConvertAVC1( block_t * );
/*****************************************************************************
* Open:
sout_mux_sys_t *p_sys;
bo_t *box;
- msg_Dbg( p_mux, "Mp4 muxer opend" );
- sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
+ 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;
p_mux->pf_addstream = AddStream;
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;
p_sys->i_mdat_pos = 0;
p_sys->b_mov = p_mux->psz_mux && !strcmp( p_mux->psz_mux, "mov" );
+ p_sys->b_3gp = p_mux->psz_mux && !strcmp( p_mux->psz_mux, "3gp" );
p_sys->i_dts_start = 0;
{
/* Now add ftyp header */
box = box_new( "ftyp" );
- bo_add_fourcc( box, "isom" );
+ if( p_sys->b_3gp ) bo_add_fourcc( box, "3gp6" );
+ else bo_add_fourcc( box, "isom" );
bo_add_32be ( box, 0 );
- bo_add_fourcc( box, "mp41" );
+ 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;
/* 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" );
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 */
p_sys->i_mdat_pos + i_size - i_chunk );
if( sout_AccessOutRead( p_mux->p_access, p_buf ) < i_chunk )
{
- msg_Warn( p_this, "read() not supported by acces output, "
+ 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;
}
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 */
mp4_stream_t *p_stream = p_sys->pp_streams[i_trak];
es_format_Clean( &p_stream->fmt );
- if( p_stream->avc.i_sps ) free( p_stream->avc.sps );
- if( p_stream->avc.i_pps ) free( p_stream->avc.pps );
free( p_stream->entry );
free( p_stream );
}
*****************************************************************************/
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;
- }
+ }
}
/*****************************************************************************
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', '4' ):
+ 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:
}
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;
calloc( p_stream->i_entry_max, sizeof( mp4_entry_t ) );
p_stream->i_dts_start = 0;
p_stream->i_duration = 0;
- p_stream->avc.i_profile = 77;
- p_stream->avc.i_level = 51;
- p_stream->avc.i_sps = 0;
- p_stream->avc.sps = NULL;
- p_stream->avc.i_pps = 0;
- p_stream->avc.pps = NULL;
p_input->p_sys = p_stream;
*****************************************************************************/
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:
*****************************************************************************/
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 );
}
p_input = p_mux->pp_inputs[i_stream];
p_stream = (mp4_stream_t*)p_input->p_sys;
+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 )
{
- 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;
}
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 */
if( i_length != 0 )
{
/* TODO */
- msg_Dbg( p_mux, "writing a empty subs" ) ;
+ msg_Dbg( p_mux, "writing an empty sub" ) ;
/* Append a idx entry */
p_stream->entry[p_stream->i_entry_count].i_pos = p_sys->i_pos;
/*****************************************************************************
*
*****************************************************************************/
-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 );
return p_block;
}
-static void 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];
/* Replace the 4 bytes start code with 4 bytes size,
- * FIXME are all startcode 4 bytes ? (I don't think :( */
+ * FIXME are all startcodes 4 bytes ? (I don't think :( */
while( dat < end )
{
int i_size;
last[2] = ( i_size >> 8 )&0xff;
last[3] = ( i_size )&0xff;
- if( (last[4]&0x1f) == 7 && tk->avc.i_sps <= 0 ) /* SPS */
+ /* Skip blocks with SPS/PPS */
+ if( (last[4]&0x1f) == 7 || (last[4]&0x1f) == 8 )
{
- tk->avc.i_sps = i_size;
- tk->avc.sps = malloc( i_size );
- memcpy( tk->avc.sps, &last[4], i_size );
-
- tk->avc.i_profile = tk->avc.sps[1];
- tk->avc.i_level = tk->avc.sps[3];
+ ; // FIXME Find a way to skip dat without frelling everything
}
- else if( (last[4]&0x1f) == 8 && tk->avc.i_pps <= 0 ) /* PPS */
- {
- tk->avc.i_pps = i_size;
- tk->avc.pps = malloc( i_size );
- memcpy( tk->avc.pps, &last[4], i_size );
- }
-
last = dat;
-
dat += 4;
}
+ return p_block;
}
-
static int GetDescrLength( int i_size )
{
if( i_size < 0x00000080 )
int i_stream_type;
int i_object_type_indication;
int i_decoder_specific_info_size;
+ unsigned int i;
+ int64_t i_bitrate_avg = 0;
+ int64_t i_bitrate_max = 0;
+
+ /* Compute avg/max bitrate */
+ for( i = 0; i < p_stream->i_entry_count; i++ )
+ {
+ i_bitrate_avg += p_stream->entry[i].i_size;
+ if( p_stream->entry[i].i_length > 0)
+ {
+ 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 = INT64_C(8000000) * i_bitrate_avg / p_stream->i_duration;
+ else
+ i_bitrate_avg = 0;
+ if( i_bitrate_max <= 1 )
+ i_bitrate_max = 0x7fffffff;
+ /* */
if( p_stream->fmt.i_extra > 0 )
{
i_decoder_specific_info_size =
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;
bo_add_8 ( esds, i_object_type_indication );
bo_add_8 ( esds, ( i_stream_type << 2 ) | 1 );
bo_add_24be( esds, 1024 * 1024 ); // bufferSizeDB
- bo_add_32be( esds, 0x7fffffff ); // maxBitrate
- bo_add_32be( esds, 0 ); // avgBitrate
+ bo_add_32be( esds, i_bitrate_max ); // maxBitrate
+ bo_add_32be( esds, i_bitrate_avg ); // avgBitrate
if( p_stream->fmt.i_extra > 0 )
{
return wave;
}
+static bo_t *GetDamrTag( mp4_stream_t *p_stream )
+{
+ bo_t *damr;
+
+ damr = box_new( "damr" );
+
+ bo_add_fourcc( damr, "REFC" );
+ bo_add_8( damr, 0 );
+
+ 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) */
+ bo_add_16be( damr, 0x1 ); /* Mode change period (no restriction) */
+
+ box_fix( damr );
+
+ return damr;
+}
+
+static bo_t *GetD263Tag( void )
+{
+ bo_t *d263;
+
+ d263 = box_new( "d263" );
+
+ bo_add_fourcc( d263, "VLC " );
+ bo_add_16be( d263, 0xa );
+ bo_add_8( d263, 0 );
+
+ box_fix( d263 );
+
+ return d263;
+}
+
static bo_t *GetAvcCTag( mp4_stream_t *p_stream )
{
- bo_t *avcC;
+ bo_t *avcC = NULL;
+ uint8_t *p_sps = NULL;
+ uint8_t *p_pps = NULL;
+ int i_sps_size = 0;
+ int i_pps_size = 0;
+
+ if( p_stream->fmt.i_extra > 0 )
+ {
+ /* FIXME: take into account multiple sps/pps */
+ uint8_t *p_buffer = p_stream->fmt.p_extra;
+ int i_buffer = p_stream->fmt.i_extra;
+
+ while( i_buffer > 3 )
+ {
+ /* 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;
+
+
+ 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] == 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[3];
+ i_sps_size = i_size - 3;
+ }
+ if( i_nal_type == 8 )
+ {
+ 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 */
- bo_add_8( avcC, p_stream->avc.i_profile );
- bo_add_8( avcC, p_stream->avc.i_profile ); /* profile compatible ??? */
- bo_add_8( avcC, p_stream->avc.i_level ); /* level, 5.1 */
+ bo_add_8( avcC, i_sps_size ? p_sps[1] : 77 );
+ bo_add_8( avcC, i_sps_size ? p_sps[2] : 64 );
+ bo_add_8( avcC, i_sps_size ? p_sps[3] : 30 ); /* level, 5.1 */
bo_add_8( avcC, 0xff ); /* 0b11111100 | lengthsize = 0x11 */
- bo_add_8( avcC, 0xe0 | (p_stream->avc.i_sps > 0 ? 1 : 0) ); /* 0b11100000 | sps_count */
- if( p_stream->avc.i_sps > 0 )
+ bo_add_8( avcC, 0xe0 | (i_sps_size > 0 ? 1 : 0) ); /* 0b11100000 | sps_count */
+ if( i_sps_size > 0 )
{
- bo_add_16be( avcC, p_stream->avc.i_sps );
- bo_add_mem( avcC, p_stream->avc.i_sps, p_stream->avc.sps );
+ bo_add_16be( avcC, i_sps_size );
+ bo_add_mem( avcC, i_sps_size, p_sps );
}
- bo_add_8( avcC, (p_stream->avc.i_pps > 0 ? 1 : 0) ); /* pps_count */
- if( p_stream->avc.i_pps > 0 )
+ bo_add_8( avcC, (i_pps_size > 0 ? 1 : 0) ); /* pps_count */
+ if( i_pps_size > 0 )
{
- bo_add_16be( avcC, p_stream->avc.i_pps );
- bo_add_mem( avcC, p_stream->avc.i_pps, p_stream->avc.pps );
+ bo_add_16be( avcC, i_pps_size );
+ bo_add_mem( avcC, i_pps_size, p_pps );
}
box_fix( avcC );
/* FIXME handle 1 as long size */
break;
}
- if( !strncmp( &p[4], "SMI ", 4 ) )
+ if( !strncmp( (const char *)&p[4], "SMI ", 4 ) )
{
bo_add_mem( smi, p_end - p - 8, &p[8] );
return smi;
{
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 */
bo_add_16be( box, sizeof("QuickTime 6.0 or greater") - 1);
bo_add_16be( box, 0 );
bo_add_mem( box, sizeof("QuickTime 6.0 or greater") - 1,
- "QuickTime 6.0 or greater" );
+ (uint8_t *)"QuickTime 6.0 or greater" );
box_fix( box );
box_gather( udta, box );
break;
bo_add_16be( box, sizeof(PACKAGE_STRING " stream output") - 1);
bo_add_16be( box, 0 );
bo_add_mem( box, sizeof(PACKAGE_STRING " stream output") - 1,
- PACKAGE_STRING " stream output" );
+ (uint8_t*)PACKAGE_STRING " stream output" );
box_fix( box );
box_gather( udta, box );
}
/* Misc atoms */
if( p_meta )
{
- int i;
- for( i = 0; i < p_meta->i_meta; i++ )
- {
- bo_t *box = NULL;
-
- if( !strcmp( p_meta->name[i], VLC_META_TITLE ) )
- box = box_new( "\251nam" );
- else if( !strcmp( p_meta->name[i], VLC_META_AUTHOR ) )
- box = box_new( "\251aut" );
- else if( !strcmp( p_meta->name[i], VLC_META_ARTIST ) )
- box = box_new( "\251ART" );
- else if( !strcmp( p_meta->name[i], VLC_META_GENRE ) )
- box = box_new( "\251gen" );
- else if( !strcmp( p_meta->name[i], VLC_META_COPYRIGHT ) )
- box = box_new( "\251cpy" );
- else if( !strcmp( p_meta->name[i], VLC_META_DESCRIPTION ) )
- box = box_new( "\251des" );
- else if( !strcmp( p_meta->name[i], VLC_META_DATE ) )
- box = box_new( "\251day" );
- else if( !strcmp( p_meta->name[i], VLC_META_URL ) )
- box = box_new( "\251url" );
-
- if( box )
- {
- bo_add_16be( box, strlen( p_meta->value[i] ) );
- bo_add_16be( box, 0 );
- bo_add_mem( box, strlen( p_meta->value[i] ),
- p_meta->value[i] );
- box_fix( box );
- box_gather( udta, box );
- }
- }
+#define ADD_META_BOX( type, box_string ) { \
+ bo_t *box = NULL; \
+ if( vlc_meta_Get( p_meta, vlc_meta_##type ) ) box = box_new( "\251" box_string ); \
+ if( box ) \
+ { \
+ bo_add_16be( box, strlen( vlc_meta_Get( p_meta, vlc_meta_##type ) )); \
+ bo_add_16be( box, 0 ); \
+ bo_add_mem( box, strlen( vlc_meta_Get( p_meta, vlc_meta_##type ) ), \
+ (uint8_t*)(vlc_meta_Get( p_meta, vlc_meta_##type ) ) ); \
+ box_fix( box ); \
+ box_gather( udta, box ); \
+ } }
+
+ ADD_META_BOX( Title, "nam" );
+ ADD_META_BOX( Artist, "ART" );
+ ADD_META_BOX( Genre, "gen" );
+ ADD_META_BOX( Copyright, "cpy" );
+ ADD_META_BOX( Description, "des" );
+ ADD_META_BOX( Date, "day" );
+ ADD_META_BOX( URL, "url" );
+#undef ADD_META_BOX
}
box_fix( udta );
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_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
{
memcpy( fcc, "mp4a", 4 );
- b_descr = VLC_TRUE;
+ b_descr = true;
}
break;
/* 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;
}
/* 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 );
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_CODEC_AMR_NB )
+ {
+ box = GetDamrTag( p_stream );
+ }
else
{
box = GetESDS( 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;
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','4'):
+ case VLC_CODEC_H263:
+ memcpy( fcc, "s263", 4 );
+ break;
+
+ case VLC_CODEC_H264:
memcpy( fcc, "avc1", 4 );
break;
+ case VLC_CODEC_YV12:
+ memcpy( fcc, "yv12", 4 );
+ break;
+
+ case VLC_CODEC_YUYV:
+ memcpy( fcc, "yuy2", 4 );
+ break;
+
default:
memcpy( fcc, (char*)&p_stream->fmt.i_codec, 4 );
break;
/* 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 );
}
break;
- case VLC_FOURCC('S','V','Q','3'):
+ case VLC_CODEC_H263:
+ {
+ bo_t *d263 = GetD263Tag();
+
+ box_fix( d263 );
+ box_gather( vide, d263 );
+ }
+ break;
+
+ case VLC_CODEC_SVQ3:
{
bo_t *esds = GetSVQ3Tag( p_stream );
}
break;
- case VLC_FOURCC('h','2','6','4'):
+ case VLC_CODEC_H264:
box_gather( vide, GetAvcCTag( p_stream ) );
break;
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" );
}
bo_add_8 ( text, 9 );
- bo_add_mem( text, 9, "Helvetica" );
+ bo_add_mem( text, 9, (uint8_t*)"Helvetica" );
box_fix( text );
}
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 );
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)
/* 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;
}
return stbl;
}
-static int64_t get_timestamp();
+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 )
uint32_t i_movie_timescale = 90000;
int64_t i_movie_duration = 0;
+ int64_t i_timestamp = get_timestamp();
moov = box_new( "moov" );
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
}
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 *
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 *
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;
}
- fprintf( stderr, "%dx%d -> %dx%d a=%d/%d=%f\n",
- p_stream->fmt.video.i_width, p_stream->fmt.video.i_height,
- i_width, p_stream->fmt.video.i_height,
- p_stream->fmt.video.i_aspect, VOUT_ASPECT_FACTOR,
- (float)p_stream->fmt.video.i_aspect/(float)VOUT_ASPECT_FACTOR );
// width (presentation)
bo_add_32be( tkhd, i_width );
// height(presentation)
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;
}
}
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 );
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 );
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
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
bo_add_8( hdlr, 12 ); /* Pascal string for .mov */
if( p_stream->fmt.i_cat == AUDIO_ES )
- bo_add_mem( hdlr, 12, "SoundHandler" );
+ bo_add_mem( hdlr, 12, (uint8_t*)"SoundHandler" );
else if( p_stream->fmt.i_cat == VIDEO_ES )
- bo_add_mem( hdlr, 12, "VideoHandler" );
+ bo_add_mem( hdlr, 12, (uint8_t*)"VideoHandler" );
else
- bo_add_mem( hdlr, 12, "Text Handler" );
+ bo_add_mem( hdlr, 12, (uint8_t*)"Text Handler" );
if( !p_sys->b_mov )
bo_add_8( hdlr, 0 ); /* asciiz string for .mp4, yes that's BRAIN DAMAGED F**K MP4 */
/****************************************************************************/
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
{
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;
}
bo_add_32be( p_bo, i &0xffffffff );
}
-static void bo_add_fourcc( bo_t *p_bo, char *fcc )
+static void bo_add_fourcc( bo_t *p_bo, const char *fcc )
{
bo_add_8( p_bo, fcc[0] );
bo_add_8( p_bo, fcc[1] );
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);
}
}
-static bo_t * box_new( char *fcc )
+static bo_t * box_new( const char *fcc )
{
bo_t *box;
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 );
return box;
}
-static bo_t * box_full_new( char *fcc, uint8_t v, uint32_t f )
+static bo_t * box_full_new( const char *fcc, uint8_t v, uint32_t f )
{
bo_t *box;
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 );
static void box_free( bo_t *box )
{
- if( box->p_buffer )
- {
- free( box->p_buffer );
- }
-
+ free( box->p_buffer );
free( box );
}
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 );
sout_AccessOutWrite( p_mux->p_access, p_buf );
}
-static int64_t get_timestamp()
+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;
}