vlc | branch: master | Marvin Scholz <[email protected]> | Mon Oct 8 10:50:18 2018 +0200| [13bea26a01511483787cb96dc3934b956da03cc1] | committer: Marvin Scholz
include/vlc_codecs: Rename guid_t to vlc_guid_t On darwin guid_t conflicts with darwins definition of guid_t. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13bea26a01511483787cb96dc3934b956da03cc1 --- include/vlc_codecs.h | 2 +- modules/access/mms/asf.c | 6 +- modules/access/mms/asf.h | 2 +- modules/access/mms/buffer.c | 2 +- modules/access/mms/buffer.h | 2 +- modules/access/mms/mmsh.h | 2 +- modules/access/mms/mmstu.h | 2 +- modules/demux/asf/asf.c | 10 ++-- modules/demux/asf/libasf.c | 20 +++---- modules/demux/asf/libasf.h | 24 ++++---- modules/demux/asf/libasf_guid.h | 124 ++++++++++++++++++++-------------------- modules/mux/asf.c | 4 +- 12 files changed, 100 insertions(+), 100 deletions(-) diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index 611524b81a..b2fa42c724 100644 --- a/include/vlc_codecs.h +++ b/include/vlc_codecs.h @@ -43,7 +43,7 @@ typedef struct _GUID } GUID, *REFGUID, *LPGUID; #endif /* GUID_DEFINED */ -typedef GUID guid_t; +typedef GUID vlc_guid_t; #ifdef HAVE_ATTRIBUTE_PACKED # define ATTR_PACKED __attribute__((__packed__)) diff --git a/modules/access/mms/asf.c b/modules/access/mms/asf.c index ce6e20c6cf..34cca157fc 100644 --- a/modules/access/mms/asf.c +++ b/modules/access/mms/asf.c @@ -32,7 +32,7 @@ #include "buffer.h" #include "../../demux/asf/libasf_guid.h" -void GenerateGuid ( guid_t *p_guid ) +void GenerateGuid ( vlc_guid_t *p_guid ) { p_guid->Data1 = 0xbabac001; vlc_rand_bytes(&p_guid->Data2, sizeof(p_guid->Data2)); @@ -44,7 +44,7 @@ void asf_HeaderParse ( asf_header_t *hdr, uint8_t *p_header, int i_header ) { var_buffer_t buffer; - guid_t guid; + vlc_guid_t guid; uint64_t i_size; hdr->i_file_size = 0; @@ -130,7 +130,7 @@ void asf_HeaderParse ( asf_header_t *hdr, else if( guidcmp( &guid, &asf_object_stream_properties_guid ) ) { int i_stream_id; - guid_t stream_type; + vlc_guid_t stream_type; var_buffer_getguid( &buffer, &stream_type ); var_buffer_getmemory( &buffer, NULL, 32 ); diff --git a/modules/access/mms/asf.h b/modules/access/mms/asf.h index 66401eb177..08ae54796e 100644 --- a/modules/access/mms/asf.h +++ b/modules/access/mms/asf.h @@ -55,7 +55,7 @@ typedef struct } asf_header_t; -void GenerateGuid ( guid_t * ); +void GenerateGuid ( vlc_guid_t * ); void asf_HeaderParse ( asf_header_t *, uint8_t *, int ); void asf_StreamSelect ( asf_header_t *, int i_bitrate_max, bool b_all, bool b_audio, diff --git a/modules/access/mms/buffer.c b/modules/access/mms/buffer.c index 1aab6aa8bf..0c7351f82e 100644 --- a/modules/access/mms/buffer.c +++ b/modules/access/mms/buffer.c @@ -213,7 +213,7 @@ int var_buffer_readempty( var_buffer_t *p_buf ) return( ( p_buf->i_data >= p_buf->i_size ) ? 1 : 0 ); } -void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid ) +void var_buffer_getguid( var_buffer_t *p_buf, vlc_guid_t *p_guid ) { p_guid->Data1 = var_buffer_get32( p_buf ); p_guid->Data2 = var_buffer_get16( p_buf ); diff --git a/modules/access/mms/buffer.h b/modules/access/mms/buffer.h index 6c0c1478d6..c7537d47bd 100644 --- a/modules/access/mms/buffer.h +++ b/modules/access/mms/buffer.h @@ -54,6 +54,6 @@ uint32_t var_buffer_get32( var_buffer_t *p_buf ); uint64_t var_buffer_get64( var_buffer_t *p_buf ); int var_buffer_getmemory ( var_buffer_t *p_buf, void *p_mem, int64_t i_mem ); int var_buffer_readempty( var_buffer_t *p_buf ); -void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid ); +void var_buffer_getguid( var_buffer_t *p_buf, vlc_guid_t *p_guid ); #endif diff --git a/modules/access/mms/mmsh.h b/modules/access/mms/mmsh.h index a3d6bf5248..b65ae71434 100644 --- a/modules/access/mms/mmsh.h +++ b/modules/access/mms/mmsh.h @@ -68,7 +68,7 @@ typedef struct uint64_t i_position; asf_header_t asfh; - guid_t guid; + vlc_guid_t guid; } access_sys_t; #endif diff --git a/modules/access/mms/mmstu.h b/modules/access/mms/mmstu.h index 9c72d1f5fc..0ba2587ef6 100644 --- a/modules/access/mms/mmstu.h +++ b/modules/access/mms/mmstu.h @@ -58,7 +58,7 @@ typedef struct size_t i_buffer_udp; /* data necessary to send data to server */ - guid_t guid; + vlc_guid_t guid; int i_command_level; int i_seq_num; uint32_t i_header_packet_id_type; diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c index 3a7b1c1082..8a72c706f9 100644 --- a/modules/demux/asf/asf.c +++ b/modules/demux/asf/asf.c @@ -151,7 +151,7 @@ static int Open( vlc_object_t * p_this ) { demux_t *p_demux = (demux_t *)p_this; demux_sys_t *p_sys; - guid_t guid; + vlc_guid_t guid; const uint8_t *p_peek; /* A little test to see if it could be a asf stream */ @@ -226,7 +226,7 @@ static int Demux( demux_t *p_demux ) const uint8_t *p_peek; if( vlc_stream_Peek( p_demux->s, &p_peek, 16 ) == 16 ) { - guid_t guid; + vlc_guid_t guid; ASF_GetGUID( &guid, p_peek ); p_sys->b_eof = !guidcmp( &guid, &asf_object_header_guid ); @@ -1048,12 +1048,12 @@ static int DemuxInit( demux_t *p_demux ) else if( guidcmp( &p_sp->i_stream_type, &asf_object_stream_type_binary ) && p_sp->i_type_specific_data_length >= 64 ) { - guid_t i_major_media_type; + vlc_guid_t i_major_media_type; ASF_GetGUID( &i_major_media_type, p_sp->p_type_specific_data ); msg_Dbg( p_demux, "stream(ID:%d) major type " GUID_FMT, p_sp->i_stream_number, GUID_PRINT(i_major_media_type) ); - guid_t i_media_subtype; + vlc_guid_t i_media_subtype; ASF_GetGUID( &i_media_subtype, &p_sp->p_type_specific_data[16] ); msg_Dbg( p_demux, "stream(ID:%d) subtype " GUID_FMT, p_sp->i_stream_number, GUID_PRINT(i_media_subtype) ); @@ -1062,7 +1062,7 @@ static int DemuxInit( demux_t *p_demux ) //uint32_t i_temporal_compression = GetDWBE( &p_sp->p_type_specific_data[36] ); //uint32_t i_sample_size = GetDWBE( &p_sp->p_type_specific_data[40] ); - guid_t i_format_type; + vlc_guid_t i_format_type; ASF_GetGUID( &i_format_type, &p_sp->p_type_specific_data[44] ); msg_Dbg( p_demux, "stream(ID:%d) format type " GUID_FMT, p_sp->i_stream_number, GUID_PRINT(i_format_type) ); diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c index 027478a0c8..464676a4f2 100644 --- a/modules/demux/asf/libasf.c +++ b/modules/demux/asf/libasf.c @@ -1068,9 +1068,9 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s, if( !ASF_HAVE( 16 + 2 * sizeof(uint16_t) ) ) /* at least one entry */ return VLC_EGENERIC; - if ( guidcmp( (const guid_t *) p_data, &asf_guid_mutex_language ) ) + if ( guidcmp( (const vlc_guid_t *) p_data, &asf_guid_mutex_language ) ) p_ae->exclusion_type = LANGUAGE; - else if ( guidcmp( (const guid_t *) p_data, &asf_guid_mutex_bitrate ) ) + else if ( guidcmp( (const vlc_guid_t *) p_data, &asf_guid_mutex_bitrate ) ) p_ae->exclusion_type = BITRATE; ASF_SKIP( 16 ); @@ -1182,9 +1182,9 @@ static int ASF_ReadObject_bitrate_mutual_exclusion( stream_t *s, asf_object_t *p if( !ASF_HAVE( 16 + 2 * sizeof(uint16_t) ) ) /* at least one entry */ return VLC_EGENERIC; - if ( guidcmp( (const guid_t *) p_data, &asf_guid_mutex_language ) ) + if ( guidcmp( (const vlc_guid_t *) p_data, &asf_guid_mutex_language ) ) p_ex->exclusion_type = LANGUAGE; - else if ( guidcmp( (const guid_t *) p_data, &asf_guid_mutex_bitrate ) ) + else if ( guidcmp( (const vlc_guid_t *) p_data, &asf_guid_mutex_bitrate ) ) p_ex->exclusion_type = BITRATE; ASF_SKIP( 16 ); @@ -1421,7 +1421,7 @@ static int ASF_ReadObject_Raw(stream_t *s, asf_object_t *p_obj) /* */ static const struct ASF_Object_Function_entry { - const guid_t *p_id; + const vlc_guid_t *p_id; int i_type; int (*ASF_ReadObject_function)( stream_t *, asf_object_t *p_obj ); void (*ASF_FreeObject_function)( asf_object_t *p_obj ); @@ -1494,7 +1494,7 @@ static void ASF_ParentObject( asf_object_t *p_father, asf_object_t *p_obj ) } } -static const struct ASF_Object_Function_entry * ASF_GetObject_Function( const guid_t *id ) +static const struct ASF_Object_Function_entry * ASF_GetObject_Function( const vlc_guid_t *id ) { for( size_t i = 0; i < ARRAY_SIZE(ASF_Object_Function); i++ ) { @@ -1593,7 +1593,7 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj ) *****************************************************************************/ static const struct { - const guid_t *p_id; + const vlc_guid_t *p_id; const char *psz_name; } ASF_ObjectDumpDebugInfo[] = { @@ -1692,7 +1692,7 @@ asf_object_root_t *ASF_ReadObjectRoot( stream_t *s, int b_seekable ) return NULL; p_root->i_type = ASF_OBJECT_ROOT; - memcpy( &p_root->i_object_id, &vlc_object_root_guid, sizeof( guid_t ) ); + memcpy( &p_root->i_object_id, &vlc_object_root_guid, sizeof( vlc_guid_t ) ); p_root->i_object_pos = vlc_stream_Tell( s ); p_root->i_object_size = 0; p_root->p_first = NULL; @@ -1821,7 +1821,7 @@ void ASF_FreeObjectRoot( stream_t *s, asf_object_root_t *p_root ) free( p_root ); } -int ASF_CountObject( void *_p_obj, const guid_t *p_guid ) +int ASF_CountObject( void *_p_obj, const vlc_guid_t *p_guid ) { int i_count; asf_object_t *p_child, *p_obj; @@ -1842,7 +1842,7 @@ int ASF_CountObject( void *_p_obj, const guid_t *p_guid ) return i_count; } -void *ASF_FindObject( void *_p_obj, const guid_t *p_guid, +void *ASF_FindObject( void *_p_obj, const vlc_guid_t *p_guid, int i_number ) { asf_object_t *p_child, *p_obj; diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h index 90f46d12c3..00d87f354c 100644 --- a/modules/demux/asf/libasf.h +++ b/modules/demux/asf/libasf.h @@ -33,7 +33,7 @@ #define ASF_OBJECT_COMMON \ int i_type; \ - guid_t i_object_id; \ + vlc_guid_t i_object_id; \ uint64_t i_object_size; \ uint64_t i_object_pos; \ union asf_object_u *p_father; \ @@ -71,7 +71,7 @@ typedef struct typedef struct { ASF_OBJECT_COMMON - guid_t i_file_id; + vlc_guid_t i_file_id; uint64_t i_total_data_packets; uint16_t i_reserved; @@ -81,7 +81,7 @@ typedef struct typedef struct { ASF_OBJECT_COMMON - guid_t i_file_id; + vlc_guid_t i_file_id; msftime_t i_index_entry_time_interval; uint32_t i_max_packet_count; uint32_t i_index_entry_count; @@ -100,7 +100,7 @@ typedef struct { ASF_OBJECT_COMMON - guid_t i_file_id; + vlc_guid_t i_file_id; uint64_t i_file_size; uint64_t i_creation_date; uint64_t i_data_packets_count; @@ -119,8 +119,8 @@ typedef struct { ASF_OBJECT_COMMON - guid_t i_stream_type; - guid_t i_error_correction_type; + vlc_guid_t i_stream_type; + vlc_guid_t i_error_correction_type; msftime_t i_time_offset; uint32_t i_type_specific_data_length; uint32_t i_error_correction_data_length; @@ -136,7 +136,7 @@ typedef struct { ASF_OBJECT_COMMON - guid_t i_reserved1; + vlc_guid_t i_reserved1; uint16_t i_reserved2; uint32_t i_header_extension_size; uint8_t *p_header_extension_data; @@ -204,7 +204,7 @@ typedef struct asf_codec_entry typedef struct { ASF_OBJECT_COMMON - guid_t i_reserved; + vlc_guid_t i_reserved; asf_codec_entry_t *codecs; } asf_object_codec_list_t; @@ -224,7 +224,7 @@ typedef struct typedef struct { ASF_OBJECT_COMMON - guid_t i_reserved1; + vlc_guid_t i_reserved1; uint32_t i_count; uint16_t i_reserved2; char *name; @@ -255,7 +255,7 @@ typedef struct typedef struct { - guid_t i_extension_id; + vlc_guid_t i_extension_id; uint16_t i_data_size; uint32_t i_info_length; char *pi_info; @@ -389,7 +389,7 @@ typedef union asf_object_u asf_object_root_t *ASF_ReadObjectRoot( stream_t *, int b_seekable ); void ASF_FreeObjectRoot( stream_t *, asf_object_root_t *p_root ); -int ASF_CountObject ( void *p_obj, const guid_t *p_guid ); +int ASF_CountObject ( void *p_obj, const vlc_guid_t *p_guid ); -void *ASF_FindObject( void *p_obj, const guid_t *p_guid, int i_number ); +void *ASF_FindObject( void *p_obj, const vlc_guid_t *p_guid, int i_number ); #endif diff --git a/modules/demux/asf/libasf_guid.h b/modules/demux/asf/libasf_guid.h index 0d0f6424c5..984d50b0f7 100644 --- a/modules/demux/asf/libasf_guid.h +++ b/modules/demux/asf/libasf_guid.h @@ -46,7 +46,7 @@ enum ASF_OBJECT_OTHER, }; -static const guid_t asf_object_null_guid = +static const vlc_guid_t asf_object_null_guid = { 0x00000000, 0x0000, @@ -54,7 +54,7 @@ static const guid_t asf_object_null_guid = { 0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00 } }; -static const guid_t vlc_object_root_guid = +static const vlc_guid_t vlc_object_root_guid = { 0x00000000, 0x0000, @@ -63,205 +63,205 @@ static const guid_t vlc_object_root_guid = }; /* Top-Level object */ -static const guid_t asf_object_header_guid = +static const vlc_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 = +static const vlc_guid_t asf_object_data_guid = {0x75B22636, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}}; -static const guid_t asf_object_simple_index_guid = +static const vlc_guid_t asf_object_simple_index_guid = {0x33000890, 0xE5B1, 0x11CF, {0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB}}; -static const guid_t asf_object_index_guid = +static const vlc_guid_t asf_object_index_guid = {0xD6E229D3, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}}; /* Header object */ -static const guid_t asf_object_file_properties_guid = +static const vlc_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 = +static const vlc_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 = +static const vlc_guid_t asf_object_header_extension_guid = {0x5FBF03B5, 0xA92E, 0x11CF, {0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}}; -static const guid_t asf_object_codec_list_guid = +static const vlc_guid_t asf_object_codec_list_guid = {0x86D15240, 0x311D, 0x11D0, {0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6}}; -static const guid_t asf_object_marker_guid = +static const vlc_guid_t asf_object_marker_guid = {0xF487CD01, 0xA951, 0x11CF, {0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}}; -static const guid_t asf_object_content_description_guid = +static const vlc_guid_t asf_object_content_description_guid = {0x75B22633, 0x668E, 0x11CF, {0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c}}; -static const guid_t asf_object_extended_content_description = +static const vlc_guid_t asf_object_extended_content_description = {0xD2D0A440, 0xE307, 0x11D2, {0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50}}; -static const guid_t asf_object_padding = +static const vlc_guid_t asf_object_padding = {0x1806D474, 0xCADF, 0x4509, {0xA4, 0xBA, 0x9A, 0xAB, 0xCB, 0x96, 0xAA, 0xE8}}; /* Header Extension object */ -static const guid_t asf_object_advanced_mutual_exclusion = +static const vlc_guid_t asf_object_advanced_mutual_exclusion = {0xA08649CF, 0x4775, 0x4670, {0x8A, 0x16, 0x6E, 0x35, 0x35, 0x75, 0x66, 0xCD}}; -static const guid_t asf_object_stream_prioritization = +static const vlc_guid_t asf_object_stream_prioritization = {0xD4FED15B, 0x88D3, 0x454F, {0x81, 0xF0, 0xED, 0x5C, 0x45, 0x99, 0x9E, 0x24}}; -static const guid_t asf_object_metadata_guid = +static const vlc_guid_t asf_object_metadata_guid = {0xC5F8CBEA, 0x5BAF, 0x4877, {0x84, 0x67, 0xAA, 0x8C, 0x44, 0xFA, 0x4C, 0xCA}}; /* Stream Properties object */ -static const guid_t asf_object_stream_type_audio = +static const vlc_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 = +static const vlc_guid_t asf_object_stream_type_video = {0xbc19efc0, 0x5B4D, 0x11CF, {0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B}}; -static const guid_t asf_object_stream_type_command = +static const vlc_guid_t asf_object_stream_type_command = {0x59DACFC0, 0x59E6, 0x11D0, {0xA3, 0xAC, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6}}; -static const guid_t asf_object_stream_type_binary = +static const vlc_guid_t asf_object_stream_type_binary = {0x3AFB65E2, 0x47EF, 0x40F2, {0xAC, 0x2C, 0x70, 0xA9, 0x0D, 0x71, 0xD3, 0x43}}; /* TODO */ // top-level -static const guid_t asf_object_media_index_guid = +static const vlc_guid_t asf_object_media_index_guid = {0xFEB103F8, 0x12AD, 0x4C64, {0x84, 0x0F, 0x2A, 0x1D, 0x2F, 0x7A, 0xD4, 0x8C}}; -static const guid_t asf_object_timecode_index_guid = +static const vlc_guid_t asf_object_timecode_index_guid = {0x3CB73FD0, 0x0C4A, 0x4803, {0x95, 0x3D, 0xED, 0xF7, 0xB6, 0x22, 0x8F, 0x0C}}; // header -static const guid_t asf_object_script_command_guid = +static const vlc_guid_t asf_object_script_command_guid = {0x1EFB1A30, 0x0B62, 0x11D0, {0xA3, 0x9B, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6}}; -static const guid_t asf_object_bitrate_mutual_exclusion_guid = +static const vlc_guid_t asf_object_bitrate_mutual_exclusion_guid = {0xD6E229DC, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}}; -static const guid_t asf_object_error_correction_guid = +static const vlc_guid_t asf_object_error_correction_guid = {0x75B22635, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}}; -static const guid_t asf_object_content_branding_guid = +static const vlc_guid_t asf_object_content_branding_guid = {0x2211B3FA, 0xBD23, 0x11D2, {0xB4, 0xB7, 0x00, 0xA0, 0xC9, 0x55, 0xFC, 0x6E}}; -static const guid_t asf_object_stream_bitrate_properties = +static const vlc_guid_t asf_object_stream_bitrate_properties = {0x7BF875CE, 0x468D, 0x11D1, {0x8D, 0x82, 0x00, 0x60, 0x97, 0xC9, 0xA2, 0xB2}}; -static const guid_t asf_object_content_encryption_guid = +static const vlc_guid_t asf_object_content_encryption_guid = {0x2211B3FB, 0xBD23, 0x11D2, {0xB4, 0xB7, 0x00, 0xA0, 0xC9, 0x55, 0xFC, 0x6E}}; -static const guid_t asf_object_extended_content_encryption_guid = +static const vlc_guid_t asf_object_extended_content_encryption_guid = {0x298AE614, 0x2622, 0x4C17, {0xB9, 0x35, 0xDA, 0xE0, 0x7E, 0xE9, 0x28, 0x9C}}; -static const guid_t asf_object_digital_signature_guid = +static const vlc_guid_t asf_object_digital_signature_guid = {0x2211B3FC, 0xBD23, 0x11D2, {0xB4, 0xB7, 0x00, 0xA0, 0xC9, 0x55, 0xFC, 0x6E}}; // header extension -static const guid_t asf_object_extended_stream_properties_guid = +static const vlc_guid_t asf_object_extended_stream_properties_guid = {0x14E6A5CB, 0xC672, 0x4332, {0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A}}; -static const guid_t asf_object_group_mutual_exclusion_guid = +static const vlc_guid_t asf_object_group_mutual_exclusion_guid = {0xD1465A40, 0x5A79, 0x4338, {0xB7, 0x1B, 0xE3, 0x6B, 0x8F, 0xD6, 0xC2, 0x49}}; -static const guid_t asf_object_bandwidth_sharing_guid = +static const vlc_guid_t asf_object_bandwidth_sharing_guid = {0xA69609E6, 0x517B, 0x11D2, {0xB6, 0xAF, 0x00, 0xC0, 0x4F, 0xD9, 0x08, 0xE9}}; -static const guid_t asf_object_language_list = +static const vlc_guid_t asf_object_language_list = {0x7C4346A9, 0xEFE0, 0x4BFC, {0xB2, 0x29, 0x39, 0x3E, 0xDE, 0x41, 0x5C, 0x85}}; -static const guid_t asf_object_metadata_library_guid = +static const vlc_guid_t asf_object_metadata_library_guid = {0x44231C94, 0x9498, 0x49D1, {0xA1, 0x41, 0x1D, 0x13, 0x4E, 0x45, 0x70, 0x54}}; -static const guid_t asf_object_index_parameters_guid = +static const vlc_guid_t asf_object_index_parameters_guid = {0xD6E229DF, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}}; -static const guid_t asf_object_media_object_index_parameters_guid = +static const vlc_guid_t asf_object_media_object_index_parameters_guid = {0x6B203BAD, 0x3F11, 0x48E4, {0xAC, 0xA8, 0xD7, 0x61, 0x3D, 0xE2, 0xCF, 0xA7}}; -static const guid_t asf_object_timecode_index_parameters_guid = +static const vlc_guid_t asf_object_timecode_index_parameters_guid = {0xF55E496D, 0x9797, 0x4B5D, {0x8C, 0x8B, 0x60, 0x4D, 0xFE, 0x9B, 0xFB, 0x24}}; -static const guid_t asf_object_compatibility_guid = +static const vlc_guid_t asf_object_compatibility_guid = {0x26F18B5D, 0x4584, 0x47EC, {0x9F, 0x5F, 0x0E, 0x65, 0x1F, 0x04, 0x52, 0xC9}}; -static const guid_t asf_object_advanced_content_encryption_guid = +static const vlc_guid_t asf_object_advanced_content_encryption_guid = {0x43058533, 0x6981, 0x49E6, {0x9B, 0x74, 0xAD, 0x12, 0xCB, 0x86, 0xD5, 0x8C}}; // -static const guid_t asf_object_extended_stream_type_audio = +static const vlc_guid_t asf_object_extended_stream_type_audio = {0x31178C9D, 0x03E1, 0x4528, {0xB5, 0x82, 0x3D, 0xF9, 0xDB, 0x22, 0xF5, 0x03}}; -static const guid_t asf_guid_reserved_1 = +static const vlc_guid_t asf_guid_reserved_1 = {0xABD3D211, 0xA9BA, 0x11cf, {0x8E, 0xE6, 0x00, 0xC0, 0x0C ,0x20, 0x53, 0x65}}; -static const guid_t asf_guid_reserved_2 = //object_codec_list_reserved_guid = +static const vlc_guid_t asf_guid_reserved_2 = //object_codec_list_reserved_guid = {0x86D15241, 0x311D, 0x11D0, {0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6}}; // Stream Properties Object Error Correction -static const guid_t asf_no_error_correction_guid = +static const vlc_guid_t asf_no_error_correction_guid = {0x20FB5700, 0x5B55, 0x11CF, {0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B}}; -static const guid_t asf_guid_audio_conceal_spread = +static const vlc_guid_t asf_guid_audio_conceal_spread = {0xBFC3CD50, 0x618F, 0x11CF, {0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20}}; // Mutual exclusion -static const guid_t asf_guid_mutex_language = +static const vlc_guid_t asf_guid_mutex_language = {0xD6E22A00, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}}; -static const guid_t asf_guid_mutex_bitrate = +static const vlc_guid_t asf_guid_mutex_bitrate = {0xD6E22A01, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}}; -static const guid_t asf_guid_mutex_unknown = +static const vlc_guid_t asf_guid_mutex_unknown = {0xD6E22A02, 0x35DA, 0x11D1, {0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}}; // Obscure ones // http://cpan.uwinnipeg.ca/htdocs/Audio-WMA/Audio/WMA.pm.html -static const guid_t nonasf_object_index_placeholder_guid = +static const vlc_guid_t nonasf_object_index_placeholder_guid = {0xD9AADE20, 0x7C17, 0x4F9C, {0xBC, 0x28, 0x85, 0x55, 0xDD, 0x98, 0xE2, 0xA2}}; -static const guid_t nonasf_object_compatibility = +static const vlc_guid_t nonasf_object_compatibility = {0x26F18B5D, 0x4584, 0x47EC, {0x9F, 0x5F, 0x0E, 0x65, 0x1F, 0x04, 0x52, 0xC9}}; // MS foundations Payload Extensions for non compressed payloads // http://msdn.microsoft.com/en-us/library/windows/desktop/dd757606%28v=vs.85%29.aspx -static const guid_t mfasf_sampleextension_sampleduration_guid = +static const vlc_guid_t mfasf_sampleextension_sampleduration_guid = {0xC6BD9450, 0x867F, 0x4907, {0x83, 0xA3, 0xC7, 0x79, 0x21, 0xB7, 0x33, 0xAD}}; -static const guid_t mfasf_sampleextension_outputcleanpoint_guid = +static const vlc_guid_t mfasf_sampleextension_outputcleanpoint_guid = {0xF72A3C6F, 0x6EB4, 0x4EBC, {0xB1, 0x92, 0x09, 0xAD, 0x97, 0x59, 0xE8, 0x28}}; -static const guid_t mfasf_sampleextension_smtpe_guid = +static const vlc_guid_t mfasf_sampleextension_smtpe_guid = {0x399595EC, 0x8667, 0x4E2D, {0x8F, 0xDB, 0x98, 0x81, 0x4C, 0xE7, 0x6C, 0x1E}}; -static const guid_t mfasf_sampleextension_filename_guid = +static const vlc_guid_t mfasf_sampleextension_filename_guid = {0xE165EC0E, 0x19ED, 0x45D7, {0xB4, 0xA7, 0x25, 0xCB, 0xD1, 0xE2, 0x8E, 0x9B}}; -static const guid_t mfasf_sampleextension_contenttype_guid = +static const vlc_guid_t mfasf_sampleextension_contenttype_guid = {0xD590DC20, 0x07BC, 0x436C, {0x9C, 0xF7, 0xF3, 0xBB, 0xFB, 0xF1, 0xA4, 0xDC}}; -static const guid_t mfasf_sampleextension_pixelaspectratio_guid = +static const vlc_guid_t mfasf_sampleextension_pixelaspectratio_guid = {0x1B1EE554, 0xF9EA, 0x4BC8, {0x82, 0x1A, 0x37, 0x6B, 0x74, 0xE4, 0xC4, 0xB8}}; -static const guid_t mfasf_sampleextension_encryptionsampleid_guid = +static const vlc_guid_t mfasf_sampleextension_encryptionsampleid_guid = {0x6698B84E, 0x0AFA, 0x4330, {0xAE, 0xB2, 0x1C, 0x0A, 0x98, 0xD7, 0xA4, 0x4D}}; -static const guid_t mfasf_sampleextension_encryptionkeyid_guid = +static const vlc_guid_t mfasf_sampleextension_encryptionkeyid_guid = {0x76376591, 0x795F, 0x4DA1, {0x86, 0xED, 0x9D, 0x46, 0xEC, 0xA1, 0x09, 0x49}}; // DVR ones -static const guid_t asf_dvr_sampleextension_videoframe_guid = +static const vlc_guid_t asf_dvr_sampleextension_videoframe_guid = {0xDD6432CC, 0xE229, 0x40DB, {0x80, 0xF6, 0xD2, 0x63, 0x28, 0xD2, 0x76, 0x1F}}; -static const guid_t asf_dvr_sampleextension_timing_rep_data_guid = +static const vlc_guid_t asf_dvr_sampleextension_timing_rep_data_guid = {0xFD3CC02A, 0x06DB, 0x4CFA, {0x80, 0x1C, 0x72, 0x12, 0xd3, 0x87, 0x45, 0xE4}}; /**************************************************************************** * GUID functions ****************************************************************************/ -static inline void ASF_GetGUID( guid_t *p_guid, const uint8_t *p_data ) +static inline void ASF_GetGUID( vlc_guid_t *p_guid, const uint8_t *p_data ) { p_guid->Data1 = GetDWLE( p_data ); p_guid->Data2 = GetWLE( p_data + 4); diff --git a/modules/mux/asf.c b/modules/mux/asf.c index 9b97f533d9..09de797445 100644 --- a/modules/mux/asf.c +++ b/modules/mux/asf.c @@ -132,7 +132,7 @@ typedef struct typedef struct { - guid_t fid; /* file id */ + vlc_guid_t fid; /* file id */ int i_packet_size; int64_t i_packet_count; vlc_tick_t i_dts_first; @@ -817,7 +817,7 @@ static void bo_addle_str16_nosize( bo_t *bo, const char *str ) /**************************************************************************** * GUID definitions ****************************************************************************/ -static void bo_add_guid( bo_t *p_bo, const guid_t *id ) +static void bo_add_guid( bo_t *p_bo, const vlc_guid_t *id ) { bo_addle_u32( p_bo, id->Data1 ); bo_addle_u16( p_bo, id->Data2 ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
