Removed all vlc_object_find in lua osd code.

[vlc] / modules / misc / rtsp.c

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index 16a3b1789b7d077fd3d7c0fd0e9edbd1381c213c..b02756c6c59c26d4846473ba23af67b03631f092 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -184,7 +184,6 @@ struct vod_sys_t
     int i_session_timeout;
 
     /* List of media */
-    vlc_mutex_t lock_media;
     int i_media_id;
     int i_media;
     vod_media_t **media;
@@ -296,8 +295,6 @@ static int Open( vlc_object_t *p_this )
 
     vlc_UrlClean( &url );
 
-    vlc_mutex_init( &p_sys->lock_media );
-
     TAB_INIT( p_sys->i_media, p_sys->media );
     p_sys->i_media_id = 0;
 
@@ -367,8 +364,6 @@ static void Close( vlc_object_t * p_this )
         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 );
@@ -473,9 +468,7 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
 
     msg_Dbg( p_vod, "deleting media: %s", p_media->psz_rtsp_path );
 
-    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 );
 
     httpd_UrlDelete( p_media->p_rtsp_url );
 
@@ -499,6 +492,13 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
 static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
 {
     char *psz_urlc;
+
+    if( p_media->i_payload_type >= 128 )
+    {
+        msg_Err( p_vod, "too many elementary streams");
+        return VLC_EGENERIC;
+    }
+
     media_es_t *p_es = calloc( 1, sizeof(media_es_t) );
     if( !p_es )
         return VLC_ENOMEM;
@@ -800,9 +800,7 @@ static void* CommandThread( vlc_object_t *p_this )
 
         if ( cmd.i_type == RTSP_CMD_TYPE_ADD )
         {
-            vlc_mutex_lock( &p_sys->lock_media );
             TAB_APPEND( p_sys->i_media, p_sys->media, cmd.p_media );
-            vlc_mutex_unlock( &p_sys->lock_media );
             goto next;
         }
 
@@ -813,7 +811,6 @@ static void* CommandThread( vlc_object_t *p_this )
         }
 
         /* */
-        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 )
@@ -821,7 +818,6 @@ static void* CommandThread( vlc_object_t *p_this )
         }
         if( i >= p_sys->i_media )
         {
-            vlc_mutex_unlock( &p_sys->lock_media );
             goto next;
         }
         p_media = p_sys->media[i];
@@ -859,7 +855,6 @@ static void* CommandThread( vlc_object_t *p_this )
         default:
             break;
         }
-        vlc_mutex_unlock( &p_sys->lock_media );
 
     next:
         free( cmd.psz_session );
@@ -1118,7 +1113,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 {
                     double f_pos = ParseNPT (psz_position + 4);
                     msg_Dbg( p_vod, "seeking request: %s", psz_position );
-                    f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+                    f_pos /= ((double)(p_media->i_length)) / CLOCK_FREQ / 100;
                     CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
                                  psz_session, f_pos, NULL );
                 }
@@ -1410,20 +1405,20 @@ 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",
+                                     "MP2T/H2221/UDP;unicast;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",
+                                     "RAW/RAW/UDP;unicast;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",
+                                  "RTP/AVP/UDP;unicast;client_port=%d-%d",
                                   p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
                 }
             }
@@ -1452,7 +1447,7 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             {
                 double f_pos = ParseNPT (psz_position + 4);
                 msg_Dbg( p_vod, "seeking request: %s", psz_position );
-                f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+                f_pos /= ((double)(p_media->i_length)) / CLOCK_FREQ / 100;
                 CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
                              psz_session, f_pos, NULL );
             }