jvlc: code formatted

[vlc] / modules / misc / rtsp.c

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index c31a4bda9333448ac44fe4d946403c1987ec2688..10708f7ea1752e658f14f518f727dd80d5f4f63f 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -45,6 +45,14 @@
 
 #include <errno.h>
 
+#ifndef WIN32
+# include <locale.h>
+#endif
+
+#ifdef HAVE_XLOCALE_H
+# include <xlocale.h>
+#endif
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -492,7 +500,10 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
     /* TODO: update SDP, etc... */
     if( asprintf( &psz_urlc, "%s/trackID=%d",
               p_media->psz_rtsp_path, p_media->i_es ) < 0 )
+    {
+        free( p_es );
         return VLC_ENOMEM;
+    }
     msg_Dbg( p_vod, "  - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc );
 
     switch( p_fmt->i_codec )
@@ -524,7 +535,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
         case VLC_FOURCC( 'm', 'p', '3', ' ' ):
             p_es->i_payload_type = 14;
-            asprintf( &p_es->psz_rtpmap, "MPA/%d", p_fmt->audio.i_rate );
+            p_es->psz_rtpmap = strdup( "MPA/90000" );
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
             p_es->i_payload_type = 32;
@@ -583,11 +594,19 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
                 }
                 /* */
                 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 )
+                    {
+                        free( p_64_sps );
+                        free( p_64_pps );
+                        free( psz_urlc );
+                        free( p_es );
                         return VLC_ENOMEM;
+                    }
+                }
                 free( p_64_sps );
                 free( p_64_pps );
             }
@@ -649,6 +668,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
         default:
             msg_Err( p_vod, "cannot add this stream (unsupported "
                     "codec: %4.4s)", (char*)&p_fmt->i_codec );
+            free( psz_urlc );
             free( p_es );
             return VLC_EGENERIC;
     }
@@ -786,7 +806,7 @@ 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 )
+    while( vlc_object_alive (p_vod) )
     {
         block_t *p_block_cmd = block_FifoGet( p_sys->p_fifo_cmd );
         rtsp_cmd_t cmd;
@@ -907,6 +927,29 @@ static void RtspClientDel( vod_media_t *p_media, rtsp_client_t *p_rtsp )
     free( p_rtsp );
 }
 
+
+static float ParseNPT (const char *str)
+{
+     locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
+     locale_t oldloc = uselocale (loc);
+     unsigned hour, min;
+     float sec;
+
+     if (sscanf (str, "%u:%u:%f", &hour, &min, &sec) == 3)
+         sec += ((hour * 60) + min) * 60;
+     else
+     if (sscanf (str, "%f", &sec) != 1)
+         sec = 0.;
+
+     if (loc != (locale_t)0)
+     {
+         uselocale (oldloc);
+         freelocale (loc);
+     }
+     return sec;
+}
+
+
 static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                          httpd_message_t *answer, const httpd_message_t *query )
 {
@@ -1078,19 +1121,11 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                     psz_position = strstr( psz_position, "npt=" );
                 if( psz_position && !psz_scale )
                 {
-                    double f_pos;
-                    char *end;
-
+                    double f_pos = ParseNPT (psz_position + 4);
                     msg_Dbg( p_vod, "seeking request: %s", psz_position );
-                    psz_position += 4;
-                    /* FIXME: npt= is not necessarily formatted as a float */
-                    f_pos = us_strtod( psz_position, &end );
-                    if( end > psz_position )
-                    {
-                        f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
-                        CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
-                                     psz_session, f_pos, NULL );
-                    }
+                    f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+                    CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+                                 psz_session, f_pos, NULL );
                     break;
                 }
                 if( psz_scale )
@@ -1411,20 +1446,11 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             if( psz_position ) psz_position = strstr( psz_position, "npt=" );
             if( psz_position )
             {
-                double f_pos;
-                char *end;
-
+                double f_pos = ParseNPT (psz_position + 4);
                 msg_Dbg( p_vod, "seeking request: %s", psz_position );
-
-                psz_position += 4;
-                /* FIXME: npt= is not necessarily formatted as a float */
-                f_pos = us_strtod( psz_position, &end );
-                if( end > psz_position )
-                {
-                    f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
-                    CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
-                                 psz_session, f_pos, NULL );
-                }
+                f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+                CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+                             psz_session, f_pos, NULL );
             }
 
             if( !psz_playnow )