]> git.sesse.net Git - vlc/blobdiff - modules/misc/rtsp.c
Removes trailing spaces. Removes tabs.
[vlc] / modules / misc / rtsp.c
index a63d3dc3d91a1c06ec5a28cf737848c342006a12..566966678926c723180945b9e1ba088eeccb4d03 100644 (file)
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-
-#include <errno.h>
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_input.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
 
 #include "vlc_httpd.h"
 #include "vlc_vod.h"
 #include "vlc_url.h"
-#include "network.h"
-#include "charset.h"
+#include <vlc_network.h>
+#include <vlc_charset.h>
+#include <vlc_strings.h>
+
+#include <errno.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -46,11 +47,10 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 #define HOST_TEXT N_( "RTSP host address" )
-/// \bug [String] extra space
 #define HOST_LONGTEXT N_( \
     "This defines the address, port and path the RTSP VOD server will listen " \
     "on.\nSyntax is address:port/path. The default is to listen on all "\
-    "interfaces (address 0.0.0.0), on port 554, with no path.\n To listen " \
+    "interfaces (address 0.0.0.0), on port 554, with no path.\nTo listen " \
     "only on the local interface, use \"localhost\" as address." )
 
 #define THROTLE_TEXT N_( "Maximum number of connections" )
@@ -59,6 +59,13 @@ static void Close( vlc_object_t * );
 
 #define RAWMUX_TEXT N_( "MUX for RAW RTSP transport" )
 
+#define SESSION_TIMEOUT_TEXT N_( "Sets the timeout option in the RTSP " \
+    "session string" )
+#define SESSION_TIMEOUT_LONGTEXT N_( "Defines what timeout option to add " \
+    "to the RTSP session ID string. Setting it to a negative number removes " \
+    "the timeout option entirely. This is needed by some IPTV STBs (such as " \
+    "those made by HansunTech) which get confused by it. The default is 5." )
+
 vlc_module_begin();
     set_shortname( _("RTSP VoD" ) );
     set_description( _("RTSP VoD server") );
@@ -68,9 +75,12 @@ vlc_module_begin();
     set_callbacks( Open, Close );
     add_shortcut( "rtsp" );
     add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
-    add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT, RAWMUX_TEXT, VLC_TRUE );
+    add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT,
+                RAWMUX_TEXT, VLC_TRUE );
     add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT,
                                            THROTLE_LONGTEXT, VLC_TRUE );
+    add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
+                 SESSION_TIMEOUT_LONGTEXT, VLC_TRUE );
 vlc_module_end();
 
 /*****************************************************************************
@@ -120,6 +130,8 @@ struct media_es_t
 
 struct vod_media_t
 {
+    int id;
+
     /* VoD server */
     vod_t *p_vod;
 
@@ -171,24 +183,48 @@ struct vod_sys_t
 
     char *psz_raw_mux;
 
+    int i_session_timeout;
+
     /* List of media */
+    vlc_mutex_t lock_media;
+    int i_media_id;
     int i_media;
     vod_media_t **media;
+
+    /* */
+    block_fifo_t *p_fifo_cmd;
 };
 
+/* rtsp delayed command (to avoid deadlock between vlm/httpd) */
+typedef enum
+{
+    RTSP_CMD_TYPE_NONE,  /* Exit requested */
+
+    RTSP_CMD_TYPE_PLAY,
+    RTSP_CMD_TYPE_PAUSE,
+    RTSP_CMD_TYPE_STOP,
+    RTSP_CMD_TYPE_SEEK,
+    RTSP_CMD_TYPE_REWIND,
+    RTSP_CMD_TYPE_FORWARD,
+} rtsp_cmd_type_t;
+
 static vod_media_t *MediaNew( vod_t *, const char *, input_item_t * );
 static void         MediaDel( vod_t *, vod_media_t * );
 static int          MediaAddES( vod_t *, vod_media_t *, es_format_t * );
 static void         MediaDelES( vod_t *, vod_media_t *, es_format_t * );
 
+static void CommandThread( vlc_object_t *p_this );
+static void CommandPush( vod_t *, rtsp_cmd_type_t, vod_media_t *, const char *psz_session,
+                         double f_arg, const char *psz_arg );
+
 static rtsp_client_t *RtspClientNew( vod_media_t *, char * );
-static rtsp_client_t *RtspClientGet( vod_media_t *, char * );
+static rtsp_client_t *RtspClientGet( vod_media_t *, const char * );
 static void           RtspClientDel( vod_media_t *, rtsp_client_t * );
 
 static int RtspCallback( httpd_callback_sys_t *, httpd_client_t *,
-                         httpd_message_t *, httpd_message_t * );
+                         httpd_message_t *, const httpd_message_t * );
 static int RtspCallbackES( httpd_callback_sys_t *, httpd_client_t *,
-                           httpd_message_t *, httpd_message_t * );
+                           httpd_message_t *, const httpd_message_t * );
 
 static char *SDPGenerate( const vod_media_t *, httpd_client_t *cl );
 
@@ -225,13 +261,13 @@ static int Open( vlc_object_t *p_this )
     if( !p_sys ) goto error;
     p_sys->p_rtsp_host = 0;
 
