/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
#include <vlc_sout.h>
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:
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;
*****************************************************************************/
static int Control( sout_mux_t *p_mux, int i_query, va_list args )
{
+ VLC_UNUSED(p_mux);
vlc_bool_t *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 = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
+ *pb_bool = VLC_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 = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
+ *pb_bool = VLC_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++ )
{
block_fifo_t *p_fifo = p_mux->pp_inputs[i]->p_fifo;
block_t *p_buf;
- if( p_fifo->i_depth <= 1 )
+ if( block_FifoCount( p_fifo ) <= 1 )
{
if( p_mux->pp_inputs[i]->p_fmt->i_cat != SPU_ES )
{
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;
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;
/*****************************************************************************
*
*****************************************************************************/
-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];
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
return damr;
}
-static bo_t *GetD263Tag( mp4_stream_t *p_stream )
+static bo_t *GetD263Tag( void )
{
bo_t *d263;
uint8_t *p_buffer = p_stream->fmt.p_extra;
int i_buffer = p_stream->fmt.i_extra;
- while( i_buffer > 4 &&
+ while( i_buffer > 4 &&
p_buffer[0] == 0 && p_buffer[1] == 0 &&
p_buffer[2] == 0 && p_buffer[3] == 1 )
{
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++)
{
- if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 &&
+ if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 &&
p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
{
/* we found another startcode */
i_startcode = i_offset;
break;
- }
+ }
}
i_size = i_startcode ? i_startcode : i_buffer;
if( i_nal_type == 7 )
p_buffer += i_size;
}
}
-
+
/* FIXME use better value */
avcC = box_new( "avcC" );
bo_add_8( avcC, 1 ); /* configuration version */
{
#define ADD_META_BOX( type, box_string ) { \
bo_t *box = NULL; \
- if( p_meta->psz_##type ) box = box_new( "\251" box_string ); \
+ if( vlc_meta_Get( p_meta, vlc_meta_##type ) ) box = box_new( "\251" box_string ); \
if( box ) \
{ \
- bo_add_16be( box, strlen( p_meta->psz_##type ) ); \
+ bo_add_16be( box, strlen( vlc_meta_Get( p_meta, vlc_meta_##type ) )); \
bo_add_16be( box, 0 ); \
- bo_add_mem( box, strlen( p_meta->psz_##type ), \
- (uint8_t*)(p_meta->psz_##type ) ); \
+ 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" );
+ 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
}
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 );
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);