Changeset 23333fe28c426f606e9027ae2d30e4b14a245365

Timestamp:

10/02/07 18:33:27 (2 years ago)

Author:

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

git-committer:

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

git-parent:

[c66322492686f7eaffeb2622f58430984a54be82]

git-author:

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

Message:

Restore some kind of SAP support

Files:

• include/vlc_sout.h (modified) (1 diff)
• modules/stream_out/standard.c (modified) (5 diffs)
• src/stream_output/announce.c (modified) (1 diff)
• src/stream_output/sap.c (modified) (2 diffs)
• src/stream_output/stream_output.h (modified) (1 diff)

include/vlc_sout.h

@@ -216 +216 @@
-
-VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, (vlc_object_t *obj, const char *cfgpref) );
+VLC_EXPORT(int,                  sout_SessionSetMedia, (vlc_object_t *obj, session_descriptor_t *, char *, char *, int, char *, int) );
-VLC_EXPORT(void,                 sout_AnnounceSessionDestroy, (session_descriptor_t *) );
-VLC_EXPORT(announce_method_t*,   sout_SAPMethod, (void) );

modules/stream_out/standard.c

@@ -25 +25 @@
- * Preamble
- *****************************************************************************/
+#include <vlc/vlc.h>
+#include <vlc_sout.h>
+
-#include <stdlib.h>
-#include <string.h>
-
-
-
+
-
-#include <vlc_network.h>
@@ -246 +247 @@
-            psz_mux = strdup("asfh");
-        }
-
-
+
+
+
+
-        {
-            psz_mux = strdup("ts");
@@ -338 +341 @@
-
-    /* *** Create the SAP Session structure *** */
-
-
+
-    {
-        session_descriptor_t *p_session;
-        announce_method_t *p_method = sout_SAPMethod ();
-        vlc_url_t url;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Now, parse the URL to extract host and port */
@@ -356 +415 @@
-            p_session->psz_uri = strdup( url.psz_host );
-            p_session->i_port = url.i_port;
-            p_session->i_payload = 33;
-            p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0;
-#endif
@@ -367 +425 @@
-        sout_MethodRelease (p_method);
-    }
+nosap:
-
-    p_stream->pf_add    = Add;

src/stream_output/announce.c

@@ -191 +191 @@
-
-    return p_session;
+}
+
+int sout_SessionSetMedia (vlc_object_t *obj, session_descriptor_t *p_session,
+                          char *fmt, char *src, int sport,
+                          char *dst, int dport)
+{
+    p_session->sdpformat = fmt;
+
+    /* GRUIK. We should not convert back-and-forth from string to numbers */
+    struct addrinfo *res;
+    if (vlc_getaddrinfo (obj, dst, dport, NULL, &res) == 0)
+    {
+        if (res->ai_addrlen <= sizeof (p_session->addr))
+            memcpy (&p_session->addr, res->ai_addr,
+                    p_session->addrlen = res->ai_addrlen);
+        freeaddrinfo (res);
+    }
+    if (vlc_getaddrinfo (obj, src, sport, NULL, &res) == 0)
+    {
+        if (res->ai_addrlen <= sizeof (p_session->orig))
+            memcpy (&p_session->orig, res->ai_addr,
+                    p_session->origlen = res->ai_addrlen);
+        freeaddrinfo (res);
+    }
+    return 0;
-}
-

src/stream_output/sap.c

@@ -383 +383 @@
-        {
-            net_StopRecv( p_address->i_wfd );
+            p_address->origlen = sizeof (p_address->orig);
-            getsockname (p_address->i_wfd, (struct sockaddr *)&p_address->orig,
-                         &p_address->origlen);
@@ -625 +626 @@
-
-    int res = asprintf (&psz_sdp, "%s" "%s" "%s"
- %d
+
-                        head,
-                        plgroup ?: "",
-                        sfilter ?: "",
-                        net_GetPort ((const struct sockaddr *)&p_session->addr),
-
-
+
-    free (plgroup);
-    free (sfilter);

src/stream_output/stream_output.h

@@ -84 +84 @@
-    socklen_t addrlen;
-
-
-
+
-    char *psz_sdp;
-    vlc_bool_t b_rtp;
-    vlc_bool_t b_ssm;
-};