#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 ()
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 = "MSMPEG-4 V2 Video";
tk->i_fourcc = VLC_FOURCC( 'M', 'P', '4', '2' );
}
- else if( p_input->p_fmt->i_codec == VLC_CODEC_DIV2 )
+ else if( p_input->p_fmt->i_codec == VLC_CODEC_DIV1 )
{
tk->psz_name = "MSMPEG-4 V1 Video";
tk->i_fourcc = VLC_FOURCC( 'M', 'P', 'G', '4' );
{
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_extra = 11 + sizeof( BITMAPINFOHEADER ) + i_codec_extra;
+ tk->i_extra = 11 + sizeof( VLC_BITMAPINFOHEADER ) + i_codec_extra;
tk->p_extra = malloc( tk->i_extra );
if( !tk->p_extra )
{
bo_addle_u32( &bo, p_input->p_fmt->video.i_width );
bo_addle_u32( &bo, p_input->p_fmt->video.i_height );
bo_add_u8 ( &bo, 0x02 ); /* flags */
- bo_addle_u16( &bo, sizeof( BITMAPINFOHEADER ) + i_codec_extra );
- bo_addle_u32( &bo, sizeof( BITMAPINFOHEADER ) + i_codec_extra );
+ bo_addle_u16( &bo, sizeof( VLC_BITMAPINFOHEADER ) + i_codec_extra );
+ bo_addle_u32( &bo, sizeof( VLC_BITMAPINFOHEADER ) + i_codec_extra );
bo_addle_u32( &bo, p_input->p_fmt->video.i_width );
bo_addle_u32( &bo, p_input->p_fmt->video.i_height );
bo_addle_u16( &bo, 1 );
*****************************************************************************/
static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
{
- /* if bitrate ain't defined in commanline, reduce it when tracks are deleted
+ /* if bitrate ain't defined in commandline, reduce it when tracks are deleted
*/
sout_mux_sys_t *p_sys = p_mux->p_sys;
asf_track_t *tk = p_input->p_sys;
****************************************************************************/
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
****************************************************************************/
if( p_sys->b_asf_http )
{
- out = block_New( p_mux, i_size + 50 + 12 );
+ out = block_Alloc( 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 = block_New( p_mux, i_size + 50 );
+ out = block_Alloc( i_size + 50 );
bo_init( &bo, out->p_buffer, i_size + 50 );
}
bo_addle_u32( &bo, b_broadcast ? 0x01 : 0x02 /* seekable */ ); /* 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_addle_u32( &bo, p_sys->i_bitrate ); /* maxbitrate */
+ /* NOTE: According to p6-9 of the ASF specification the bitrate cannot be 0,
+ * therefor apply this workaround to make sure it is not 0. If the bitrate is
+ * 0 the file will play in WMP11, but not in Sliverlight and WMP12 */
+ bo_addle_u32( &bo, p_sys->i_bitrate > 0 ? p_sys->i_bitrate : 1 ); /* maxbitrate */
/* header extension */
bo_add_guid ( &bo, &asf_object_header_extension_guid );
bo_addle_u32( &bo, p_fmt->i_bitrate ); /* Alternate Bitrate */
bo_addle_u32( &bo, 0 ); /* Alternate Buffer size */
bo_addle_u32( &bo, 0 ); /* Alternate Initial buffer fullness */
- bo_addle_u32( &bo, 0 ); /* Maximum object size (0 = unkown) */
+ bo_addle_u32( &bo, 0 ); /* Maximum object size (0 = unknown) */
bo_addle_u32( &bo, 0x02 ); /* Flags (seekable) */
bo_addle_u16( &bo, p_track->i_id ); /* Stream number */
bo_addle_u16( &bo, 0 ); /* Stream language index */
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++ )
{
if( p_sys->pk == NULL )
{
- p_sys->pk = block_New( p_mux, p_sys->i_packet_size + i_preheader );
+ p_sys->pk = block_Alloc( p_sys->i_packet_size + i_preheader );
/* reserve 14 bytes for the packet header */
p_sys->i_pk_used = 14 + i_preheader;
p_sys->i_pk_frame = 0;
if( p_sys->b_asf_http )
{
- out = block_New( p_mux, 12 );
+ out = block_Alloc( 12 );
bo_init( &bo, out->p_buffer, 12 );
asf_chunk_add( &bo, 0x4524, 0, 0x00, p_sys->i_seq++ );
}
else
{
/* Create index */
- out = block_New( p_mux, 56 );
+ out = block_Alloc( 56 );
bo_init( &bo, out->p_buffer, 56 );
bo_add_guid ( &bo, &asf_object_index_guid );
bo_addle_u64( &bo, 56 );
projects / vlc / blobdiff