-    var_Create( p_this, "rtsp-throttle-users", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    p_sys->i_throttle_users = var_GetInteger( p_this, "rtsp-throtle-users" );
+    p_sys->i_session_timeout = var_CreateGetInteger( p_this, "rtsp-session-timeout" );
+
+    p_sys->i_throttle_users = var_CreateGetInteger( p_this, "rtsp-throttle-users" );
     msg_Dbg( p_this, "allowing up to %d connections", p_sys->i_throttle_users );
     p_sys->i_connections = 0;
 
-    var_Create( p_this, "rtsp-raw-mux", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    p_sys->psz_raw_mux = var_GetString( p_this, "rtsp-raw-mux" );
+    p_sys->psz_raw_mux = var_CreateGetString( p_this, "rtsp-raw-mux" );
 
     p_sys->p_rtsp_host =
         httpd_HostNew( VLC_OBJECT(p_vod), url.psz_host, url.i_port );
@@ -246,14 +282,27 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_port = url.i_port;
 
     vlc_UrlClean( &url );
-    p_sys->media = NULL;
-    p_sys->i_media = 0;
+
+    vlc_mutex_init( p_vod, &p_sys->lock_media );
+
+    TAB_INIT( p_sys->i_media, p_sys->media );
+    p_sys->i_media_id = 0;
 
     p_vod->pf_media_new = MediaNew;
     p_vod->pf_media_del = MediaDel;
     p_vod->pf_media_add_es = MediaAddES;
     p_vod->pf_media_del_es = MediaDelES;
 
+    p_sys->p_fifo_cmd = block_FifoNew( p_vod );
+    if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread,
+                           VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+    {
+        msg_Err( p_vod, "cannot spawn rtsp vod thread" );
+        block_FifoRelease( p_sys->p_fifo_cmd );
+        free( p_sys->psz_path );
+        goto error;
+    }
+
     return VLC_SUCCESS;
 
 error:
@@ -273,11 +322,25 @@ static void Close( vlc_object_t * p_this )
     vod_t *p_vod = (vod_t *)p_this;
     vod_sys_t *p_sys = p_vod->p_sys;
 
+    /* Stop command thread */
+    vlc_object_kill( p_vod );
+    CommandPush( p_vod, RTSP_CMD_TYPE_NONE, NULL, NULL, 0.0, NULL );
+    vlc_thread_join( p_vod );
+
+    block_FifoRelease( p_sys->p_fifo_cmd );
+
     httpd_HostDelete( p_sys->p_rtsp_host );
+    var_Destroy( p_this, "rtsp-session-timeout" );
     var_Destroy( p_this, "rtsp-throttle-users" );
     var_Destroy( p_this, "rtsp-raw-mux" );
 
-    /* TODO delete medias */
+    /* Check VLM is not buggy */
+    if( p_sys->i_media > 0 )
+        msg_Err( p_vod, "rtsp vod leaking %d medias", p_sys->i_media );
+    TAB_CLEAN( p_sys->i_media, p_sys->media );
+
+    vlc_mutex_destroy( &p_sys->lock_media );
+
     free( p_sys->psz_path );
     free( p_sys->psz_raw_mux );
     free( p_sys );
@@ -300,12 +363,15 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
     }
 
     memset( p_media, 0, sizeof(vod_media_t) );
-    p_media->es = 0;
+    p_media->id = p_sys->i_media_id++;
+    TAB_INIT( p_media->i_es, p_media->es );
     p_media->psz_mux = 0;
-    p_media->rtsp = 0;
+    TAB_INIT( p_media->i_rtsp, p_media->rtsp );
     p_media->b_raw = VLC_FALSE;
 
-    asprintf( &p_media->psz_rtsp_path, "%s%s", p_sys->psz_path, psz_name );
+    if( asprintf( &p_media->psz_rtsp_path, "%s%s",
+                  p_sys->psz_path, psz_name ) <0 )
+        return NULL;
     p_media->p_rtsp_url =
         httpd_UrlNewUnique( p_sys->p_rtsp_host, p_media->psz_rtsp_path, NULL,
                             NULL, NULL );
@@ -320,12 +386,14 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
 
     msg_Dbg( p_vod, "created RTSP url: %s", p_media->psz_rtsp_path );
 
-    asprintf( &p_media->psz_rtsp_control_v4,
+    if( asprintf( &p_media->psz_rtsp_control_v4,
                "a=control:rtsp://%%s:%d%s/trackID=%%d\r\n",
-               p_sys->i_port, p_media->psz_rtsp_path );
-    asprintf( &p_media->psz_rtsp_control_v6,
+               p_sys->i_port, p_media->psz_rtsp_path ) < 0 )
+        return NULL;
+    if( asprintf( &p_media->psz_rtsp_control_v6,
                "a=control:rtsp://[%%s]:%d%s/trackID=%%d\r\n",
-              p_sys->i_port, p_media->psz_rtsp_path );
+              p_sys->i_port, p_media->psz_rtsp_path ) < 0 )
+        return NULL;
 
     httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_SETUP,
                     RtspCallback, (void*)p_media );
