* asf.c
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: asf.c,v 1.2 2003/08/24 22:20:43 fenrir Exp $
+ * $Id: asf.c,v 1.6 2003/08/29 01:11:43 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
set_description( _("Asf muxer") );
set_capability( "sout mux", 5 );
add_shortcut( "asf" );
+ add_shortcut( "asfh" );
set_callbacks( Open, Close );
vlc_module_end();
typedef struct
{
- int i_id;
- int i_cat;
- int i_sequence;
+ int i_id;
+ int i_cat;
- int i_extra;
- uint8_t *p_extra;
+ /* codec informations */
+ uint16_t i_tag; /* for audio */
+ vlc_fourcc_t i_fourcc; /* for video */
+ char *psz_name; /* codec name */
+
+ int i_sequence;
+
+ int i_extra;
+ uint8_t *p_extra;
} asf_track_t;
struct sout_mux_sys_t
int i_pk_used;
int i_pk_frame;
mtime_t i_pk_dts;
+
+ vlc_bool_t b_asf_http;
+ int i_seq;
};
static int MuxGetStream( sout_mux_t *, int *pi_stream, mtime_t *pi_dts );
static sout_buffer_t *asf_header_create( sout_mux_t *, vlc_bool_t b_broadcast );
static sout_buffer_t *asf_packet_create( sout_mux_t *,
asf_track_t *, sout_buffer_t * );
+static sout_buffer_t *asf_stream_end_create( sout_mux_t *);
typedef struct
{
static void bo_addle_u64( bo_t *, uint64_t );
static void bo_add_mem ( bo_t *, uint8_t *, int );
+static void bo_addle_str16( bo_t *, char * );
/*****************************************************************************
* Open:
p_mux->pf_mux = Mux;
p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) );
+ p_sys->b_asf_http = p_mux->psz_mux && !strcmp( p_mux->psz_mux, "asfh" );
+ if( p_sys->b_asf_http )
+ {
+ msg_Dbg( p_mux, "creating asf stream to be used with mmsh" );
+ }
p_sys->pk = NULL;
p_sys->i_pk_used = 0;
p_sys->i_pk_frame = 0;
p_sys->i_dts_first = -1;
p_sys->i_dts_last = 0;
p_sys->i_bitrate = 0;
+ p_sys->i_seq = 0;
p_sys->b_write_header = VLC_TRUE;
p_sys->i_track = 1;
p_sys->fid.v4[i] = ( (uint64_t)rand() << 8 ) / RAND_MAX;
}
+
return VLC_SUCCESS;
}
{
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->p_sys;
+ sout_buffer_t *out;
int i;
msg_Dbg( p_mux, "Asf muxer closed" );
+ if( ( out = asf_stream_end_create( p_mux ) ) )
+ {
+ sout_AccessOutWrite( p_mux->p_access, out );
+ }
+
/* rewrite header */
if( !sout_AccessOutSeek( p_mux->p_access, 0 ) )
{
- sout_buffer_t *h = asf_header_create( p_mux, VLC_FALSE );
- sout_AccessOutWrite( p_mux->p_access, h );
+ out = asf_header_create( p_mux, VLC_FALSE );
+ sout_AccessOutWrite( p_mux->p_access, out );
}
for( i = 1; i < p_sys->i_track; i++ )
{
case AUDIO_ES:
{
- uint16_t i_tag;
int i_blockalign = p_input->p_fmt->i_block_align;
int i_bitspersample = 0;
+ int i_extra = 0;
switch( p_input->p_fmt->i_fourcc )
{
case VLC_FOURCC( 'a', '5', '2', ' ' ):
- i_tag = WAVE_FORMAT_A52;
+ tk->i_tag = WAVE_FORMAT_A52;
+ tk->psz_name = "A/52";
break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
- i_tag = WAVE_FORMAT_MPEGLAYER3;
+#if 1
+ tk->psz_name = "MPEG Audio Layer 3";
+ tk->i_tag = WAVE_FORMAT_MPEGLAYER3;
+ i_blockalign = 1;
+ i_extra = 12;
break;
+#else
+ tk->psz_name = "MPEG Audio Layer 1/2";
+ tk->i_tag = WAVE_FORMAT_MPEG;
+ i_blockalign = 1;
+ i_extra = 22;
+ break;
+#endif
case VLC_FOURCC( 'w', 'm', 'a', '1' ):
- i_tag = WAVE_FORMAT_WMA1;
+ tk->psz_name = "Windows Media Audio 1";
+ tk->i_tag = WAVE_FORMAT_WMA1;
break;
case VLC_FOURCC( 'w', 'm', 'a', '2' ):
- i_tag = WAVE_FORMAT_WMA2;
+ tk->psz_name = "Windows Media Audio 2";
+ tk->i_tag = WAVE_FORMAT_WMA2;
break;
case VLC_FOURCC( 'w', 'm', 'a', '3' ):
- i_tag = WAVE_FORMAT_WMA3;
+ tk->psz_name = "Windows Media Audio 3";
+ tk->i_tag = WAVE_FORMAT_WMA3;
break;
/* raw codec */
case VLC_FOURCC( 'u', '8', ' ', ' ' ):
- i_tag = WAVE_FORMAT_PCM;
+ tk->psz_name = "Raw audio 8bits";
+ tk->i_tag = WAVE_FORMAT_PCM;
i_blockalign= p_input->p_fmt->i_channels;
i_bitspersample = 8;
break;
case VLC_FOURCC( 's', '1', '6', 'l' ):
- i_tag = WAVE_FORMAT_PCM;
+ tk->psz_name = "Raw audio 16bits";
+ tk->i_tag = WAVE_FORMAT_PCM;
i_blockalign= 2 * p_input->p_fmt->i_channels;
i_bitspersample = 16;
break;
case VLC_FOURCC( 's', '2', '4', 'l' ):
- i_tag = WAVE_FORMAT_PCM;
+ tk->psz_name = "Raw audio 24bits";
+ tk->i_tag = WAVE_FORMAT_PCM;
i_blockalign= 3 * p_input->p_fmt->i_channels;
i_bitspersample = 24;
break;
case VLC_FOURCC( 's', '3', '2', 'l' ):
- i_tag = WAVE_FORMAT_PCM;
+ tk->psz_name = "Raw audio 32bits";
+ tk->i_tag = WAVE_FORMAT_PCM;
i_blockalign= 4 * p_input->p_fmt->i_channels;
i_bitspersample = 32;
break;
return VLC_EGENERIC;
}
- tk->i_extra = sizeof( WAVEFORMATEX ) + p_input->p_fmt->i_extra_data;
+
+ tk->i_extra = sizeof( WAVEFORMATEX ) +
+ p_input->p_fmt->i_extra_data + i_extra;
tk->p_extra = malloc( tk->i_extra );
bo_init( &bo, tk->p_extra, tk->i_extra );
- bo_addle_u16( &bo, i_tag );
+ bo_addle_u16( &bo, tk->i_tag );
bo_addle_u16( &bo, p_input->p_fmt->i_channels );
bo_addle_u32( &bo, p_input->p_fmt->i_sample_rate );
bo_addle_u32( &bo, p_input->p_fmt->i_bitrate / 8 );
bo_addle_u16( &bo, i_blockalign );
bo_addle_u16( &bo, i_bitspersample );
- bo_addle_u16( &bo, p_input->p_fmt->i_extra_data );
if( p_input->p_fmt->i_extra_data > 0 )
{
+ bo_addle_u16( &bo, p_input->p_fmt->i_extra_data );
bo_add_mem ( &bo, p_input->p_fmt->p_extra_data,
p_input->p_fmt->i_extra_data );
}
+ else
+ {
+ bo_addle_u16( &bo, i_extra );
+ if( tk->i_tag == WAVE_FORMAT_MPEGLAYER3 )
+ {
+ msg_Dbg( p_mux, "adding mp3 header" );
+ bo_addle_u16( &bo, 1 ); /* wId */
+ bo_addle_u32( &bo, 2 ); /* fdwFlags */
+ bo_addle_u16( &bo, 1152 ); /* nBlockSize */
+ bo_addle_u16( &bo, 1 ); /* nFramesPerBlock */
+ bo_addle_u16( &bo, 1393 ); /* nCodecDelay */
+ }
+ else if( tk->i_tag == WAVE_FORMAT_MPEG )
+ {
+ msg_Dbg( p_mux, "adding mp2 header" );
+ bo_addle_u16( &bo, 2 ); /* fwHeadLayer */
+ bo_addle_u32( &bo, p_input->p_fmt->i_bitrate );
+ bo_addle_u16( &bo, p_input->p_fmt->i_channels == 2 ?1:8 );
+ bo_addle_u16( &bo, 0 ); /* fwHeadModeExt */
+ bo_addle_u16( &bo, 1 ); /* wHeadEmphasis */
+ bo_addle_u16( &bo, 16 ); /* fwHeadFlags */
+ bo_addle_u32( &bo, 0 ); /* dwPTSLow */
+ bo_addle_u32( &bo, 0 ); /* dwPTSHigh */
+ }
+ }
+
if( p_input->p_fmt->i_bitrate > 24000 )
{
p_sys->i_bitrate += p_input->p_fmt->i_bitrate;
bo_addle_u16( &bo, 24 );
if( p_input->p_fmt->i_fourcc == VLC_FOURCC('m','p','4','v') )
{
- bo_add_mem( &bo, "MP4S", 4 );
+ tk->psz_name = "MPEG-4 Video";
+ tk->i_fourcc = VLC_FOURCC( 'M', 'P', '4', 'S' );
}
else if( p_input->p_fmt->i_fourcc == VLC_FOURCC('D','I','V','3') )
{
- bo_add_mem( &bo, "MP43", 4 );
+ tk->psz_name = "MSMPEG-4 V3 Video";
+ tk->i_fourcc = VLC_FOURCC( 'M', 'P', '4', '3' );
+ }
+ else if( p_input->p_fmt->i_fourcc == VLC_FOURCC('D','I','V','2') )
+ {
+ tk->psz_name = "MSMPEG-4 V2 Video";
+ tk->i_fourcc = VLC_FOURCC( 'M', 'P', '4', '2' );
+ }
+ else if( p_input->p_fmt->i_fourcc == VLC_FOURCC('D','I','V','1') )
+ {
+ tk->psz_name = "MSMPEG-4 V1 Video";
+ tk->i_fourcc = VLC_FOURCC( 'M', 'P', 'G', '4' );
+ }
+ else if( p_input->p_fmt->i_fourcc == VLC_FOURCC('W','M','V','1') )
+ {
+ tk->psz_name = "Windows Media Video 1";
+ tk->i_fourcc = VLC_FOURCC( 'W', 'M', 'V', '1' );
+ }
+ else if( p_input->p_fmt->i_fourcc == VLC_FOURCC('W','M','V','2') )
+ {
+ tk->psz_name = "Windows Media Video 2";
+ tk->i_fourcc = VLC_FOURCC( 'W', 'M', 'V', '2' );
}
else
{
- bo_add_mem( &bo, (uint8_t*)&p_input->p_fmt->i_fourcc, 4 );
+ tk->psz_name = "Unknow Video";
+ tk->i_fourcc = p_input->p_fmt->i_fourcc;
}
+ bo_add_mem( &bo, (uint8_t*)&tk->i_fourcc, 4 );
bo_addle_u32( &bo, 0 );
bo_addle_u32( &bo, 0 );
bo_addle_u32( &bo, 0 );
p_input->p_fmt->i_extra_data );
}
- p_sys->i_bitrate += 2000000;
+ if( p_input->p_fmt->i_bitrate > 50000 )
+ {
+ p_sys->i_bitrate += p_input->p_fmt->i_bitrate;
+ }
+ else
+ {
+ p_sys->i_bitrate += 1000000;
+ }
break;
}
default:
p_bo->i_buffer += i_size;
}
+static void bo_addle_str16( bo_t *bo, char *str )
+{
+ bo_addle_u16( bo, strlen( str ) + 1 );
+ for( ;; )
+ {
+ uint16_t c;
+
+ c = (uint8_t)*str++;
+ bo_addle_u16( bo, c );
+ if( c == '\0' )
+ {
+ break;
+ }
+ }
+}
+
/****************************************************************************
* guid
****************************************************************************/
0x11cf,
{ 0x8E, 0xE6,0x00, 0xC0, 0x0C ,0x20, 0x53, 0x65 }
};
+static const guid_t asf_object_comment_guid =
+{
+ 0x86D15240,
+ 0x311D,
+ 0x11D0,
+ { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 }
+};
+static const guid_t asf_object_comment_reserved_guid =
+{
+ 0x86D15241,
+ 0x311D,
+ 0x11D0,
+ { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 }
+};
+
+static void asf_chunk_add( bo_t *bo,
+ int i_type, int i_len, int i_flags, int i_seq )
+{
+ bo_addle_u16( bo, i_type );
+ bo_addle_u16( bo, i_len + 8 );
+ bo_addle_u32( bo, i_seq );
+ bo_addle_u16( bo, i_flags );
+ bo_addle_u16( bo, i_len + 8 );
+}
static sout_buffer_t *asf_header_create( sout_mux_t *p_mux,
vlc_bool_t b_broadcast )
mtime_t i_duration = 0;
int i_size;
+ int i_ci_size;
sout_buffer_t *out;
bo_t bo;
int i;
/* calculate header size */
i_size = 30 + 104 + 46;
+ i_ci_size = 44;
for( i = 1; i < p_sys->i_track; i++ )
{
i_size += 78 + p_sys->track[i].i_extra;
+ i_ci_size += 8 + 2 * strlen( p_sys->track[i].psz_name );
+ if( p_sys->track[i].i_cat == AUDIO_ES )
+ {
+ i_ci_size += 4;
+ }
+ else if( p_sys->track[i].i_cat == VIDEO_ES )
+ {
+ i_ci_size += 6;
+ }
}
- out = sout_BufferNew( p_mux->p_sout, i_size + 50 );
- bo_init( &bo, out->p_buffer, i_size + 50 );
+ i_size += i_ci_size;
+
+ if( p_sys->b_asf_http )
+ {
+ out = sout_BufferNew( p_mux->p_sout, i_size + 50 + 12 );
+ bo_init( &bo, out->p_buffer, i_size + 50 + 12 );
+ asf_chunk_add( &bo, 0x4824, i_size + 50, 0xc00, p_sys->i_seq++ );
+ }
+ else
+ {
+ out = sout_BufferNew( p_mux->p_sout, i_size + 50 );
+ bo_init( &bo, out->p_buffer, i_size + 50 );
+ }
/* header object */
bo_add_guid ( &bo, &asf_object_header_guid );
bo_addle_u64( &bo, i_size );
- bo_addle_u32( &bo, 2 + p_sys->i_track );
+ bo_addle_u32( &bo, 2 + p_sys->i_track - 1 );
bo_add_u8 ( &bo, 1 );
bo_add_u8 ( &bo, 2 );
bo_add_guid ( &bo, &asf_object_file_properties_guid );
bo_addle_u64( &bo, 104 );
bo_add_guid ( &bo, &p_sys->fid );
- bo_addle_u64( &bo, i_size + p_sys->i_packet_count *
+ bo_addle_u64( &bo, i_size + 50 + p_sys->i_packet_count *
p_sys->i_packet_size ); /* file size */
bo_addle_u64( &bo, 0 ); /* creation date */
- bo_addle_u64( &bo, p_sys->i_packet_count );
+ bo_addle_u64( &bo, b_broadcast ? 0xffffffffLL : p_sys->i_packet_count );
bo_addle_u64( &bo, i_duration * 10 ); /* play duration (100ns) */
bo_addle_u64( &bo, i_duration * 10 ); /* send duration (100ns) */
- bo_addle_u64( &bo, 10000 ); /* preroll duration (ms) */
+ bo_addle_u64( &bo, 3000 ); /* preroll duration (ms) */
bo_addle_u32( &bo, b_broadcast ? 0x01 : 0x00); /* flags */
bo_addle_u32( &bo, p_sys->i_packet_size ); /* packet size min */
bo_addle_u32( &bo, p_sys->i_packet_size ); /* packet size max */
bo_add_mem ( &bo, tk->p_extra, tk->i_extra );
}
+ /* Codec Infos */
+ bo_add_guid ( &bo, &asf_object_comment_guid );
+ bo_addle_u64( &bo, i_ci_size );
+ bo_add_guid ( &bo, &asf_object_comment_reserved_guid );
+ bo_addle_u32( &bo, p_sys->i_track - 1 );
+ for( i = 1; i < p_sys->i_track; i++ )
+ {
+ tk = &p_sys->track[i];
+
+ bo_addle_u16( &bo, tk->i_id );
+ bo_addle_str16( &bo, tk->psz_name );
+ bo_addle_u16( &bo, 0 );
+ if( tk->i_cat == AUDIO_ES )
+ {
+ bo_addle_u16( &bo, 2 );
+ bo_addle_u16( &bo, tk->i_tag );
+ }
+ else if( tk->i_cat == VIDEO_ES )
+ {
+ bo_addle_u16( &bo, 4 );
+ bo_add_mem ( &bo, (uint8_t*)&tk->i_fourcc, 4 );
+
+ }
+ }
+
/* data object */
bo_add_guid ( &bo, &asf_object_data_guid );
bo_addle_u64( &bo, 50 + p_sys->i_packet_count * p_sys->i_packet_size );
int i_pos = 0;
uint8_t *p_data= data->p_buffer;
sout_buffer_t *first = NULL, **last = &first;
+ int i_preheader = p_sys->b_asf_http ? 12 : 0;
while( i_pos < i_data )
{
if( p_sys->pk == NULL )
{
- p_sys->pk = sout_BufferNew( p_mux->p_sout, p_sys->i_packet_size );
+ p_sys->pk = sout_BufferNew( p_mux->p_sout,
+ p_sys->i_packet_size + i_preheader);
/* reserve 14 bytes for the packet header */
- p_sys->i_pk_used = 14;
+ p_sys->i_pk_used = 14 + i_preheader;
p_sys->i_pk_frame = 0;
p_sys->i_pk_dts = data->i_dts;
}
p_sys->i_pk_frame++;
- if( p_sys->i_pk_used + 14 >= p_sys->i_packet_size )
+ if( p_sys->i_pk_used + 17 >= p_sys->i_packet_size )
{
/* not enough data for another payload, flush the packet */
int i_pad = p_sys->i_packet_size - p_sys->i_pk_used;
- bo_init( &bo, p_sys->pk->p_buffer, 14 );
+ bo_init( &bo, p_sys->pk->p_buffer, 14 + i_preheader );
+
+ if( p_sys->b_asf_http )
+ {
+ asf_chunk_add( &bo, 0x4424,
+ p_sys->i_packet_size, 0x00, p_sys->i_seq++);
+ }
bo_add_u8 ( &bo, 0x82 );
bo_addle_u16( &bo, 0 );
bo_add_u8( &bo, 0x11 );
return first;
}
+static sout_buffer_t *asf_stream_end_create( sout_mux_t *p_mux )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+
+ sout_buffer_t *out = NULL;
+ bo_t bo;
+ if( p_sys->b_asf_http )
+ {
+ out = sout_BufferNew( p_mux->p_sout, 12 );
+ bo_init( &bo, out->p_buffer, 12 );
+ asf_chunk_add( &bo, 0x4524, 0, 0x00, p_sys->i_seq++ );
+ }
+ return out;
+}