One more removing session. (useless test before a free())

[vlc] / modules / demux / mjpeg.c

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index 75b29458f17e17d9a3c25337c7d438b8dbcc69d6..c7096ed2b96bca5b2b06953cdc4f057dad5f0922 100644 (file)
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * mjpeg.c : demuxes mjpeg webcam http streams
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: mjpeg.c 7196 2004-03-29 21:29:31Z fenrir $
+ * Copyright (C) 2004 the VideoLAN team
+ * $Id$
  *
  * Authors: Henry Jen (slowhog) <henryjen@ztune.net>
  *          Derk-Jan Hartman (thedj)
@@ -21,18 +21,21 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
 
-#include <codecs.h>
+#include <vlc_codecs.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -41,13 +44,17 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 #define FPS_TEXT N_("Frames per Second")
-#define FPS_LONGTEXT N_("Allows you to set the desired frame rate when " \
-    "playing from files, use 0 for live.")
+#define FPS_LONGTEXT N_("This is the desired frame rate when " \
+    "playing MJPEG from a file. Use 0 (this is the default value) for a " \
+    "live stream (from a camera).")
 
 vlc_module_begin();
-    set_description( _("JPEG camera demuxer") );
+    set_shortname( "MJPEG");
+    set_description( _("M-JPEG camera demuxer") );
     set_capability( "demux2", 5 );
     set_callbacks( Open, Close );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_DEMUX );
     add_float( "mjpeg-fps", 0.0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_FALSE );
 vlc_module_end();
 
@@ -71,7 +78,7 @@ struct demux_sys_t
     mtime_t         i_frame_length;
     char            *psz_separator;
     int             i_frame_size_estimate;
-    uint8_t         *p_peek;
+    const uint8_t   *p_peek;
     int             i_data_peeked;
 };
 
@@ -114,7 +121,7 @@ static vlc_bool_t Peek( demux_t *p_demux, vlc_bool_t b_first )
 static char* GetLine( demux_t *p_demux, int *p_pos )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
-    uint8_t     *p_buf;
+    const uint8_t *p_buf;
     int         i_size;
     int         i;
     char        *p_line;
@@ -153,7 +160,7 @@ static char* GetLine( demux_t *p_demux, int *p_pos )
         msg_Err( p_demux, "out of memory" );
         return NULL;
     }
-    strncpy ( p_line, p_buf, i );
+    strncpy ( p_line, (char*)p_buf, i );
     p_line[i] = '\0';
 //    msg_Dbg( p_demux, "i = %d, pos = %d, %s", i, *p_pos, p_line );
     return p_line;
@@ -185,7 +192,7 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size )
         *p_header_size = -2;
         return VLC_FALSE;
     }
-    if( strncmp( p_sys->p_peek, "--", 2 ) )
+    if( strncmp( (char *)p_sys->p_peek, "--", 2 ) )
     {
         *p_header_size = 0;
         return VLC_FALSE;
@@ -198,7 +205,9 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size )
         *p_header_size = -3;
         return VLC_FALSE;
     }
-    if( NULL == p_sys->psz_separator )
+
+    /* Read the separator and remember it if not yet stored */
+    if( p_sys->psz_separator == NULL )
     {
         p_sys->psz_separator = psz_line;
         msg_Dbg( p_demux, "Multipart MIME detected, using separator: %s",
@@ -213,6 +222,7 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size )
         }
         free( psz_line );
     }
+
     psz_line = GetLine( p_demux, &i_pos );
     while( psz_line && *psz_line )
     {
@@ -232,7 +242,7 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size )
         }
         else
         {
-            msg_Dbg( p_demux, "Discard MIME header: %s", psz_line );
+            msg_Dbg( p_demux, "discard MIME header: %s", psz_line );
         }
         free( psz_line );
         psz_line = GetLine( p_demux, &i_pos );
@@ -294,7 +304,6 @@ static int Open( vlc_object_t * p_this )
     int         i_size;
     int         b_matched = VLC_FALSE;
     vlc_value_t val;
-    char *psz_ext;
 
     p_demux->pf_control = Control;
     p_demux->p_sys      = p_sys = malloc( sizeof( demux_sys_t ) );
@@ -336,9 +345,8 @@ static int Open( vlc_object_t * p_this )
     /* Check for jpeg file extension */
     p_sys->b_still = VLC_FALSE;
     p_sys->i_still_end = 0;
-    psz_ext = strrchr( p_demux->psz_path, '.' );
-    if( psz_ext && ( !strcasecmp( psz_ext, ".jpeg" ) ||
-                     !strcasecmp( psz_ext, ".jpg" ) ) )
+    if( demux2_IsPathExtension( p_demux, ".jpeg" ) ||
+        demux2_IsPathExtension( p_demux, ".jpg" ) )
     {
         p_sys->b_still = VLC_TRUE;
         if( val.f_float)
@@ -404,11 +412,11 @@ static int MjpgDemux( demux_t *p_demux )
         i++;
         if( i >= p_sys->i_data_peeked )
         {
-            msg_Dbg( p_demux, "Did not find JPEG EOI in %d bytes",
+            msg_Dbg( p_demux, "did not find JPEG EOI in %d bytes",
                      p_sys->i_data_peeked );
             if( !Peek( p_demux, VLC_FALSE ) )
             {
-                msg_Warn( p_demux, "No more data is available at the moment" );
+                msg_Warn( p_demux, "no more data is available at the moment" );
                 return 0;
             }
         }
@@ -467,13 +475,13 @@ static int MimeDemux( demux_t *p_demux )
 
                 if( !Peek( p_demux, VLC_FALSE ) )
                 {
-                    msg_Warn( p_demux, "No more data is available at the "
+                    msg_Warn( p_demux, "no more data is available at the "
                               "moment" );
                     return 0;
                 }
             }
         }
-        if( !strncmp( p_sys->psz_separator, p_sys->p_peek + i + 2,
+        if( !strncmp( p_sys->psz_separator, (char *)(p_sys->p_peek + i + 2),
                       strlen( p_sys->psz_separator ) ) )
         {
             b_done = VLC_TRUE;
@@ -487,7 +495,7 @@ static int MimeDemux( demux_t *p_demux )
 
     if( !b_match )
     {
-        msg_Err( p_demux, "Discard non-JPEG part" );
+        msg_Err( p_demux, "discard non-JPEG part" );
         stream_Read( p_demux->s, NULL, i );
         return 0;
     }
@@ -503,10 +511,7 @@ static void Close ( vlc_object_t * p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys  = p_demux->p_sys;
 
-    if( p_sys->psz_separator )
-    {
-        free( p_sys->psz_separator );
-    }
+    free( p_sys->psz_separator );
     free( p_sys );
 }