@@ -342,7 +410,9 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
 
     p_media->p_vod = p_vod;
 
+    vlc_mutex_lock( &p_sys->lock_media );
     TAB_APPEND( p_sys->i_media, p_sys->media, p_media );
+    vlc_mutex_unlock( &p_sys->lock_media );
 
     vlc_mutex_init( p_vod, &p_media->lock );
     p_media->psz_session_name = strdup("");
@@ -357,7 +427,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
 
     p_media->i_sdp_id = mdate();
     p_media->i_sdp_version = 1;
-    p_media->i_length = p_item->i_duration;
+    p_media->i_length = input_item_GetDuration( p_item );
 
     vlc_mutex_lock( &p_item->lock );
     msg_Dbg( p_vod, "media has %i declared ES", p_item->i_es );
@@ -376,21 +446,31 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
 
     msg_Dbg( p_vod, "deleting media: %s", p_media->psz_rtsp_path );
 
-    while( p_media->i_rtsp > 0 ) RtspClientDel( p_media, p_media->rtsp[0] );
+    vlc_mutex_lock( &p_sys->lock_media );
+    TAB_REMOVE( p_sys->i_media, p_sys->media, p_media );
+    vlc_mutex_unlock( &p_sys->lock_media );
+
+    while( p_media->i_rtsp > 0 )
+        RtspClientDel( p_media, p_media->rtsp[0] );
+    TAB_CLEAN( p_media->i_rtsp, p_media->rtsp );
+
     httpd_UrlDelete( p_media->p_rtsp_url );
     if( p_media->psz_rtsp_path ) free( p_media->psz_rtsp_path );
     if( p_media->psz_rtsp_control_v6 ) free( p_media->psz_rtsp_control_v6 );
     if( p_media->psz_rtsp_control_v4 ) free( p_media->psz_rtsp_control_v4 );
 
-    TAB_REMOVE( p_sys->i_media, p_sys->media, p_media );
-
-    while( p_media->i_es ) MediaDelES( p_vod, p_media, &p_media->es[0]->fmt );
+    while( p_media->i_es )
+        MediaDelES( p_vod, p_media, &p_media->es[0]->fmt );
+    TAB_CLEAN( p_media->i_es, p_media->es );
 
     vlc_mutex_destroy( &p_media->lock );
-    free( p_media->psz_session_name );
-    free( p_media->psz_session_description );
-    free( p_media->psz_session_url );
-    free( p_media->psz_session_email );
+
+    if( p_media->psz_session_name ) free( p_media->psz_session_name );
+    if( p_media->psz_session_description )
+        free( p_media->psz_session_description );
+    if( p_media->psz_session_url ) free( p_media->psz_session_url );
+    if( p_media->psz_session_email ) free( p_media->psz_session_email );
+    if( p_media->psz_mux ) free( p_media->psz_mux );
     free( p_media );
 }
 
@@ -399,12 +479,16 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
     media_es_t *p_es = malloc( sizeof(media_es_t) );
     char *psz_urlc;
 
+    if( !p_es ) return VLC_ENOMEM;
     memset( p_es, 0, sizeof(media_es_t) );
+
+    if( p_media->psz_mux ) free( p_media->psz_mux );
     p_media->psz_mux = NULL;
 
     /* TODO: update SDP, etc... */
-    asprintf( &psz_urlc, "%s/trackID=%d",
-              p_media->psz_rtsp_path, p_media->i_es );
+    if( asprintf( &psz_urlc, "%s/trackID=%d",
+              p_media->psz_rtsp_path, p_media->i_es ) < 0 )
+        return VLC_ENOMEM;
     msg_Dbg( p_vod, "  - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc );
 
     switch( p_fmt->i_codec )
@@ -414,7 +498,8 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
             {
                 p_es->i_payload_type = 11;
             }
-            else if( p_fmt->audio.i_channels == 2 && p_fmt->audio.i_rate == 44100 )
+            else if( p_fmt->audio.i_channels == 2 &&
+                     p_fmt->audio.i_rate == 44100 )
             {
                 p_es->i_payload_type = 10;
             }
@@ -451,7 +536,60 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
         case VLC_FOURCC( 'h', '2', '6', '4' ):
             p_es->i_payload_type = p_media->i_payload_type++;
             p_es->psz_rtpmap = strdup( "H264/90000" );
-            p_es->psz_fmtp = strdup( "packetization-mode=1" );
+            p_es->psz_fmtp = NULL;
+            /* FIXME AAAAAAAAAAAARRRRRRRRGGGG copied from stream_out/rtp.c */
+            if( p_fmt->i_extra > 0 )
+            {
+                uint8_t *p_buffer = p_fmt->p_extra;
+                int     i_buffer = p_fmt->i_extra;
+                char    *p_64_sps = NULL;
+                char    *p_64_pps = NULL;
+                char    hexa[6+1];
+
+                while( i_buffer > 4 &&
+                       p_buffer[0] == 0 && p_buffer[1] == 0 &&
+                       p_buffer[2] == 0 && p_buffer[3] == 1 )
+                {
+                    const int i_nal_type = p_buffer[4]&0x1f;
+                    int i_offset;
+                    int i_size      = 0;
+
+                    i_size = i_buffer;
+                    for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++)
+                    {
+                        if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
+                        {
+                            /* we found another startcode */
+                            i_size = i_offset;
+                            break;
+                        }
+                    }
+                    if( i_nal_type == 7 )
+                    {
+                        p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
+                        sprintf_hexa( hexa, &p_buffer[5], 3 );
+                    }
+                    else if( i_nal_type == 8 )
+                    {
+                        p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
+                    }
+                    i_buffer -= i_size;
+                    p_buffer += i_size;
+                }
+                /* */
+                if( p_64_sps && p_64_pps )
+                    if( asprintf( &p_es->psz_fmtp,
+                                  "packetization-mode=1;profile-level-id=%s;"
+                                  "sprop-parameter-sets=%s,%s;", hexa, p_64_sps,
+                                  p_64_pps ) < 0 )
+                        return VLC_ENOMEM;
+                if( p_64_sps )
+                    free( p_64_sps );
+                if( p_64_pps )
+                    free( p_64_pps );
+            }
+            if( !p_es->psz_fmtp )
+                p_es->psz_fmtp = strdup( "packetization-mode=1" );
             break;
         case VLC_FOURCC( 'm', 'p', '4', 'v' ):
             p_es->i_payload_type = p_media->i_payload_type++;
