X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtsp.c;h=cf0543e43523be0d1efca9b7b6d11f72720e0247;hb=4d269a64d89a1bc5ee1d25d6aa0ecc71049a16d8;hp=8437c7379a04d4c7bcac8738c6ae4e413d643507;hpb=fe182634ea51564a9f1374eb337b27890da15ef0;p=vlc

diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index 8437c7379a..cf0543e435 100644
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 
 #include <vlc_httpd.h>
@@ -53,6 +53,7 @@ struct rtsp_stream_t
     httpd_url_t    *url;
     char           *psz_path;
     const char     *track_fmt;
+    unsigned        track_id;
     unsigned        port;
 
     int             sessionc;
@@ -84,6 +85,7 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
     rtsp->host = NULL;
     rtsp->url = NULL;
     rtsp->psz_path = NULL;
+    rtsp->track_id = 0;
     vlc_mutex_init( &rtsp->lock );
 
     rtsp->port = (url->i_port > 0) ? url->i_port : 554;
@@ -138,6 +140,8 @@ void RtspUnsetup( rtsp_stream_t *rtsp )
 
     free( rtsp->psz_path );
     vlc_mutex_destroy( &rtsp->lock );
+
+    free( rtsp );
 }
 
 
@@ -148,6 +152,7 @@ struct rtsp_stream_id_t
     httpd_url_t      *url;
     const char       *dst;
     int               ttl;
+    unsigned          track_id;
     uint32_t          ssrc;
     uint16_t          loport, hiport;
 };
@@ -170,14 +175,14 @@ struct rtsp_session_t
 /* Unicast session track */
 struct rtsp_strack_t
 {
-    sout_stream_id_t  *id;
+    rtsp_stream_id_t  *id;
     int                fd;
     bool         playing;
 };
 
 
 rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
-                             unsigned num, uint32_t ssrc,
+                             uint32_t ssrc,
                              /* Multicast stuff - TODO: cleanup */
                              const char *dst, int ttl,
                              unsigned loport, unsigned hiport )
@@ -191,6 +196,7 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
 
     id->stream = rtsp;
     id->sout_id = sid;
+    id->track_id = rtsp->track_id;
     id->ssrc = ssrc;
     /* TODO: can we assume that this need not be strdup'd? */
     id->dst = dst;
@@ -201,9 +207,8 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
         id->hiport = hiport;
     }
 
-    /* FIXME: num screws up if any ES has been removed and re-added */
     snprintf( urlbuf, sizeof( urlbuf ), rtsp->track_fmt, rtsp->psz_path,
-              num );
+              id->track_id );
     msg_Dbg( rtsp->owner, "RTSP: adding %s", urlbuf );
     url = id->url = httpd_UrlNewUnique( rtsp->host, urlbuf, NULL, NULL, NULL );
 
@@ -220,6 +225,8 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
     httpd_UrlCatch( url, HTTPD_MSG_GETPARAMETER, RtspCallbackId, (void *)id );
     httpd_UrlCatch( url, HTTPD_MSG_TEARDOWN, RtspCallbackId, (void *)id );
 
+    rtsp->track_id++;
+
     return id;
 }
 
