#include <vlc_sout.h>
#include <vlc_block.h>
#include <vlc_codecs.h>
+#include <limits.h>
+#include <vlc_rand.h>
+#include "../demux/xiph.h"
#include <ogg/ogg.h>
set_capability( "sout mux", 10 )
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_MUX )
- add_shortcut( "ogg" )
- add_shortcut( "ogm" )
+ add_shortcut( "ogg", "ogm" )
set_callbacks( Open, Close )
vlc_module_end ()
#define PACKET_IS_SYNCPOINT 0x08
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
{
int32_t i_width;
int32_t i_height;
} oggds_header_video_t;
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
{
int16_t i_channels;
int16_t i_block_align;
} oggds_header_audio_t;
typedef struct
-#ifdef HAVE_ATTRIBUTE_PACKED
- __attribute__((__packed__))
-#endif
{
uint8_t i_packet_type;
} oggds_header_t;
-/*
- * TODO move this function to src/stream_output.c (used by nearly all muxers)
- */
-static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
-{
- mtime_t i_dts = 0;
- int i_stream = -1;
-
- for( int i = 0; i < p_mux->i_nb_inputs; i++ )
- {
- block_fifo_t *p_fifo;
-
- p_fifo = p_mux->pp_inputs[i]->p_fifo;
-
- /* We don't really need to have anything in the SPU fifo */
- if( p_mux->pp_inputs[i]->p_fmt->i_cat == SPU_ES &&
- block_FifoCount( p_fifo ) == 0 ) continue;
-
- if( block_FifoCount( p_fifo ) )
- {
- block_t *p_buf;
-
- 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;
- }
- }
- else return -1;
-
- }
- if( pi_stream ) *pi_stream = i_stream;
- if( pi_dts ) *pi_dts = i_dts;
- return i_stream;
-}
-
/*****************************************************************************
* Definitions of structures and functions used by this plugins
*****************************************************************************/
/* First serial number is random.
* (Done like this because on win32 you need to seed the random number
* generator once per thread). */
- srand( (unsigned int)time( NULL ) );
- p_sys->i_next_serial_no = rand();
+ uint32_t r;
+ vlc_rand_bytes(&r, sizeof(r));
+ p_sys->i_next_serial_no = r & INT_MAX;
return VLC_SUCCESS;
}
memcpy( p_stream->p_oggds_header->sub_type,
&p_stream->i_fourcc, 4 );
}
- SetDWLE( &p_stream->p_oggds_header->i_size,
- sizeof( oggds_header_t ) - 1 );
- SetQWLE( &p_stream->p_oggds_header->i_time_unit,
+ p_stream->p_oggds_header->i_size = 0 ;
+ p_stream->p_oggds_header->i_time_unit =
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 ); /* ??? */
- SetDWLE( &p_stream->p_oggds_header->i_buffer_size, 1024*1024 );
- SetWLE( &p_stream->p_oggds_header->i_bits_per_sample, 0 );
- SetDWLE( &p_stream->p_oggds_header->header.video.i_width,
- p_input->p_fmt->video.i_width );
- SetDWLE( &p_stream->p_oggds_header->header.video.i_height,
- p_input->p_fmt->video.i_height );
+ (int64_t)p_input->p_fmt->video.i_frame_rate;
+ p_stream->p_oggds_header->i_samples_per_unit = 1;
+ p_stream->p_oggds_header->i_default_len = 1 ; /* ??? */
+ p_stream->p_oggds_header->i_buffer_size = 1024*1024;
+ p_stream->p_oggds_header->i_bits_per_sample = 0;
+ p_stream->p_oggds_header->header.video.i_width = p_input->p_fmt->video.i_width;
+ p_stream->p_oggds_header->header.video.i_height = p_input->p_fmt->video.i_height;
msg_Dbg( p_mux, "%4.4s stream", (char *)&p_stream->i_fourcc );
break;
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 + p_input->p_fmt->i_extra );
+ p_stream->p_oggds_header->i_size = p_input->p_fmt->i_extra;
if( p_input->p_fmt->i_extra )
{
memcpy( p_stream->p_oggds_header->stream_type, "audio", 5 );
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, 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,
- p_input->p_fmt->audio.i_rate );
- SetWLE( &p_stream->p_oggds_header->i_bits_per_sample,
- p_input->p_fmt->audio.i_bitspersample );
- SetDWLE( &p_stream->p_oggds_header->header.audio.i_channels,
- p_input->p_fmt->audio.i_channels );
- SetDWLE( &p_stream->p_oggds_header->header.audio.i_block_align,
- p_input->p_fmt->audio.i_blockalign );
- SetDWLE( &p_stream->p_oggds_header->header.audio.i_avgbytespersec,
- p_input->p_fmt->i_bitrate / 8);
+ char buf[5];
+ snprintf( buf, sizeof(buf), "%"PRIx16, i_tag );
+ strncpy( p_stream->p_oggds_header->sub_type, buf, 4 );
+
+ p_stream->p_oggds_header->i_time_unit = INT64_C(10000000);
+ p_stream->p_oggds_header->i_default_len = 1;
+ p_stream->p_oggds_header->i_buffer_size = 30*1024 ;
+ p_stream->p_oggds_header->i_samples_per_unit = p_input->p_fmt->audio.i_rate;
+ p_stream->p_oggds_header->i_bits_per_sample = p_input->p_fmt->audio.i_bitspersample;
+ p_stream->p_oggds_header->header.audio.i_channels = p_input->p_fmt->audio.i_channels;
+ p_stream->p_oggds_header->header.audio.i_block_align = p_input->p_fmt->audio.i_blockalign;
+ p_stream->p_oggds_header->header.audio.i_avgbytespersec = p_input->p_fmt->i_bitrate / 8;
msg_Dbg( p_mux, "%4.4s stream", (char *)&p_stream->i_fourcc );
break;
}
while( pager( p_os, &og ) )
{
/* Flush all data */
- p_og = block_New( p_mux, og.header_len + og.body_len );
+ p_og = block_Alloc( og.header_len + og.body_len );
memcpy( p_og->p_buffer, og.header, og.header_len );
memcpy( p_og->p_buffer + og.header_len, og.body, og.body_len );
return OggStreamGetPage( p_mux, p_os, i_pts, false );
}
+static int32_t OggFillDsHeader( uint8_t *p_buffer, oggds_header_t *p_oggds_header, int i_cat )
+{
+ int index = 0;
+ p_buffer[index] = p_oggds_header->i_packet_type;
+ index++;
+ memcpy( &p_buffer[index], p_oggds_header->stream_type, sizeof(p_oggds_header->stream_type) );
+ index += sizeof(p_oggds_header->stream_type);
+ memcpy(&p_buffer[index], p_oggds_header->sub_type, sizeof(p_oggds_header->sub_type) );
+ index += sizeof(p_oggds_header->sub_type);
+
+ /* The size is filled at the end */
+ uint8_t *p_isize = &p_buffer[index];
+ index += 4;
+
+ SetQWLE( &p_buffer[index], p_oggds_header->i_time_unit );
+ index += 8;
+ SetQWLE( &p_buffer[index], p_oggds_header->i_samples_per_unit );
+ index += 8;
+ SetDWLE( &p_buffer[index], p_oggds_header->i_default_len );
+ index += 4;
+ SetDWLE( &p_buffer[index], p_oggds_header->i_buffer_size );
+ index += 4;
+ SetWLE( &p_buffer[index], p_oggds_header->i_bits_per_sample );
+ index += 2;
+ SetWLE( &p_buffer[index], p_oggds_header->i_padding_0 );
+ index += 2;
+ /* audio or video */
+ switch( i_cat )
+ {
+ case VIDEO_ES:
+ SetDWLE( &p_buffer[index], p_oggds_header->header.video.i_width );
+ SetDWLE( &p_buffer[index+4], p_oggds_header->header.video.i_height );
+ break;
+ case AUDIO_ES:
+ SetWLE( &p_buffer[index], p_oggds_header->header.audio.i_channels );
+ SetWLE( &p_buffer[index+2], p_oggds_header->header.audio.i_block_align );
+ SetDWLE( &p_buffer[index+4], p_oggds_header->header.audio.i_avgbytespersec );
+ break;
+ }
+ index += 8;
+ SetDWLE( &p_buffer[index], p_oggds_header->i_padding_1 );
+ index += 4;
+
+ /* extra header */
+ if( p_oggds_header->i_size > 0 )
+ {
+ memcpy( &p_buffer[index], p_oggds_header + sizeof(*p_oggds_header), p_oggds_header->i_size );
+ index += p_oggds_header->i_size;
+ }
+
+ SetDWLE( p_isize, index-1 );
+ return index;
+}
+
static block_t *OggCreateHeader( sout_mux_t *p_mux )
{
block_t *p_hdr = NULL;
block_t *p_og = NULL;
ogg_packet op;
- uint8_t *p_extra;
- int i, i_extra;
+ int i;
/* Write header for each stream. All b_o_s (beginning of stream) packets
* must appear first in the ogg stream so we take care of them first. */
p_stream->i_fourcc == VLC_CODEC_THEORA )
{
/* First packet in order: vorbis/speex/theora info */
- p_extra = p_input->p_fmt->p_extra;
- i_extra = p_input->p_fmt->i_extra;
-
- op.bytes = *(p_extra++) << 8;
- op.bytes |= (*(p_extra++) & 0xFF);
- op.packet = p_extra;
- i_extra -= (op.bytes + 2);
- if( i_extra < 0 )
+ unsigned pi_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_count;
+ if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
+ p_input->p_fmt->i_extra, p_input->p_fmt->p_extra ) )
{
- msg_Err( p_mux, "header data corrupted");
- op.bytes += i_extra;
+ i_count = 0;
+ pi_size[0] = 0;
+ pp_data[0] = NULL;
}
+ op.bytes = pi_size[0];
+ op.packet = pp_data[0];
+ if( pi_size[0] <= 0 )
+ msg_Err( p_mux, "header data corrupted");
+
op.b_o_s = 1;
op.e_o_s = 0;
op.granulepos = 0;
p_stream->i_keyframe_granule_shift =
( (op.packet[40] & 0x03) << 3 ) | ( (op.packet[41] & 0xe0) >> 5 );
}
+
+ for( unsigned i = 0; i < i_count; i++ )
+ free( pp_data[i] );
}
else if( p_stream->i_fourcc == VLC_CODEC_DIRAC )
{
else if( p_stream->p_oggds_header )
{
/* ds header */
- op.packet = (uint8_t*)p_stream->p_oggds_header;
- op.bytes = p_stream->p_oggds_header->i_size + 1;
+ op.packet = malloc( sizeof(*p_stream->p_oggds_header) + p_stream->p_oggds_header->i_size );
+ if( !op.packet )
+ return NULL;
+ op.bytes = OggFillDsHeader( op.packet, p_stream->p_oggds_header, p_stream->i_cat );
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 );
+ free( op.packet );
}
block_ChainAppend( &p_hdr, p_og );
p_stream->i_fourcc == VLC_CODEC_SPEEX ||
p_stream->i_fourcc == VLC_CODEC_THEORA )
{
+ unsigned pi_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_count;
+ if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
+ p_input->p_fmt->i_extra, p_input->p_fmt->p_extra ) )
+ i_count = 0;
+
/* Special case, headers are already there in the incoming stream.
* We need to gather them an mark them as headers. */
- int j = 2;
-
- if( p_stream->i_fourcc == VLC_CODEC_SPEEX ) j = 1;
-
- p_extra = p_input->p_fmt->p_extra;
- i_extra = p_input->p_fmt->i_extra;
-
- /* Skip 1 header */
- op.bytes = *(p_extra++) << 8;
- op.bytes |= (*(p_extra++) & 0xFF);
- op.packet = p_extra;
- p_extra += op.bytes;
- i_extra -= (op.bytes + 2);
-
- while( j-- )
+ for( unsigned i = 1; i < i_count; i++ )
{
- op.bytes = *(p_extra++) << 8;
- op.bytes |= (*(p_extra++) & 0xFF);
- op.packet = p_extra;
- p_extra += op.bytes;
- i_extra -= (op.bytes + 2);
- if( i_extra < 0 )
- {
+ op.bytes = pi_size[i];
+ op.packet = pp_data[i];
+ if( pi_size[i] <= 0 )
msg_Err( p_mux, "header data corrupted");
- op.bytes += i_extra;
- }
op.b_o_s = 0;
op.e_o_s = 0;
op.packetno = p_stream->i_packet_no++;
ogg_stream_packetin( &p_stream->os, &op );
- if( j == 0 )
+ if( i == i_count - 1 )
p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
else
p_og = OggStreamPageOut( p_mux, &p_stream->os, 0 );
if( p_og )
block_ChainAppend( &p_hdr, p_og );
}
+ for( unsigned i = 0; i < i_count; i++ )
+ free( pp_data[i] );
}
else if( p_stream->i_fourcc != VLC_CODEC_FLAC &&
p_stream->i_fourcc != VLC_CODEC_DIRAC )
{
sout_mux_sys_t *p_sys = p_mux->p_sys;
block_t *p_og = NULL;
- int i_stream;
mtime_t i_dts;
if( p_sys->i_add_streams || p_sys->i_del_streams )
{
/* Open new ogg stream */
- if( MuxGetStream( p_mux, &i_stream, &i_dts) < 0 )
+ if( sout_MuxGetStream( p_mux, 1, &i_dts) < 0 )
{
msg_Dbg( p_mux, "waiting for data..." );
return VLC_SUCCESS;
p_sys->i_streams = p_mux->i_nb_inputs;
p_sys->i_del_streams = 0;
p_sys->i_add_streams = 0;
- block_ChainAppend( &p_og, OggCreateHeader( p_mux ) );
+ block_t *p_header = OggCreateHeader( p_mux );
+ if( !p_header )
+ return VLC_ENOMEM;
+ block_ChainAppend( &p_og, p_header );
/* Write header and/or footer */
OggSetDate( p_og, i_dts, 0 );
for( ;; )
{
- if( MuxGetStream( p_mux, &i_stream, 0 ) < 0 ) return VLC_SUCCESS;
+ int i_stream = sout_MuxGetStream( p_mux, 1, NULL );
+ if( i_stream < 0 )
+ return VLC_SUCCESS;
MuxBlock( p_mux, p_mux->pp_inputs[i_stream] );
}
/* granulepos is in millisec */
op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) / 1000;
}
+ else
+ return VLC_EGENERIC;
p_stream->u_last_granulepos = op.granulepos;
ogg_stream_packetin( &p_stream->os, &op );
projects / vlc / blobdiff