@@ -483,12 +621,12 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
             }
             break;
         case VLC_FOURCC( 'm', 'p', '2', 't' ):
-            p_media->psz_mux = "ts";
+            p_media->psz_mux = strdup("ts");
             p_es->i_payload_type = 33;
             p_es->psz_rtpmap = strdup( "MP2T/90000" );
             break;
         case VLC_FOURCC( 'm', 'p', '2', 'p' ):
-            p_media->psz_mux = "ps";
+            p_media->psz_mux = strdup("ps");
             p_es->i_payload_type = p_media->i_payload_type++;
             p_es->psz_rtpmap = strdup( "MP2P/90000" );
             break;
@@ -577,7 +715,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
 
 static void MediaDelES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt)
 {
-    media_es_t *p_es = 0;
+    media_es_t *p_es = NULL;
     int i;
 
     /* Find the ES */
@@ -604,6 +742,115 @@ static void MediaDelES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt)
 
     if( p_es->p_rtsp_url ) httpd_UrlDelete( p_es->p_rtsp_url );
     es_format_Clean( &p_es->fmt );
+    free( p_es );
+}
+
+/* */
+typedef struct
+{
+    int i_type;
+    int i_media_id;
+    //vod_media_t *p_media;
+    char *psz_session;
+    char *psz_arg;
+    double f_arg;
+} rtsp_cmd_t;
+
+static void CommandPush( vod_t *p_vod, rtsp_cmd_type_t i_type, vod_media_t *p_media, const char *psz_session,
+                         double f_arg, const char *psz_arg )
+{
+    rtsp_cmd_t cmd;
+    block_t *p_cmd;
+
+    memset( &cmd, 0, sizeof(cmd) );
+    cmd.i_type = i_type;
+    if( p_media )
+        cmd.i_media_id = p_media->id;
+    if( psz_session )
+        cmd.psz_session = strdup(psz_session);
+    cmd.f_arg = f_arg;
+    if( psz_arg )
+        cmd.psz_arg = strdup(psz_arg);
+
+    p_cmd = block_New( p_vod, sizeof(rtsp_cmd_t) );
+    memcpy( p_cmd->p_buffer, &cmd, sizeof(cmd) );
+
+    block_FifoPut( p_vod->p_sys->p_fifo_cmd, p_cmd );
+}
+
+static void CommandThread( vlc_object_t *p_this )
+{
+    vod_t *p_vod = (vod_t*)p_this;
+    vod_sys_t *p_sys = p_vod->p_sys;
+
+    while( !p_vod->b_die )
+    {
+        block_t *p_block_cmd = block_FifoGet( p_sys->p_fifo_cmd );
+        rtsp_cmd_t cmd;
+        vod_media_t *p_media = NULL;
+        int i;
+
+        if( !p_block_cmd )
+            break;
+
+        memcpy( &cmd, p_block_cmd->p_buffer, sizeof(cmd) );
+        block_Release( p_block_cmd );
+
+        if( cmd.i_type == RTSP_CMD_TYPE_NONE )
+            break;
+
+        /* */
+        vlc_mutex_lock( &p_sys->lock_media );
+        for( i = 0; i < p_sys->i_media; i++ )
+        {
+            if( p_sys->media[i]->id == cmd.i_media_id )
+                break;
+        }
+        if( i >= p_sys->i_media )
+            goto next;
+        p_media = p_sys->media[i];
+
+        switch( cmd.i_type )
+        {
+        case RTSP_CMD_TYPE_PLAY:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_PLAY, cmd.psz_arg );
+            break;
+        case RTSP_CMD_TYPE_PAUSE:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_PAUSE );
+            break;
+
+        case RTSP_CMD_TYPE_STOP:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session, VOD_MEDIA_STOP );
+            break;
+
+        case RTSP_CMD_TYPE_SEEK:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_SEEK, cmd.f_arg );
+            break;
+
+        case RTSP_CMD_TYPE_REWIND:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_REWIND, cmd.f_arg );
+            break;
+
+        case RTSP_CMD_TYPE_FORWARD:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_FORWARD, cmd.f_arg );
+            break;
+
+        default:
+            break;
+        }
+
+    next:
+        vlc_mutex_unlock( &p_sys->lock_media );
+        if( cmd.psz_session )
+            free( cmd.psz_session );
+        if( cmd.psz_arg )
+            free( cmd.psz_arg );
+    }
 }
 
 /****************************************************************************
@@ -627,16 +874,14 @@ static rtsp_client_t *RtspClientNew( vod_media_t *p_media, char *psz_session )
     return p_rtsp;
 }
 
-static rtsp_client_t *RtspClientGet( vod_media_t *p_media, char *psz_session )
+static rtsp_client_t *RtspClientGet( vod_media_t *p_media, const char *psz_session )
 {
     int i;
 
     for( i = 0; psz_session && i < p_media->i_rtsp; i++ )
     {
         if( !strcmp( p_media->rtsp[i]->psz_session, psz_session ) )
-        {
             return p_media->rtsp[i];
-        }
     }
 
     return NULL;
@@ -663,14 +908,14 @@ static void RtspClientDel( vod_media_t *p_media, rtsp_client_t *p_rtsp )
 }
 
 static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
-                         httpd_message_t *answer, httpd_message_t *query )
+                         httpd_message_t *answer, const httpd_message_t *query )
 {
     vod_media_t *p_media = (vod_media_t*)p_args;
     vod_t *p_vod = p_media->p_vod;
-    char *psz_transport = NULL;
-    char *psz_playnow = NULL; /* support option: x-playNow */
-    char *psz_session = NULL;
-    char *psz_cseq = NULL;
+    const char *psz_transport = NULL;
+    const char *psz_playnow = NULL; /* support option: x-playNow */
+    const char *psz_session = NULL;
+    const char *psz_cseq = NULL;
     rtsp_client_t *p_rtsp;
     int i_port = 0;
     int i_cseq = 0;
