DTV: add so-called "Clear" QAM

[vlc] / modules / stream_out / standard.c

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 98df6737588faf82b01fe00e6b6e411c04ff3c6a..c518b98dad22eee2eb28fd76d75a0c5d0d9da244 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -100,38 +100,34 @@ vlc_module_begin ()
     set_shortname( N_("Standard"))
     set_description( N_("Standard stream output") )
     set_capability( "sout stream", 50 )
-    add_shortcut( "standard" )
-    add_shortcut( "std" )
-    add_shortcut( "file" )
-    add_shortcut( "http" )
-    add_shortcut( "udp" )
+    add_shortcut( "standard", "std", "file", "http", "udp" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
 
-    add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
+    add_string( SOUT_CFG_PREFIX "access", "", ACCESS_TEXT,
                 ACCESS_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
+    add_string( SOUT_CFG_PREFIX "mux", "", MUX_TEXT,
                 MUX_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
+    add_string( SOUT_CFG_PREFIX "dst", "", DEST_TEXT,
                 DEST_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "bind", "", NULL, BIND_TEXT,
+    add_string( SOUT_CFG_PREFIX "bind", "", BIND_TEXT,
                 BIND_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "path", "", NULL, PATH_TEXT,
+    add_string( SOUT_CFG_PREFIX "path", "", PATH_TEXT,
                 PATH_LONGTEXT, false )
 
-    add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT,
+    add_bool( SOUT_CFG_PREFIX "sap", false, SAP_TEXT, SAP_LONGTEXT,
               true )
-    add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "name", "", NAME_TEXT, NAME_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "group", "", GROUP_TEXT, GROUP_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "description", "", DESC_TEXT, DESC_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "url", "", URL_TEXT, URL_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "email", "", EMAIL_TEXT, EMAIL_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "phone", "", PHONE_TEXT, PHONE_LONGTEXT,
                                         true )
     add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" )
 
@@ -249,6 +245,9 @@ static int Open( vlc_object_t *p_this )
             { "avi", "avi" },
             { "ogg", "ogg" },
             { "ogm", "ogg" },
+            { "ogv", "ogg" },
+            { "flac","raw" },
+            { "mp3", "raw" },
             { "mp4", "mp4" },
             { "mov", "mov" },
             { "moov","mov" },
@@ -264,13 +263,13 @@ static int Open( vlc_object_t *p_this )
             { "wav", "wav" },
             { "flv", "ffmpeg{mux=flv}" },
             { "mkv", "ffmpeg{mux=matroska}"},
+            { "webm", "ffmpeg{mux=webm}"},
             { "",    "" }
         };
         const char *psz_ext = strrchr( psz_url, '.' ) + 1;
-        int  i;
 
         msg_Dbg( p_this, "extension is %s", psz_ext );
-        for( i = 0; exttomux[i].ext[0]; i++ )
+        for( int i = 0; exttomux[i].ext[0]; i++ )
         {
             if( !strcasecmp( psz_ext, exttomux[i].ext ) )
             {
@@ -438,13 +437,13 @@ static int Open( vlc_object_t *p_this )
         if ( vlc_getaddrinfo ( VLC_OBJECT(p_stream), dhost, dport, &hints, &res) == 0)
         {
             memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen);
-            vlc_freeaddrinfo (res);
+            freeaddrinfo (res);
         }
 
         if (vlc_getaddrinfo ( VLC_OBJECT(p_stream), shost, sport, &hints, &res) == 0)
         {
             memcpy (&src, res->ai_addr, srclen = res->ai_addrlen);
-            vlc_freeaddrinfo (res);
+            freeaddrinfo (res);
         }
 
         char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX,
@@ -464,12 +463,9 @@ static int Open( vlc_object_t *p_this )
         /* Register the SDP with the SAP thread */
         if (psz_sdp != NULL)
         {
-            announce_method_t *p_method = sout_SAPMethod ();
             msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp);
-
             p_sys->p_session =
-                sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method);
-            sout_MethodRelease (p_method);
+                sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost);
             free( psz_sdp );
         }
         free (dhost);