#include <vlc_block.h>
#include <vlc_codecs.h>
#include <vlc_arrays.h>
+#include <vlc_rand.h>
-typedef GUID guid_t;
+#include "../demux/asf/libasf_guid.h"
#define MAX_ASF_TRACKS 128
#define ASF_DATA_PACKET_SIZE 4096 // deprecated -- added sout-asf-packet-size
set_shortname( "ASF" )
set_capability( "sout mux", 5 )
- add_shortcut( "asf" )
- add_shortcut( "asfh" )
+ add_shortcut( "asf", "asfh" )
set_callbacks( Open, Close )
- add_string( SOUT_CFG_PREFIX "title", "", NULL, TITLE_TEXT, TITLE_LONGTEXT,
+ add_string( SOUT_CFG_PREFIX "title", "", TITLE_TEXT, TITLE_LONGTEXT,
true )
- add_string( SOUT_CFG_PREFIX "author", "", NULL, AUTHOR_TEXT,
+ add_string( SOUT_CFG_PREFIX "author", "", AUTHOR_TEXT,
AUTHOR_LONGTEXT, true )
- add_string( SOUT_CFG_PREFIX "copyright","", NULL, COPYRIGHT_TEXT,
+ add_string( SOUT_CFG_PREFIX "copyright","", COPYRIGHT_TEXT,
COPYRIGHT_LONGTEXT, true )
- add_string( SOUT_CFG_PREFIX "comment", "", NULL, COMMENT_TEXT,
+ add_string( SOUT_CFG_PREFIX "comment", "", COMMENT_TEXT,
COMMENT_LONGTEXT, true )
- add_string( SOUT_CFG_PREFIX "rating", "", NULL, RATING_TEXT,
+ add_string( SOUT_CFG_PREFIX "rating", "", RATING_TEXT,
RATING_LONGTEXT, true )
- add_integer( SOUT_CFG_PREFIX "packet-size", 4096, NULL, PACKETSIZE_TEXT,
+ add_integer( SOUT_CFG_PREFIX "packet-size", 4096, PACKETSIZE_TEXT,
PACKETSIZE_LONGTEXT, true )
- add_integer( SOUT_CFG_PREFIX "bitrate-override", 0, NULL, BITRATE_TEXT,
+ add_integer( SOUT_CFG_PREFIX "bitrate-override", 0, BITRATE_TEXT,
BITRATE_LONGTEXT, true )
vlc_module_end ()
char *psz_rating;
};
-static int MuxGetStream( sout_mux_t *, int *pi_stream, mtime_t *pi_dts );
-
static block_t *asf_header_create( sout_mux_t *, bool );
static block_t *asf_packet_create( sout_mux_t *, asf_track_t *, block_t * );
static block_t *asf_stream_end_create( sout_mux_t *);
{
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys;
- int i;
msg_Dbg( p_mux, "asf muxer opened" );
config_ChainParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
p_sys->p_tracks = vlc_array_new();
p_sys->b_write_header = true;
- p_sys->i_packet_size = config_GetInt( p_mux, "sout-asf-packet-size" );
- p_sys->i_bitrate_override = config_GetInt( p_mux, "sout-asf-bitrate-override" );
+ p_sys->i_packet_size = var_InheritInteger( p_mux, "sout-asf-packet-size" );
+ p_sys->i_bitrate_override = var_InheritInteger( p_mux, "sout-asf-bitrate-override" );
msg_Dbg( p_mux, "Packet size %d", p_sys->i_packet_size);
if (p_sys->i_bitrate_override)
msg_Dbg( p_mux, "Bitrate override %"PRId64, p_sys->i_bitrate_override);
p_sys->i_packet_count= 0;
/* Generate a random fid */
- srand( mdate() & 0xffffffff );
p_sys->fid.Data1 = 0xbabac001;
- p_sys->fid.Data2 = ( (uint64_t)rand() << 16 ) / RAND_MAX;
- p_sys->fid.Data3 = ( (uint64_t)rand() << 16 ) / RAND_MAX;
- for( i = 0; i < 8; i++ )
- {
- p_sys->fid.Data4[i] = ( (uint64_t)rand() << 8 ) / RAND_MAX;
- }
+ vlc_rand_bytes(&p_sys->fid.Data2, sizeof(p_sys->fid.Data2));
+ vlc_rand_bytes(&p_sys->fid.Data3, sizeof(p_sys->fid.Data3));
+ vlc_rand_bytes(p_sys->fid.Data4, sizeof(p_sys->fid.Data4));
/* Meta data */
p_sys->psz_title = var_GetString( p_mux, SOUT_CFG_PREFIX "title" );
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->p_sys;
block_t *out;
- int i;
msg_Dbg( p_mux, "Asf muxer closed" );
}
- for( i = 0; i < vlc_array_count( p_sys->p_tracks ); i++ )
+ for( int i = 0; i < vlc_array_count( p_sys->p_tracks ); i++ )
{
asf_track_t *track = (asf_track_t *)vlc_array_item_at_index( p_sys->p_tracks, i );
free( track->p_extra );
{
tk->psz_name = "Windows Media Video 9";
tk->i_fourcc = VLC_FOURCC( 'W', 'M', 'V', '3' );
+ tk->b_extended = true;
}
else if( p_input->p_fmt->i_codec == VLC_CODEC_VC1 )
{
tk->i_id = vlc_array_index_of_item( p_sys->p_tracks, tk ) + 1;
- p_sys->b_write_header = true;
+ if( p_sys->b_asf_http )
+ p_sys->b_write_header = true;
return VLC_SUCCESS;
}
}
}
- vlc_array_remove( p_sys->p_tracks, vlc_array_index_of_item( p_sys->p_tracks, (void *)tk ) );
-
-
- p_sys->b_write_header = true;
+ if( p_sys->b_asf_http )
+ {
+ vlc_array_remove( p_sys->p_tracks, vlc_array_index_of_item( p_sys->p_tracks, (void *)tk ) );
+ p_sys->b_write_header = true;
+ }
return VLC_SUCCESS;
}
{
sout_input_t *p_input;
asf_track_t *tk;
- int i_stream;
mtime_t i_dts;
block_t *data;
block_t *pk;
- if( MuxGetStream( p_mux, &i_stream, &i_dts ) )
+ int i_stream = sout_MuxGetStream( p_mux, 1, &i_dts );
+ if( i_stream < 0 )
{
/* not enough data */
return VLC_SUCCESS;
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;
-
- for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ )
- {
- sout_input_t *p_input = p_mux->pp_inputs[i];
- block_t *p_data;
-
- if( block_FifoCount( p_input->p_fifo ) <= 0 )
- {
- if( p_input->p_fmt->i_cat == AUDIO_ES ||
- p_input->p_fmt->i_cat == VIDEO_ES )
- {
- /* We need that audio+video fifo contain at least 1 packet */
- return VLC_EGENERIC;
- }
- /* SPU */
- continue;
- }
-
- p_data = block_FifoShow( p_input->p_fifo );
- if( i_stream == -1 || p_data->i_dts < i_dts )
- {
- i_stream = i;
- i_dts = p_data->i_dts;
- }
- }
-
- *pi_stream = i_stream;
- *pi_dts = i_dts;
-
- return VLC_SUCCESS;
-}
-
/****************************************************************************
* Asf header construction
****************************************************************************/
****************************************************************************/
static void bo_add_guid( bo_t *p_bo, const guid_t *id )
{
- int i;
bo_addle_u32( p_bo, id->Data1 );
bo_addle_u16( p_bo, id->Data2 );
bo_addle_u16( p_bo, id->Data3 );
- for( i = 0; i < 8; i++ )
+ for( int i = 0; i < 8; i++ )
{
bo_add_u8( p_bo, id->Data4[i] );
}
}
-static const guid_t asf_object_header_guid =
-{0x75B22630, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}};
-static const guid_t asf_object_data_guid =
-{0x75B22636, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}};
-static const guid_t asf_object_file_properties_guid =
-{0x8cabdca1, 0xa947, 0x11cf, {0x8e, 0xe4, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}};
-static const guid_t asf_object_stream_properties_guid =
-{0xB7DC0791, 0xA9B7, 0x11CF, {0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}};
-static const guid_t asf_object_header_extension_guid =
-{0x5FBF03B5, 0xA92E, 0x11CF, {0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}};
-static const guid_t asf_object_stream_type_audio =
-{0xF8699E40, 0x5B4D, 0x11CF, {0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B}};
-static const guid_t asf_object_stream_type_video =
-{0xbc19efc0, 0x5B4D, 0x11CF, {0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B}};
-static const guid_t asf_guid_audio_conceal_none =
-{0x20FB5700, 0x5B55, 0x11CF, {0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B}};
-static const guid_t asf_guid_audio_conceal_spread =
-{0xBFC3CD50, 0x618F, 0x11CF, {0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20}};
-static const guid_t asf_guid_video_conceal_none =
-{0x20FB5700, 0x5B55, 0x11CF, {0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B}};
-static const guid_t asf_guid_reserved_1 =
-{0xABD3D211, 0xA9BA, 0x11cf, {0x8E, 0xE6, 0x00, 0xC0, 0x0C ,0x20, 0x53, 0x65}};
-static const guid_t asf_object_codec_list_guid =
-{0x86D15240, 0x311D, 0x11D0, {0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6}};
-static const guid_t asf_object_codec_list_reserved_guid =
-{0x86D15241, 0x311D, 0x11D0, {0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6}};
-static const guid_t asf_object_content_description_guid =
-{0x75B22633, 0x668E, 0x11CF, {0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c}};
-static const guid_t asf_object_index_guid =
-{0x33000890, 0xE5B1, 0x11CF, {0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB}};
-static const guid_t asf_object_metadata_guid =
-{0xC5F8CBEA, 0x5BAF, 0x4877, {0x84, 0x67, 0xAA, 0x8C, 0x44, 0xFA, 0x4C, 0xCA}};
-static const guid_t asf_object_extended_stream_properties_guid =
-{0x14E6A5CB, 0xC672, 0x4332, {0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A}};
-
/****************************************************************************
* Misc
****************************************************************************/
for( i = 0; i < vlc_array_count( p_sys->p_tracks ); i++ )
{
const asf_track_t *p_track = vlc_array_item_at_index( p_sys->p_tracks, i );
- if( p_track->i_cat == VIDEO_ES && p_track->fmt.video.i_aspect != 0 )
+ if( p_track->i_cat == VIDEO_ES &&
+ p_track->fmt.video.i_sar_num != 0 &&
+ p_track->fmt.video.i_sar_den != 0 )
{
i_cm_size = 26 + 2 * (16 + 2 * sizeof("AspectRatio?"));
- break;
}
if( p_track->b_extended )
i_header_ext_size += 88;
/* metadata object (part of header extension) */
if( i_cm_size )
{
- int64_t i_num, i_den;
unsigned int i_dst_num, i_dst_den;
- asf_track_t *tk;
- tk=NULL;
+ asf_track_t *tk = NULL;
for( i = 0; i < vlc_array_count( p_sys->p_tracks ); i++ )
{
tk = vlc_array_item_at_index( p_sys->p_tracks, i );
- if( tk->i_cat == VIDEO_ES ) break;
+ if( tk->i_cat == VIDEO_ES &&
+ tk->fmt.video.i_sar_num != 0 &&
+ tk->fmt.video.i_sar_den != 0 )
+ break;
}
assert( tk != NULL );
- i_num = tk->fmt.video.i_aspect *
- (int64_t)tk->fmt.video.i_height;
- i_den = VOUT_ASPECT_FACTOR * tk->fmt.video.i_width;
- vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
+ vlc_ureduce( &i_dst_num, &i_dst_den,
+ tk->fmt.video.i_sar_num,
+ tk->fmt.video.i_sar_den, 0 );
msg_Dbg( p_mux, "pixel aspect-ratio: %i/%i", i_dst_num, i_dst_den );
if( tk->b_audio_correction )
bo_add_guid( &bo, &asf_guid_audio_conceal_spread );
else
- bo_add_guid( &bo, &asf_guid_audio_conceal_none );
+ bo_add_guid( &bo, &asf_no_error_correction_guid );
}
else if( tk->i_cat == VIDEO_ES )
{
bo_add_guid( &bo, &asf_object_stream_type_video );
- bo_add_guid( &bo, &asf_guid_video_conceal_none );
+ bo_add_guid( &bo, &asf_no_error_correction_guid );
}
bo_addle_u64( &bo, 0 ); /* time offset */
bo_addle_u32( &bo, tk->i_extra );
/* Codec Infos */
bo_add_guid ( &bo, &asf_object_codec_list_guid );
bo_addle_u64( &bo, i_ci_size );
- bo_add_guid ( &bo, &asf_object_codec_list_reserved_guid );
+ bo_add_guid ( &bo, &asf_guid_reserved_2 );
bo_addle_u32( &bo, vlc_array_count( p_sys->p_tracks ) );
for( i = 0; i < vlc_array_count( p_sys->p_tracks ); i++ )
{
projects / vlc / blobdiff