# 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>
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-vlc_module_begin();
- set_description( _("Ogg/OGM muxer") );
- set_capability( "sout mux", 10 );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_MUX );
- add_shortcut( "ogg" );
- add_shortcut( "ogm" );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Ogg/OGM muxer") )
+ set_capability( "sout mux", 10 )
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_MUX )
+ add_shortcut( "ogg" )
+ add_shortcut( "ogm" )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
int i_packet_no;
int i_serial_no;
int i_keyframe_granule_shift; /* Theora only */
+ int i_last_keyframe; /* dirac and eventually theora */
ogg_stream_state os;
oggds_header_t *p_oggds_header;
msg_Info( p_mux, "Open" );
p_sys = malloc( sizeof( sout_mux_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
p_sys->i_streams = 0;
p_sys->i_add_streams = 0;
p_sys->i_del_streams = 0;
static int Control( sout_mux_t *p_mux, int i_query, va_list args )
{
VLC_UNUSED(p_mux);
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
char **ppsz;
switch( i_query )
{
case MUX_CAN_ADD_STREAM_WHILE_MUXING:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- *pb_bool = VLC_TRUE;
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = 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;
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = true;
return VLC_SUCCESS;
case MUX_GET_MIME:
msg_Dbg( p_mux, "adding input" );
- p_input->p_sys = p_stream = malloc( sizeof( ogg_stream_t ) );
+ p_input->p_sys = p_stream = calloc( 1, sizeof( ogg_stream_t ) );
+ if( !p_stream )
+ return VLC_ENOMEM;
p_stream->i_cat = p_input->p_fmt->i_cat;
p_stream->i_fourcc = p_input->p_fmt->i_codec;
case VLC_FOURCC( 'W', 'M', 'V', '2' ):
case VLC_FOURCC( 'W', 'M', 'V', '3' ):
case VLC_FOURCC( 'S', 'N', 'O', 'W' ):
- case VLC_FOURCC( 'd', 'r', 'a', 'c' ):
p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) );
+ if( !p_stream->p_oggds_header )
+ {
+ free( p_stream );
+ return VLC_ENOMEM;
+ }
memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) );
p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER;
SetDWLE( &p_stream->p_oggds_header->i_size,
sizeof( oggds_header_t ) - 1 );
SetQWLE( &p_stream->p_oggds_header->i_time_unit,
- I64C(10000000) * p_input->p_fmt->video.i_frame_rate_base /
+ INT64_C(10000000) * p_input->p_fmt->video.i_frame_rate_base /
(int64_t)p_input->p_fmt->video.i_frame_rate );
SetQWLE( &p_stream->p_oggds_header->i_samples_per_unit, 1 );
SetDWLE( &p_stream->p_oggds_header->i_default_len, 1 ); /* ??? */
msg_Dbg( p_mux, "%4.4s stream", (char *)&p_stream->i_fourcc );
break;
+ case VLC_FOURCC( 'd', 'r', 'a', 'c' ):
+ msg_Dbg( p_mux, "dirac stream" );
+ break;
+
case VLC_FOURCC( 't', 'h', 'e', 'o' ):
msg_Dbg( p_mux, "theora stream" );
break;
p_stream->p_oggds_header =
malloc( sizeof(oggds_header_t) + p_input->p_fmt->i_extra );
+ if( !p_stream->p_oggds_header )
+ {
+ free( p_stream );
+ return VLC_ENOMEM;
+ }
memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) );
p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER;
memset( p_stream->p_oggds_header->sub_type, 0, 4 );
sprintf( p_stream->p_oggds_header->sub_type, "%-x", i_tag );
- SetQWLE( &p_stream->p_oggds_header->i_time_unit, I64C(10000000) );
+ SetQWLE( &p_stream->p_oggds_header->i_time_unit, INT64_C(10000000) );
SetDWLE( &p_stream->p_oggds_header->i_default_len, 1 );
SetDWLE( &p_stream->p_oggds_header->i_buffer_size, 30*1024 );
SetQWLE( &p_stream->p_oggds_header->i_samples_per_unit,
{
case VLC_FOURCC( 's', 'u','b', 't' ):
p_stream->p_oggds_header = malloc( sizeof(oggds_header_t) );
+ if( !p_stream->p_oggds_header )
+ {
+ free( p_stream );
+ return VLC_ENOMEM;
+ }
memset( p_stream->p_oggds_header, 0, sizeof(oggds_header_t) );
p_stream->p_oggds_header->i_packet_type = PACKET_TYPE_HEADER;
return VLC_EGENERIC;
}
- p_stream->b_new = VLC_TRUE;
+ p_stream->b_new = true;
p_sys->i_add_streams++;
static block_t *OggStreamFlush( sout_mux_t *p_mux,
ogg_stream_state *p_os, mtime_t i_pts )
{
+ (void)p_mux;
block_t *p_og, *p_og_first = NULL;
ogg_page og;
static block_t *OggStreamPageOut( sout_mux_t *p_mux,
ogg_stream_state *p_os, mtime_t i_pts )
{
+ (void)p_mux;
block_t *p_og, *p_og_first = NULL;
ogg_page og;
{
sout_input_t *p_input = p_mux->pp_inputs[i];
ogg_stream_t *p_stream = (ogg_stream_t*)p_input->p_sys;
- p_stream->b_new = VLC_FALSE;
+ p_stream->b_new = false;
msg_Dbg( p_mux, "creating header for %4.4s",
(char *)&p_stream->i_fourcc );
}
}
}
+ else if( p_stream->i_fourcc == VLC_FOURCC( 'd', 'r', 'a', 'c' ) )
+ {
+ op.packet = p_input->p_fmt->p_extra;
+ op.bytes = p_input->p_fmt->i_extra;
+ op.b_o_s = 1;
+ op.e_o_s = 0;
+ op.granulepos = ~0;
+ op.packetno = p_stream->i_packet_no++;
+ ogg_stream_packetin( &p_stream->os, &op );
+ p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
+ }
else if( p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) )
{
/* flac stream marker (yeah, only that in the 1st packet) */
block_ChainAppend( &p_hdr, p_og );
}
}
- else if( p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) )
+ else if( p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) &&
+ p_stream->i_fourcc != VLC_FOURCC( 'd', 'r', 'a', 'c' ) )
{
uint8_t com[128];
int i_com;
{
i_count++;
}
+
+ if( i_count == 0 ) return; /* ignore. */
+
i_delta = i_length / i_count;
for( p_tmp = p_og; p_tmp != NULL; p_tmp = p_tmp->p_next )
if( p_stream->i_fourcc != VLC_FOURCC( 'v', 'o', 'r', 'b' ) &&
p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) &&
p_stream->i_fourcc != VLC_FOURCC( 's', 'p', 'x', ' ' ) &&
- p_stream->i_fourcc != VLC_FOURCC( 't', 'h', 'e', 'o' ) )
+ p_stream->i_fourcc != VLC_FOURCC( 't', 'h', 'e', 'o' ) &&
+ p_stream->i_fourcc != VLC_FOURCC( 'd', 'r', 'a', 'c' ) )
{
p_data = block_Realloc( p_data, 1, p_data->i_buffer );
p_data->p_buffer[0] = PACKET_IS_SYNCPOINT; // FIXME
/* number of sample from begining + current packet */
op.granulepos =
( p_data->i_dts - p_sys->i_start_dts + p_data->i_length ) *
- (mtime_t)p_input->p_fmt->audio.i_rate / I64C(1000000);
+ (mtime_t)p_input->p_fmt->audio.i_rate / INT64_C(1000000);
}
else if( p_stream->p_oggds_header )
{
/* number of sample from begining */
op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) *
- p_stream->p_oggds_header->i_samples_per_unit / I64C(1000000);
+ p_stream->p_oggds_header->i_samples_per_unit / INT64_C(1000000);
}
}
else if( p_stream->i_cat == VIDEO_ES )
op.granulepos = ( ( p_data->i_dts - p_sys->i_start_dts ) *
p_input->p_fmt->video.i_frame_rate /
p_input->p_fmt->video.i_frame_rate_base /
- I64C(1000000) ) << p_stream->i_keyframe_granule_shift;
+ INT64_C(1000000) ) << p_stream->i_keyframe_granule_shift;
+ }
+ else if( p_stream->i_fourcc == VLC_FOURCC( 'd', 'r', 'a', 'c' ) )
+ {
+ mtime_t dt = (p_data->i_dts - p_sys->i_start_dts + 1)
+ * p_input->p_fmt->video.i_frame_rate *2
+ / p_input->p_fmt->video.i_frame_rate_base
+ / INT64_C(1000000);
+ mtime_t delay = (p_data->i_pts - p_data->i_dts + 1)
+ * p_input->p_fmt->video.i_frame_rate *2
+ / p_input->p_fmt->video.i_frame_rate_base
+ / INT64_C(1000000);
+ if( p_data->i_flags & BLOCK_FLAG_TYPE_I )
+ p_stream->i_last_keyframe = dt;
+ mtime_t dist = dt - p_stream->i_last_keyframe;
+ op.granulepos = dt << 31 | (dist&0xff00) << 14
+ | (delay&0x1fff) << 9 | (dist&0xff);
}
else if( p_stream->p_oggds_header )
- op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) * I64C(10) /
+ op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) * INT64_C(10) /
p_stream->p_oggds_header->i_time_unit;
}
else if( p_stream->i_cat == SPU_ES )
{
- /* granulepos is in milisec */
+ /* granulepos is in millisec */
op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) / 1000;
}
ogg_stream_packetin( &p_stream->os, &op );
if( p_stream->i_cat == SPU_ES ||
- p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) )
+ p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ||
+ p_stream->i_fourcc == VLC_FOURCC( 'd', 'r', 'a', 'c' ) )
{
/* Subtitles or Speex packets are quite small so they
* need to be flushed to be sent on time */
+ /* The OggDirac mapping suggests ever so strongly that a
+ * page flush occurs after each OggDirac packet, so to make
+ * the timestamps unambiguous */
p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts );
}
else
projects / vlc / blobdiff