# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
-#include <vlc_codecs.h>
#ifdef HAVE_TIME_H
#include <time.h>
#endif
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
#include "vlc_meta.h"
/*****************************************************************************
#define SOUT_CFG_PREFIX "sout-mp4-"
vlc_module_begin();
- set_description( _("MP4/MOV muxer") );
+ 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 );
+ true );
set_capability( "sout mux", 5 );
add_shortcut( "mp4" );
add_shortcut( "mov" );
/*****************************************************************************
* 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;
+ bool b_stco64;
/* for spu */
int64_t i_last_dts;
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;
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 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:
/* 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 */
{
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 */
*****************************************************************************/
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;
- }
+ }
}
/*****************************************************************************
*****************************************************************************/
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;
+ int i_stream, i;
for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ )
{
p_data = block_FifoGet( p_input->p_fifo );
if( p_stream->fmt.i_codec == VLC_FOURCC( 'h', '2', '6', '4' ) )
{
- 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' ) )
{
- p_data = ConvertSUBT( p_mux, p_stream, p_data );
+ p_data = ConvertSUBT( p_data );
}
if( p_data == NULL ) goto 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;
}
/*****************************************************************************
*
*****************************************************************************/
-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 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];
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 )
return damr;
}
-static bo_t *GetD263Tag( mp4_stream_t *p_stream )
+static bo_t *GetD263Tag( void )
{
bo_t *d263;
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;
{
case VLC_FOURCC('m','p','4','a'):
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'):
memcpy( fcc, (char*)&p_stream->fmt.i_codec, 4 );
- b_descr = VLC_TRUE;
+ b_descr = true;
break;
case VLC_FOURCC('m','p','g','a'):
else
{
memcpy( fcc, "mp4a", 4 );
- b_descr = VLC_TRUE;
+ b_descr = true;
}
break;
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;
case VLC_FOURCC('H','2','6','3'):
{
- bo_t *d263 = GetD263Tag( p_stream );
+ bo_t *d263 = GetD263Tag();
box_fix( d263 );
box_gather( vide, d263 );
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" );
}
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;
}
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 );
/****************************************************************************/
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 )
{
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 );
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 );
}
projects / vlc / blobdiff