@@ -683,7 +928,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
     answer->i_version = query->i_version;
     answer->i_type    = HTTPD_MSG_ANSWER;
     answer->i_body    = 0;
-    answer->p_body      = NULL;
+    answer->p_body    = NULL;
 
     switch( query->i_type )
     {
@@ -691,12 +936,17 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
         {
             psz_playnow = httpd_MsgGet( query, "x-playNow" );
             psz_transport = httpd_MsgGet( query, "Transport" );
+            if( psz_transport == NULL )
+            {
+                answer->i_status = 400;
+                break;
+            }
             msg_Dbg( p_vod, "HTTPD_MSG_SETUP: transport=%s", psz_transport );
 
             if( strstr( psz_transport, "unicast" ) &&
                 strstr( psz_transport, "client_port=" ) )
             {
-                rtsp_client_t *p_rtsp;
+                rtsp_client_t *p_rtsp = NULL;
                 char ip[NI_MAXNUMERICHOST];
                 i_port = atoi( strstr( psz_transport, "client_port=" ) +
                                 strlen("client_port=") );
@@ -704,14 +954,15 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 if( strstr( psz_transport, "MP2T/H2221/UDP" ) ||
                     strstr( psz_transport, "RAW/RAW/UDP" ) )
                 {
-                    p_media->psz_mux = p_vod->p_sys->psz_raw_mux;
+                    if( p_media->psz_mux ) free( p_media->psz_mux );
+                    p_media->psz_mux = NULL;
+                    p_media->psz_mux = strdup( p_vod->p_sys->psz_raw_mux );
                     p_media->b_raw = VLC_TRUE;
                 }
 
                 if( httpd_ClientIP( cl, ip ) == NULL )
                 {
                     answer->i_status = 500;
-                    answer->psz_status = strdup( "Internal server error" );
                     answer->i_body = 0;
                     answer->p_body = NULL;
                     break;
@@ -723,17 +974,27 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 psz_session = httpd_MsgGet( query, "Session" );
                 if( !psz_session || !*psz_session )
                 {
+                    char *psz_new;
                     if( ( p_vod->p_sys->i_throttle_users > 0 ) &&
                         ( p_vod->p_sys->i_connections >= p_vod->p_sys->i_throttle_users ) )
                     {
                         answer->i_status = 503;
-                        answer->psz_status = strdup( "Too many connections" );
                         answer->i_body = 0;
                         answer->p_body = NULL;
                         break;
                     }
-                    asprintf( &psz_session, "%d", rand() );
-                    p_rtsp = RtspClientNew( p_media, psz_session );
+                    if( asprintf( &psz_new, "%d", rand() ) < 0 )
+                        return VLC_ENOMEM;
+                    psz_session = psz_new;
+
+                    p_rtsp = RtspClientNew( p_media, psz_new );
+                    if( !p_rtsp )
+                    {
+                        answer->i_status = 454;
+                        answer->i_body = 0;
+                        answer->p_body = NULL;
+                        break;
+                    }
                 }
                 else
                 {
@@ -741,7 +1002,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                     if( !p_rtsp )
                     {
                         answer->i_status = 454;
-                        answer->psz_status = strdup( "Unknown session id" );
                         answer->i_body = 0;
                         answer->p_body = NULL;
                         break;
@@ -749,7 +1009,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 }
 
                 answer->i_status = 200;
-                answer->psz_status = strdup( "OK" );
                 answer->i_body = 0;
                 answer->p_body = NULL;
 
@@ -757,23 +1016,25 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 {
                     if( strstr( psz_transport, "MP2T/H2221/UDP" ) )
                     {
-                        httpd_MsgAdd( answer, "Transport", "MP2T/H2221/UDP;client_port=%d-%d",
+                        httpd_MsgAdd( answer, "Transport",
+                                      "MP2T/H2221/UDP;client_port=%d-%d",
                                       i_port, i_port + 1 );
                     }
                     else if( strstr( psz_transport, "RAW/RAW/UDP" ) )
                     {
-                        httpd_MsgAdd( answer, "Transport", "RAW/RAW/UDP;client_port=%d-%d",
+                        httpd_MsgAdd( answer, "Transport",
+                                      "RAW/RAW/UDP;client_port=%d-%d",
                                       i_port, i_port + 1 );
                     }
                 }
                 else
-                    httpd_MsgAdd( answer, "Transport", "RTP/AVP/UDP;client_port=%d-%d",
+                    httpd_MsgAdd( answer, "Transport",
+                                  "RTP/AVP/UDP;client_port=%d-%d",
                                   i_port, i_port + 1 );
             }
             else /* TODO  strstr( psz_transport, "interleaved" ) ) */
             {
                 answer->i_status = 461;
-                answer->psz_status = strdup( "Unsupported Transport" );
                 answer->i_body = 0;
                 answer->p_body = NULL;
             }
@@ -792,7 +1053,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             if( !psz_playnow )
             {
                 answer->i_status = 200;
-                answer->psz_status = strdup( "OK" );
                 answer->i_body = 0;
                 answer->p_body = NULL;
             }
@@ -802,13 +1062,20 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             msg_Dbg( p_vod, "HTTPD_MSG_PLAY for session: %s", psz_session );
 
             p_rtsp = RtspClientGet( p_media, psz_session );
-            if( !p_rtsp ) break;
+            if( !p_rtsp )
+            {
+                answer->i_status = 500;
+                answer->i_body = 0;
+                answer->p_body = NULL;
+                break;
+            }
 
             if( p_rtsp->b_playing )
             {
-                char *psz_position = httpd_MsgGet( query, "Range" );
-                char *psz_scale = httpd_MsgGet( query, "Scale" );
-                if( psz_position ) psz_position = strstr( psz_position, "npt=" );
+                const char *psz_position = httpd_MsgGet( query, "Range" );
+                const char *psz_scale = httpd_MsgGet( query, "Scale" );
+                if( psz_position )
+                    psz_position = strstr( psz_position, "npt=" );
                 if( psz_position && !psz_scale )
                 {
                     double f_pos;
@@ -821,8 +1088,8 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                     if( end > psz_position )
                     {
                         f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
-                        vod_MediaControl( p_vod, p_media, psz_session,
-                                      VOD_MEDIA_SEEK, f_pos );
+                        CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+                                     psz_session, f_pos, NULL );
                     }
                     break;
                 }
@@ -838,21 +1105,22 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                         if( psz_scale[0] == '-' ) /* rewind */
                         {
                             msg_Dbg( p_vod, "rewind request: %s", psz_scale );
-                            vod_MediaControl( p_vod, p_media, psz_session,
-                                                VOD_MEDIA_REWIND, f_scale );
+                            CommandPush( p_vod, RTSP_CMD_TYPE_REWIND, p_media,
+                                         psz_session, f_scale, NULL );
                         }
                         else if(psz_scale[0] != '1' ) /* fast-forward */
                         {
-                            msg_Dbg( p_vod, "fastforward request: %s", psz_scale );
-                            vod_MediaControl( p_vod, p_media, psz_session,
-                                                VOD_MEDIA_FORWARD, f_scale );
+                            msg_Dbg( p_vod, "fastforward request: %s",
+                                     psz_scale );
+                            CommandPush( p_vod, RTSP_CMD_TYPE_FORWARD, p_media,
+                                         psz_session, f_scale, NULL );
                         }
 
                         if( p_rtsp->b_paused == VLC_TRUE )
                         {
                             p_rtsp->b_paused = VLC_FALSE;
-                            vod_MediaControl( p_vod, p_media, psz_session,
-                                                VOD_MEDIA_PAUSE, psz_output );
+                            CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
+                                         psz_session, 0, NULL );
                         }
                     }
                     break;
@@ -861,8 +1129,8 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
 
             if( p_rtsp->b_playing && p_rtsp->b_paused )
             {
-                vod_MediaControl( p_vod, p_media, psz_session,
-                                  VOD_MEDIA_PAUSE );
+                CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
+                             psz_session, 0, NULL );
                 p_rtsp->b_paused = VLC_FALSE;
                 break;
             }
@@ -885,23 +1153,29 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             {
                 if( p_media->b_raw )
                 {
-                    asprintf( &psz_output, "std{access=udp,dst=%s:%i,mux=%s}",
-                              ip, i_port, p_media->psz_mux );
+                    if( asprintf( &psz_output,
+                              "std{access=udp,dst=%s:%i,mux=%s}",
+                              ip, i_port, p_media->psz_mux ) < 0 )
+                        return VLC_ENOMEM;
                 }
                 else
                 {
-                    asprintf( &psz_output, "rtp{dst=%s,port=%i,mux=%s}",
-                              ip, i_port_video, p_media->psz_mux );
+                    if( asprintf( &psz_output,
+                              "rtp{dst=%s,port=%i,mux=%s}",
+                              ip, i_port_video, p_media->psz_mux ) < 0 )
+                        return VLC_ENOMEM;
                 }
             }
             else
             {
-                asprintf( &psz_output, "rtp{dst=%s,port-video=%i,"
-                          "port-audio=%i}", ip, i_port_video, i_port_audio );
+                if( asprintf( &psz_output,
+                              "rtp{dst=%s,port-video=%i,port-audio=%i}",
+                              ip, i_port_video, i_port_audio ) < 0 )
+                    return VLC_ENOMEM;
             }
 
-            vod_MediaControl( p_vod, p_media, psz_session, VOD_MEDIA_PLAY,
-                              psz_output );
+            CommandPush( p_vod, RTSP_CMD_TYPE_PLAY, p_media, psz_session,
+                         0, psz_output );
             free( psz_output );
             break;
         }
@@ -914,8 +1188,8 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             if( psz_sdp != NULL )
             {
                 answer->i_status = 200;
-                answer->psz_status = strdup( "OK" );
-                httpd_MsgAdd( answer, "Content-type",  "%s", "application/sdp" );
+                httpd_MsgAdd( answer, "Content-type",  "%s",
+                              "application/sdp" );
 
                 answer->p_body = (uint8_t *)psz_sdp;
                 answer->i_body = strlen( psz_sdp );
@@ -923,7 +1197,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             else
             {
                 answer->i_status = 500;
-                answer->psz_status = strdup( "Internal server error" );
                 answer->p_body = NULL;
                 answer->i_body = 0;
             }
@@ -937,11 +1210,11 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             p_rtsp = RtspClientGet( p_media, psz_session );
             if( !p_rtsp ) break;
 
-            vod_MediaControl( p_vod, p_media, psz_session, VOD_MEDIA_PAUSE );
+            CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
+                         0, NULL );
             p_rtsp->b_paused = VLC_TRUE;
 
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
             break;
@@ -949,7 +1222,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
         case HTTPD_MSG_TEARDOWN:
             /* for now only multicast so easy again */
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
 
@@ -959,13 +1231,13 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             p_rtsp = RtspClientGet( p_media, psz_session );
             if( !p_rtsp ) break;
 
-            vod_MediaControl( p_vod, p_media, psz_session, VOD_MEDIA_STOP );
+            CommandPush( p_vod, RTSP_CMD_TYPE_STOP, p_media, psz_session,
+                         0, NULL );
             RtspClientDel( p_media, p_rtsp );
             break;
 
         case HTTPD_MSG_GETPARAMETER:
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
             break;
@@ -983,24 +1255,29 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
 
     if( psz_session )
     {
-        httpd_MsgAdd( answer, "Session", "%s;timeout=5", psz_session );
+         if( p_media->p_vod->p_sys->i_session_timeout >= 0 )
+             httpd_MsgAdd( answer, "Session", "%s;timeout=%i", psz_session,
+               p_media->p_vod->p_sys->i_session_timeout );
+         else
+              httpd_MsgAdd( answer, "Session", "%s", psz_session );
     }
 
     return VLC_SUCCESS;
 }
 
 static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
-                           httpd_message_t *answer, httpd_message_t *query )
+                           httpd_message_t *answer,
+                           const httpd_message_t *query )
 {
     media_es_t *p_es = (media_es_t*)p_args;
     vod_media_t *p_media = p_es->p_media;
     vod_t *p_vod = p_media->p_vod;
     rtsp_client_t *p_rtsp = NULL;
-    char *psz_transport = NULL;
-    char *psz_playnow = NULL; /* support option: x-playNow */
-    char *psz_session = NULL;
-    char *psz_position = NULL;
-    char *psz_cseq = NULL;
+    const char *psz_transport = NULL;
+    const char *psz_playnow = NULL; /* support option: x-playNow */
+    const char *psz_session = NULL;
+    const char *psz_position = NULL;
+    const char *psz_cseq = NULL;
     int i_cseq = 0;
     int i;
 
@@ -1025,16 +1302,15 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             if( strstr( psz_transport, "unicast" ) &&
                 strstr( psz_transport, "client_port=" ) )
             {
-                rtsp_client_t *p_rtsp;
-                rtsp_client_es_t *p_rtsp_es;
+                rtsp_client_t *p_rtsp = NULL;
+                rtsp_client_es_t *p_rtsp_es = NULL;
                 char ip[NI_MAXNUMERICHOST];
                 int i_port = atoi( strstr( psz_transport, "client_port=" ) +
-                                strlen("client_port=") );
+                                   strlen("client_port=") );
 
                 if( httpd_ClientIP( cl, ip ) == NULL )
                 {
                     answer->i_status = 500;
-                    answer->psz_status = strdup( "Internal server error" );
                     answer->i_body = 0;
                     answer->p_body = NULL;
                     break;
@@ -1046,17 +1322,20 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 psz_session = httpd_MsgGet( query, "Session" );
                 if( !psz_session || !*psz_session )
                 {
+                    char *psz_new;
                     if( ( p_vod->p_sys->i_throttle_users > 0 ) &&
                         ( p_vod->p_sys->i_connections >= p_vod->p_sys->i_throttle_users ) )
                     {
                         answer->i_status = 503;
-                        answer->psz_status = strdup( "Too many connections" );
                         answer->i_body = 0;
                         answer->p_body = NULL;
                         break;
                     }
-                    asprintf( &psz_session, "%d", rand() );
-                    p_rtsp = RtspClientNew( p_media, psz_session );
+                    if( asprintf( &psz_new, "%d", rand() ) < 0 )
+                        return VLC_ENOMEM;
+                    psz_session = psz_new;
+
+                    p_rtsp = RtspClientNew( p_media, psz_new );
                 }
                 else
                 {
@@ -1064,7 +1343,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                     if( !p_rtsp )
                     {
                         answer->i_status = 454;
-                        answer->psz_status = strdup( "Unknown session id" );
                         answer->i_body = 0;
                         answer->p_body = NULL;
                         break;
@@ -1072,13 +1350,19 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 }
 
                 p_rtsp_es = malloc( sizeof(rtsp_client_es_t) );
+                if( !p_rtsp_es )
+                {
+                    answer->i_status = 500;
+                    answer->i_body = 0;
+                    answer->p_body = NULL;
+                    break;
+                }
                 p_rtsp_es->i_port = i_port;
                 p_rtsp_es->psz_ip = strdup( ip );
                 p_rtsp_es->p_media_es = p_es;
                 TAB_APPEND( p_rtsp->i_es, p_rtsp->es, p_rtsp_es );
 
                 answer->i_status = 200;
-                answer->psz_status = strdup( "OK" );
                 answer->i_body = 0;
                 answer->p_body = NULL;
 
@@ -1086,25 +1370,27 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 {
                     if( strstr( psz_transport, "MP2T/H2221/UDP" ) )
                     {
-                        httpd_MsgAdd( answer, "Transport", "MP2T/H2221/UDP;client_port=%d-%d",
-                                      i_port, i_port + 1 );
+                        httpd_MsgAdd( answer, "Transport",
+                                     "MP2T/H2221/UDP;client_port=%d-%d",
+                                     p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
                     }
                     else if( strstr( psz_transport, "RAW/RAW/UDP" ) )
                     {
-                        httpd_MsgAdd( answer, "Transport", "RAW/RAW/UDP;client_port=%d-%d",
-                                      i_port, i_port + 1 );
+                        httpd_MsgAdd( answer, "Transport",
+                                     "RAW/RAW/UDP;client_port=%d-%d",
+                                     p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
                     }
                 }
                 else
                 {
-                    httpd_MsgAdd( answer, "Transport", "RTP/AVP/UDP;client_port=%d-%d",
-                                  i_port, i_port + 1 );
+                    httpd_MsgAdd( answer, "Transport",
+                                  "RTP/AVP/UDP;client_port=%d-%d",
+                                  p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
                 }
             }
             else /* TODO  strstr( psz_transport, "interleaved" ) ) */
             {
                 answer->i_status = 461;
-                answer->psz_status = strdup( "Unsupported Transport" );
                 answer->i_body = 0;
                 answer->p_body = NULL;
             }
@@ -1136,15 +1422,14 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 if( end > psz_position )
                 {
                     f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
-                    vod_MediaControl( p_vod, p_media, psz_session,
-                                      VOD_MEDIA_SEEK, f_pos );
+                    CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+                                 psz_session, f_pos, NULL );
                 }
             }
 
             if( !psz_playnow )
             {
                 answer->i_status = 200;
-                answer->psz_status = strdup( "OK" );
                 answer->i_body = 0;
                 answer->p_body = NULL;
             }
@@ -1152,7 +1437,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
 
         case HTTPD_MSG_TEARDOWN:
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
 
@@ -1174,8 +1458,8 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
 
             if( !p_rtsp->i_es )
             {
-                vod_MediaControl( p_vod, p_media, psz_session,
-                                  VOD_MEDIA_STOP );
+                CommandPush( p_vod, RTSP_CMD_TYPE_STOP, p_media, psz_session,
+                             0, NULL );
                 RtspClientDel( p_media, p_rtsp );
             }
             break;
@@ -1189,11 +1473,11 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             p_rtsp = RtspClientGet( p_media, psz_session );
             if( !p_rtsp ) break;
 
-            vod_MediaControl( p_vod, p_media, psz_session, VOD_MEDIA_PAUSE );
+            CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
+                         0, NULL );
             p_rtsp->b_paused = VLC_TRUE;
 
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
             break;