]> git.sesse.net Git - vlc/blobdiff - modules/misc/rtsp.c
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Sort-of RTSP VOD: accept MP3 as MPEG Audio
[vlc] / modules / misc / rtsp.c
diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index 9f28f013b175364f16f89d4375bda71a7e4bc3d2..c31a4bda9333448ac44fe4d946403c1987ec2688 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -30,7 +30,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
@@ -71,20 +72,20 @@ static void Close( vlc_object_t * );
     "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") );
+    set_shortname( N_("RTSP VoD" ) );
+    set_description( N_("RTSP VoD server") );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_VOD );
     set_capability( "vod server", 1 );
     set_callbacks( Open, Close );
     add_shortcut( "rtsp" );
-    add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
+    add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true );
     add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT,
-                RAWMUX_TEXT, VLC_TRUE );
+                RAWMUX_TEXT, true );
     add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT,
-                                           THROTLE_LONGTEXT, VLC_TRUE );
+                                           THROTLE_LONGTEXT, true );
     add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
-                 SESSION_TIMEOUT_LONGTEXT, VLC_TRUE );
+                 SESSION_TIMEOUT_LONGTEXT, true );
 vlc_module_end();
 
 /*****************************************************************************
@@ -106,8 +107,8 @@ typedef struct
     char *psz_session;
     int64_t i_last; /* for timeout */
 
-    vlc_bool_t b_playing; /* is it in "play" state */
-    vlc_bool_t b_paused; /* is it in "pause" state */
+    bool b_playing; /* is it in "play" state */
+    bool b_paused; /* is it in "pause" state */
 
     int i_es;
     rtsp_client_es_t **es;
@@ -154,7 +155,7 @@ struct vod_media_t
     int64_t i_sdp_id;
     int     i_sdp_version;
 
-    vlc_bool_t b_multicast;
+    bool b_multicast;
 
     vlc_mutex_t lock;
 
@@ -162,7 +163,7 @@ struct vod_media_t
     int        i_es;
     media_es_t **es;
     char       *psz_mux;
-    vlc_bool_t  b_raw;
+    bool  b_raw;
 
     /* RTSP client */
     int           i_rtsp;
@@ -287,7 +288,7 @@ static int Open( vlc_object_t *p_this )
 
     vlc_UrlClean( &url );
 
-    vlc_mutex_init( p_vod, &p_sys->lock_media );
+    vlc_mutex_init( &p_sys->lock_media );
 
     TAB_INIT( p_sys->i_media, p_sys->media );
     p_sys->i_media_id = 0;
@@ -297,9 +298,9 @@ static int Open( vlc_object_t *p_this )
     p_vod->pf_media_add_es = MediaAddES;
     p_vod->pf_media_del_es = MediaDelES;
 
-    p_sys->p_fifo_cmd = block_FifoNew( p_vod );
+    p_sys->p_fifo_cmd = block_FifoNew();
     if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread,
-                           VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+                           VLC_THREAD_PRIORITY_LOW, false ) )
     {
         msg_Err( p_vod, "cannot spawn rtsp vod thread" );
         block_FifoRelease( p_sys->p_fifo_cmd );
@@ -364,17 +365,14 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
     int i;
 
     if( !p_media )
-    {
-        msg_Err( p_vod, "not enough memory" );
         return NULL;
-    }
 
     memset( p_media, 0, sizeof(vod_media_t) );
     p_media->id = p_sys->i_media_id++;
     TAB_INIT( p_media->i_es, p_media->es );
     p_media->psz_mux = 0;
     TAB_INIT( p_media->i_rtsp, p_media->rtsp );
-    p_media->b_raw = VLC_FALSE;
+    p_media->b_raw = false;
 
     if( asprintf( &p_media->psz_rtsp_path, "%s%s",
                   p_sys->psz_path, psz_name ) <0 )
@@ -421,7 +419,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
     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 );