@@ -233,7 +240,7 @@ void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t *id )
 
         for( int j = 0; j < ses->trackc; j++ )
         {
-            if( ses->trackv[j].id == id->sout_id )
+            if( ses->trackv[j].id == id )
             {
                 rtsp_strack_t *tr = ses->trackv + j;
                 net_Close( tr->fd );
@@ -301,7 +308,7 @@ void RtspClientDel( rtsp_stream_t *rtsp, rtsp_session_t *session )
     TAB_REMOVE( rtsp->sessionc, rtsp->sessionv, session );
 
     for( i = 0; i < session->trackc; i++ )
-        rtp_del_sink( session->trackv[i].id, session->trackv[i].fd );
+        rtp_del_sink( session->trackv[i].id->sout_id, session->trackv[i].fd );
 
     free( session->trackv );
     free( session );
@@ -348,6 +355,9 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
     const char *psz_session = NULL, *psz;
     char control[sizeof("rtsp://[]:12345") + NI_MAXNUMERICHOST
                   + strlen( rtsp->psz_path )];
+    time_t now;
+
+    time (&now);
 
     if( answer == NULL || query == NULL || cl == NULL )
         return VLC_SUCCESS;
@@ -376,6 +386,22 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
     answer->i_body = 0;
     answer->p_body = NULL;
 
+    httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING );
+
+    /* Date: is always allowed, and sometimes mandatory with RTSP/2.0. */
+    struct tm ut;
+    if (gmtime_r (&now, &ut) != NULL)
+    {   /* RFC1123 format, GMT is mandatory */
+        static const char wdays[7][4] = {
+            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+        static const char mons[12][4] = {
+            "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+            "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+        httpd_MsgAdd (answer, "Date", "%s, %02u %s %04u %02u:%02u:%02u GMT",
+                      wdays[ut.tm_wday], ut.tm_mday, mons[ut.tm_mon],
+                      1900 + ut.tm_year, ut.tm_hour, ut.tm_min, ut.tm_sec);
+    }
+
     if( query->i_proto != HTTPD_PROTO_RTSP )
     {
         answer->i_status = 505;
@@ -516,7 +542,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
                 {
                     char ip[NI_MAXNUMERICHOST], src[NI_MAXNUMERICHOST];
                     rtsp_session_t *ses = NULL;
-                    rtsp_strack_t track = { id->sout_id, -1, false };
+                    rtsp_strack_t track = { id, -1, false };
                     int sport;
 
                     if( httpd_ClientIP( cl, ip ) == NULL )
@@ -536,6 +562,9 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
                         continue;
                     }
 
+                    /* Ignore any unexpected incoming packet */
+                    setsockopt (track.fd, SOL_SOCKET, SO_RCVBUF, &(int){ 0 },
+                                sizeof (int));
                     net_GetSockAddress( track.fd, src, &sport );
 
                     vlc_mutex_lock( &rtsp->lock );
@@ -600,29 +629,43 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
             rtsp_session_t *ses;
             answer->i_status = 200;
 
+            psz_session = httpd_MsgGet( query, "Session" );
+            const char *range = httpd_MsgGet (query, "Range");
+            if (range && strncmp (range, "npt=", 4))
+            {
+                answer->i_status = 501;
+                break;
+            }
+
             vlc_mutex_lock( &rtsp->lock );
             ses = RtspClientGet( rtsp, psz_session );
             if( ses != NULL )
             {
                 /* FIXME: we really need to limit the number of tracks... */
                 char info[ses->trackc * ( strlen( control )
-                                  + sizeof("/trackID=123;seq=65535, ") ) + 1];
+                              + sizeof("url=/trackID=123;seq=65535;"
+                                       "rtptime=4294967295, ") ) + 1];
                 size_t infolen = 0;
+                int64_t ts = rtp_get_ts( rtsp->owner );
 
                 for( int i = 0; i < ses->trackc; i++ )
                 {
                     rtsp_strack_t *tr = ses->trackv + i;
-                    if( ( id == NULL ) || ( tr->id == id->sout_id ) )
+                    if( ( id == NULL ) || ( tr->id == id ) )
                     {
+                        uint16_t seq;
                         if( !tr->playing )
                         {
                             tr->playing = true;
-                            rtp_add_sink( tr->id, tr->fd, false );
+                            rtp_add_sink( tr->id->sout_id, tr->fd, false,
+                                          &seq );
                         }
+                        else
+                            seq = rtp_get_seq( tr->id->sout_id );
                         infolen += sprintf( info + infolen,
-                                            "%s/trackID=%u;seq=%u, ", control,
-                                            rtp_get_num( tr->id ),
-                                            rtp_get_seq( tr->id ) );
+                                    "url=%s/trackID=%u;seq=%u;rtptime=%u, ",
+                                    control, tr->id->track_id, seq,
+                                    rtp_compute_ts( tr->id->sout_id, ts ) );
                     }
                 }
                 if( infolen > 0 )
@@ -633,7 +676,6 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
             }
             vlc_mutex_unlock( &rtsp->lock );
 
-            httpd_MsgAdd( answer, "Range", "npt=now-" );
             if( httpd_MsgGet( query, "Scale" ) != NULL )
                 httpd_MsgAdd( answer, "Scale", "1." );
             break;
@@ -674,7 +716,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
                 else /* Delete one track from the session */
                 for( int i = 0; i < ses->trackc; i++ )
                 {
-                    if( ses->trackv[i].id == id->sout_id )
+                    if( ses->trackv[i].id == id )
                     {
                         rtp_del_sink( id->sout_id, ses->trackv[i].fd );
                         REMOVE_ELEM( ses->trackv, ses->trackc, i );
@@ -689,7 +731,6 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id,
             return VLC_EGENERIC;
     }
 
-    httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING );
     if( psz_session )
         httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session );