ASF Muxer: use the GUID definitions from the asf demuxer

diff --git a/modules/demux/asf/libasf_guid.h b/modules/demux/asf/libasf_guid.h
index ea343cd3daea8d690a2cb9e7f901162146b4c1b6..6dcf42bb583e12bfbadb0f76176dc4ed1271ad98 100644 (file)
--- a/modules/demux/asf/libasf_guid.h
+++ b/modules/demux/asf/libasf_guid.h
@@ -197,6 +197,19 @@ static const guid_t asf_object_extended_stream_header =
 static const 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 =
+{0xABD3D211, 0xA9BA, 0x11cf, {0x8E, 0xE6, 0x00, 0xC0, 0x0C ,0x20, 0x53, 0x65}};
+
+static const 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 =
+{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}};
+
 
 #define ASF_OBJECT_COMMON          \
     int          i_type;           \

diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am
index b644bfff11cff5c683e84a78f9b9177112e56e0f..b166cf39797b14f5c246aa67f002703d3c1fb857 100644 (file)
--- a/modules/mux/Modules.am
+++ b/modules/mux/Modules.am
@@ -3,7 +3,7 @@ SOURCES_mux_dummy = dummy.c
 SOURCES_mux_avi = avi.c
 SOURCES_mux_ogg = ogg.c
 SOURCES_mux_mp4 = mp4.c
-SOURCES_mux_asf = asf.c
+SOURCES_mux_asf = asf.c ../demux/asf/libasf_guid.h
 SOURCES_mux_wav = wav.c
 SOURCES_mux_mpjpeg = mpjpeg.c
 

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index e5b1ca39187c8b8ce7212cb9c1f697b5efb42d4e..654105558a279b63be75e3e13e77e3eb200e39b9 100644 (file)
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -40,7 +40,7 @@
 #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
@@ -825,41 +825,6 @@ static void bo_add_guid( bo_t *p_bo, const guid_t *id )
     }
 }
 
-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
  ****************************************************************************/
@@ -1096,12 +1061,12 @@ static block_t *asf_header_create( sout_mux_t *p_mux, bool b_broadcast )
             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 );
@@ -1125,7 +1090,7 @@ static block_t *asf_header_create( sout_mux_t *p_mux, bool b_broadcast )
     /* 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++ )
     {