+    vlc_mutex_init( &p_media->lock );
     p_media->psz_session_name = strdup("");
     p_media->psz_session_description = strdup("");
     p_media->psz_session_url = strdup("");
@@ -524,8 +522,9 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
                     p_fmt->audio.i_channels );
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+        case VLC_FOURCC( 'm', 'p', '3', ' ' ):
             p_es->i_payload_type = 14;
-            p_es->psz_rtpmap = strdup( "MPA/90000" );
+            asprintf( &p_es->psz_rtpmap, "MPA/%d", p_fmt->audio.i_rate );
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
             p_es->i_payload_type = 32;
@@ -533,7 +532,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
             break;
         case VLC_FOURCC( 'a', '5', '2', ' ' ):
             p_es->i_payload_type = p_media->i_payload_type++;
-            p_es->psz_rtpmap = strdup( "ac3/90000" );
+            asprintf( &p_es->psz_rtpmap, "ac3/%d", p_fmt->audio.i_rate );
             break;
         case VLC_FOURCC( 'H', '2', '6', '3' ):
             p_es->i_payload_type = p_media->i_payload_type++;
@@ -958,7 +957,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                     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;
+                    p_media->b_raw = true;
                 }
 
                 if( httpd_ClientIP( cl, ip ) == NULL )
@@ -1018,19 +1017,19 @@ 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",
+                                      "MP2T/H2221/UDP;unicast;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",
+                                      "RAW/RAW/UDP;unicast;client_port=%d-%d",
                                       i_port, i_port + 1 );
                     }
                 }
                 else
                     httpd_MsgAdd( answer, "Transport",
-                                  "RTP/AVP/UDP;client_port=%d-%d",
+                                  "RTP/AVP/UDP;unicast;client_port=%d-%d",
                                   i_port, i_port + 1 );
             }
             else /* TODO  strstr( psz_transport, "interleaved" ) ) */
@@ -1117,9 +1116,9 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                                          psz_session, f_scale, NULL );
                         }
 
-                        if( p_rtsp->b_paused == VLC_TRUE )
+                        if( p_rtsp->b_paused == true )
                         {
-                            p_rtsp->b_paused = VLC_FALSE;
+                            p_rtsp->b_paused = false;
                             CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
                                          psz_session, 0, NULL );
                         }
@@ -1132,14 +1131,14 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             {
                 CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
                              psz_session, 0, NULL );
-                p_rtsp->b_paused = VLC_FALSE;
+                p_rtsp->b_paused = false;
                 break;
             }
             else if( p_rtsp->b_playing ) break;
 
             if( httpd_ClientIP( cl, ip ) == NULL ) break;
 
-            p_rtsp->b_playing = VLC_TRUE;
+            p_rtsp->b_playing = true;
 
             /* FIXME for != 1 video and 1 audio */
             for( i = 0; i < p_rtsp->i_es; i++ )
@@ -1213,7 +1212,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
 
             CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
                          0, NULL );
-            p_rtsp->b_paused = VLC_TRUE;
+            p_rtsp->b_paused = true;
 
             answer->i_status = 200;
             answer->i_body = 0;
@@ -1476,7 +1475,7 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
 
             CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
                          0, NULL );
-            p_rtsp->b_paused = VLC_TRUE;
+            p_rtsp->b_paused = true;
 
             answer->i_status = 200;
             answer->i_body = 0;
@@ -1557,7 +1556,7 @@ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl )
 
     p = psz_sdp = malloc( i_size );
     p += sprintf( p, "v=0\r\n" );
-    p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n",
+    p += sprintf( p, "o=- %"PRId64" %d IN IP%c %s\r\n",
                   p_media->i_sdp_id, p_media->i_sdp_version, ipv, ip );
     if( *p_media->psz_session_name )
         p += sprintf( p, "s=%s\r\n", p_media->psz_session_name );
Unnamed repository; edit this file 'description' to name the repository.