Changeset bd056290df9e85c7534862a31e2e62fa5b6c3c73

Timestamp:

02/27/07 22:15:49 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1172610949 +0000

git-parent:

[c28624748ceb2bcc6d33d2a569a4f1b826ff2e8d]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1172610949 +0000

Message:

- Support for customizing the checksum coverage
- Make UDP-Lite an option rather than a distinct shortcut

Files:

• modules/access_output/udp.c (modified) (8 diffs)

modules/access_output/udp.c

@@ -106 +106 @@
-#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \
-                               "automatically.")
+#define UDPLITE_TEXT N_("UDP-Lite")
+#define UDPLITE_LONGTEXT N_("Use UDP-Lite/IP instead of normal UDP/IP")
+#define CSCOV_TEXT N_("Checksum coverage")
+#define CSCOV_LONGTEXT N_("Payload bytes covered by layer-4 checksum")
-
-vlc_module_begin();
@@ -120 +124 @@
-    add_bool( SOUT_CFG_PREFIX "auto-mcast", 0, NULL, AUTO_MCAST_TEXT,
-              AUTO_MCAST_LONGTEXT, VLC_TRUE );
+    add_bool( SOUT_CFG_PREFIX "udplite", 0, NULL, UDPLITE_TEXT, UDPLITE_LONGTEXT, VLC_TRUE );
+    add_integer( SOUT_CFG_PREFIX "cscov", 12, NULL, CSCOV_TEXT, CSCOV_LONGTEXT, VLC_TRUE );
-
-    set_capability( "sout access", 100 );
-    add_shortcut( "udp" );
-    add_shortcut( "rtp" ); // Will work only with ts muxer
-    add_shortcut( "udplite" );
-    set_callbacks( Open, Close );
-vlc_module_end();
@@ -137 +142 @@
-    "group",
-    "raw",
+    "lite",
+    "cscov",
-    NULL
-};
@@ -205 +212 @@
- * Open: open the file
- *****************************************************************************/
-/* FIXME: lots of leaks in error handling here! */
-static int Open( vlc_object_t *p_this )
-{
@@ -212 +218 @@
-
-    char                *psz_dst_addr = NULL;
-, cscov = 8
+
-    const char          *protoname = "UDP";
-
@@ -224 +230 @@
-                       ppsz_core_options, p_access->p_cfg );
-
-    if( !( p_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) )
-    {
-        msg_Err( p_access, "not enough memory" );
-        return VLC_EGENERIC;
-    }
-    p_access->p_sys = p_sys;
-
-    if( p_access->psz_access != NULL )
-    {
-        if (strcmp (p_access->psz_access, "rtp") == 0)
-            p_sys->b_rtpts = VLC_TRUE;
-        if (strcmp (p_access->psz_access, "udplite") == 0)
-        {
-            protoname = "UDP-Lite";
-            proto = IPPROTO_UDPLITE;
-            p_sys->b_rtpts = VLC_TRUE;
-        }
-    }
-    if (p_sys->b_rtpts)
-        cscov += RTP_HEADER_LENGTH;
-
-    i_dst_port = DEFAULT_PORT;
-    if (var_CreateGetBool (p_access, SOUT_CFG_PREFIX"auto-mcast"))
-    {
-        char buf[INET6_ADDRSTRLEN];
-        if (MakeRandMulticast (AF_INET, buf, sizeof (buf)) != NULL)
-            psz_dst_addr = strdup (buf);
-    }
-    else
-    {
-        char *psz_parser = psz_dst_addr = strdup( p_access->psz_path );
-
-        if (psz_parser[0] == '[')
-            psz_parser = strchr (psz_parser, ']');
-
-        psz_parser = strchr (psz_parser, ':');
-        if (psz_parser != NULL)
-        {
-            *psz_parser++ = '\0';
-            i_dst_port = atoi (psz_parser);
-        }
-    }
-
-    if (var_Create (p_access, "dst-port", VLC_VAR_INTEGER)
-     || var_Create (p_access, "src-port", VLC_VAR_INTEGER)
@@ -272 +235 @@
-     || var_Create (p_access, "src-addr", VLC_VAR_STRING))
-    {
-        free (p_sys);
-        free (psz_dst_addr);
-        return VLC_ENOMEM;
+    }
+
+    if( !( p_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) )
+    {
+        msg_Err( p_access, "not enough memory" );
+        return VLC_ENOMEM;
+    }
+    p_access->p_sys = p_sys;
+
+    if( p_access->psz_access != NULL )
+    {
+        if (strcmp (p_access->psz_access, "rtp") == 0)
+            p_sys->b_rtpts = VLC_TRUE;
+    }
+
+    if (var_GetBool (p_access, SOUT_CFG_PREFIX"lite"))
+    {
+        protoname = "UDP-Lite";
+        proto = IPPROTO_UDPLITE;
+    }
+
+    i_dst_port = DEFAULT_PORT;
+    if (var_GetBool (p_access, SOUT_CFG_PREFIX"auto-mcast"))
+    {
+        char buf[INET6_ADDRSTRLEN];
+        if (MakeRandMulticast (AF_INET, buf, sizeof (buf)) != NULL)
+            psz_dst_addr = strdup (buf);
+    }
+    else
+    {
+        char *psz_parser = psz_dst_addr = strdup( p_access->psz_path );
+
+        if (psz_parser[0] == '[')
+            psz_parser = strchr (psz_parser, ']');
+
+        psz_parser = strchr (psz_parser, ':');
+        if (psz_parser != NULL)
+        {
+            *psz_parser++ = '\0';
+            i_dst_port = atoi (psz_parser);
+        }
-    }
-
@@ -326 +328 @@
-    shutdown( i_handle, SHUT_RD );
-
+    int cscov = var_GetInteger (p_access, SOUT_CFG_PREFIX"cscov");
+    if (cscov)
+    {
+        switch (proto)
+        {
-#ifdef UDPLITE_SEND_CSCOV
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    var_Get( p_access, SOUT_CFG_PREFIX "caching", &val );