Changeset 626d8bea9aeafbef8933bf7ea1cf64b9078a3fea

Timestamp:

25/02/03 18:17:43 (6 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1046193463 +0000

git-parent:

[08a2b6bac021bad835616e833ab17584dcca3df1]

git-author:

Laurent Aimar <fenrir@videolan.org> 1046193463 +0000

Message:

• stream_output.* : added a flags variable to sout_buffer_t, allowing to
  

mark headers.

• httpd : added a way to use stream header, and changed the way that
  

stream data are stored (allow better client handling).

• http : use stream header, and add mime type detection by looking
  

at file extention (could be improved).

• ogg: fixed a segfault when removing a stream, mark header.
  

Files:

• include/httpd.h (modified) (2 diffs)
• include/stream_output.h (modified) (3 diffs)
• modules/access_output/http.c (modified) (7 diffs)
• modules/misc/httpd.c (modified) (19 diffs)
• modules/mux/ogg.c (modified) (3 diffs)
• src/stream_output/stream_output.c (modified) (3 diffs)

include/httpd.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-1 2003/02/23 19:05:22
+2 2003/02/25 17:17:43
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -58 +58 @@
-                                              httpd_stream_t *,
-                                              uint8_t *, int );
+    int             (*pf_header_stream)     ( httpd_t *,
+                                              httpd_stream_t *,
+                                              uint8_t *, int );
-    void            (*pf_unregister_stream) ( httpd_t *, httpd_stream_t * );
-};

include/stream_output.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-7 2003/02/24 11:00:54
+8 2003/02/25 17:17:43
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -37 +37 @@
- *
- */
+#define SOUT_BUFFER_FLAGS_HEADER    0x0001
-struct sout_buffer_t
-{
@@ -51 +52 @@
-    mtime_t                 i_pts;
-
+    uint32_t                i_flags;
-    int                     i_bitrate;
-

modules/access_output/http.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-1 2003/02/23 19:05:22
+2 2003/02/25 17:17:43
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -67 +67 @@
-    /* stream */
-    httpd_stream_t      *p_httpd_stream;
+
+    /* gather header from stream */
+    int                 i_header_allocated;
+    int                 i_header_size;
+    uint8_t             *p_header;
+    vlc_bool_t          b_header_complete;
-};
-
+static struct
+{
+    char *psz_ext;
+    char *psz_mime;
+} http_mime[] =
+{
+    { ".avi",   "video/avi" },
+    { ".asf",   "video/x-ms-asf" },
+    { ".m1a",   "audio/mpeg" },
+    { ".m2a",   "audio/mpeg" },
+    { ".m1v",   "video/mpeg" },
+    { ".m2v",   "video/mpeg" },
+    { ".mp2",   "audio/mpeg" },
+    { ".mp3",   "audio/mpeg" },
+    { ".mpa",   "audio/mpeg" },
+    { ".mpg",   "video/mpeg" },
+    { ".mpeg",  "video/mpeg" },
+    { ".mpe",   "video/mpeg" },
+    { ".mov",   "video/quicktime" },
+    { ".moov",  "video/quicktime" },
+    { ".ogg",   "application/ogg" },
+    { ".ogm",   "application/ogg" },
+    { ".wav",   "audio/wav" },
+    { NULL,     NULL }
+};
+
+static char *GetMime( char *psz_name )
+{
+    char *psz_ext;
+
+    psz_ext = strrchr( psz_name, '.' );
+    if( psz_ext )
+    {
+        int i;
+
+        for( i = 0; http_mime[i].psz_ext != NULL ; i++ )
+        {
+            if( !strcmp( http_mime[i].psz_ext, psz_ext ) )
+            {
+                return( http_mime[i].psz_mime );
+            }
+        }
+    }
+    return( "application/octet-stream" );
+}
-/*****************************************************************************
- * Open: open the file
@@ -166 +217 @@
-    p_sys->p_httpd_stream =
-        p_sys->p_httpd->pf_register_stream( p_sys->p_httpd,
-
+
+
-                                            NULL, NULL );
-
@@ -182 +234 @@
-    }
-
+    p_sys->i_header_allocated = 1024;
+    p_sys->i_header_size      = 0;
+    p_sys->p_header           = malloc( p_sys->i_header_allocated );
+    p_sys->b_header_complete  = VLC_FALSE;
+
-    p_access->pf_write       = Write;
-    p_access->pf_seek        = Seek;
@@ -201 +258 @@
-    httpd_Release( p_sys->p_httpd );
-
+    FREE( p_sys->p_header );
+
-    msg_Info( p_access, "Close" );
-
@@ -218 +277 @@
-        sout_buffer_t *p_next;
-
+        if( p_buffer->i_flags & SOUT_BUFFER_FLAGS_HEADER )
+        {
+            /* gather header */
+            if( p_sys->b_header_complete )
+            {
+                /* free previously gathered header */
+                p_sys->i_header_size = 0;
+                p_sys->b_header_complete = VLC_FALSE;
+            }
+            if( p_buffer->i_size + p_sys->i_header_size > p_sys->i_header_allocated )
+            {
+                p_sys->i_header_allocated = p_buffer->i_size + p_sys->i_header_size + 1024;
+                p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header_allocated );
+            }
+            memcpy( &p_sys->p_header[p_sys->i_header_size],
+                    p_buffer->p_buffer,
+                    p_buffer->i_size );
+            p_sys->i_header_size += p_buffer->i_size;
+        }
+        else if( !p_sys->b_header_complete )
+        {
+            p_sys->b_header_complete = VLC_TRUE;
+
+            p_sys->p_httpd->pf_header_stream( p_sys->p_httpd,
+                                              p_sys->p_httpd_stream,
+                                              p_sys->p_header, p_sys->i_header_size );
+        }
+            /* send data */
-        i_err = p_sys->p_httpd->pf_send_stream( p_sys->p_httpd, p_sys->p_httpd_stream,
-                                                p_buffer->p_buffer, p_buffer->i_size );
@@ -230 +317 @@
-        }
-    }
+
-    if( i_err < 0 )
-    {

modules/misc/httpd.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-2 2003/02/24 11:14:16 gbazin
+3 2003/02/25 17:17:43 fenrir
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -97 +97 @@
- * Prototypes
- *****************************************************************************/
-
-
-
-
-
-
-
-
-
+   
+  
+
+   
+   
+   
+   
+   
+  
-
-//#define httpd_stream_t              httpd_file_t
-
+ 
-                                         char *psz_file, char *psz_mime,
-                                         char *psz_user, char *psz_password );
-
+
+
-static void             UnregisterStream( httpd_t *, httpd_stream_t* );
-
@@ -152 +153 @@
-
-    /* private */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -182 +188 @@
-    httpd_file_t    *p_file;
-
+    /* used while sending header and file */
-    int     i_buffer_size;
-    uint8_t *p_buffer;
-
+
+
+
+
-} httpd_connection_t;
-
@@ -265 +275 @@
-    p_httpd->pf_unregister_file = UnregisterFile;
-    p_httpd->pf_register_stream = RegisterStream;
+    p_httpd->pf_header_stream   = HeaderStream;
-    p_httpd->pf_send_stream     = SendStream;
-    p_httpd->pf_unregister_stream=UnregisterStream;
@@ -634 +645 @@
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    __RegisterFile( p_httpt, p_file );
@@ -678 +692 @@
-    {
-        vlc_mutex_unlock( &p_httpt->file_lock );
-t
+d
-        return NULL;
-    }
@@ -702 +716 @@
-    p_stream->p_sys           = NULL;
-    p_stream->pf_fill         = NULL;
-
-
-
+
+
+
+
-    p_stream->p_buffer        = malloc( p_stream->i_buffer_size );
+
+    p_stream->i_header_size   = 0;
+    p_stream->p_header        = NULL;
-
-    __RegisterFile( p_httpt, p_stream );
@@ -769 +787 @@
-    }
-    FREE( p_file->p_buffer );
+    FREE( p_file->p_header );
-
-    FREE( p_file );
@@ -807 +826 @@
-static int             _SendStream( httpd_sys_t *p_httpt, httpd_stream_t *p_stream, uint8_t *p_data, int i_data )
-{
-
+
+
+
+
-    {
-        return( VLC_SUCCESS );
-    }
+    //fprintf( stderr, "## i_data=%d pos=%lld\n", i_data, p_stream->i_buffer_pos );
-
-    vlc_mutex_lock( &p_httpt->file_lock );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    vlc_mutex_unlock( &p_httpt->file_lock );
-
@@ -837 +865 @@
-{
-    return( _SendStream( p_httpd->p_sys, p_stream, p_data, i_data ) );
+}
+
+static int             HeaderStream( httpd_t *p_httpd, httpd_stream_t *p_stream, uint8_t *p_data, int i_data )
+{
+    httpd_sys_t *p_httpt = p_httpd->p_sys;
+
+    vlc_mutex_lock( &p_httpt->file_lock );
+
+    FREE( p_stream->p_header );
+    if( p_data == NULL || i_data <= 0 )
+    {
+        p_stream->i_header_size = 0;
+    }
+    else
+    {
+        p_stream->i_header_size = i_data;
+        p_stream->p_header = malloc( i_data );
+        memcpy( p_stream->p_header,
+                p_data,
+                i_data );
+    }
+    vlc_mutex_unlock( &p_httpt->file_lock );
+
+    return( VLC_SUCCESS );
-}
-
@@ -1013 +1065 @@
-    p_con->p_buffer = malloc( p_con->i_buffer_size );
-
+    p_con->i_stream_pos = 0; // updated by httpd_thread */
-    p_con->p_next = NULL;
-
@@ -1311 +1364 @@
-    p_con->i_state = HTTPD_CONNECTION_SENDING_HEADER;
-
+    /* we send stream header with this one */
+    if( p_con->i_http_error == 200 && p_con->p_file->b_stream )
+    {
+        p_con->i_buffer_size = 4096 + p_con->p_file->i_header_size;
+    }
+
-    p_con->i_buffer_size = 4096;
-    p_con->i_buffer = 0;
@@ -1323 +1382 @@
-    p += sprintf( p, "\r\n" );
-
-
+
+
+
+
+
+
+
+
+
+
-
-    //msg_Dbg( p_httpt, "answer=\n%s", p_con->p_buffer );
-}
-3
+00
-static void httpd_Thread( httpd_sys_t *p_httpt )
-{
@@ -1478 +1546 @@
-                            {
-                                p_con->i_state = HTTPD_CONNECTION_SENDING_STREAM;
+                                p_con->i_stream_pos = p_con->p_file->i_buffer_last_pos;
-                            }
-                            p_con = p_con->p_next;
@@ -1502 +1571 @@
-            else if( p_con->i_state == HTTPD_CONNECTION_SENDING_STREAM )
-            {
-file_t *p_file
-len
-
-
-file->i_buffer < p_file->i_buffer_valid
+stream_t *p_stream
+send
+
+
+con->i_stream_pos < p_stream->i_buffer_pos
-                {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    {
-                        httpd_connection_t *p_next = p_con->p_next;
@@ -1520 +1606 @@
-                        httpd_ConnnectionClose( p_httpt, p_con );
-                        p_con = p_next;
+                        continue;
-                    }
-
+ if( i_send > 0 )
-                    {
- = p_con->p_next
+->i_stream_pos += i_send
-                    }
-                }
-
-
-
-
+
-                continue;   /* just for clarity */
-            }
@@ -1539 +1623 @@
-        }   /* for over connection */
-
-
+
-        b_wait = VLC_TRUE;
-        /* update position for stream based file */
@@ -1555 +1639 @@
-            }
-        }
+#endif
-        vlc_mutex_unlock( &p_httpt->file_lock );
-if( b_wait ) msleep( 10
+/*if( b_wait )*/ msleep( 1
-    }
-    msg_Info( p_httpt, "httpd stopped" );

modules/mux/ogg.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-1 2003/02/24 23:27:20
+2 2003/02/25 17:17:43
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -328 +328 @@
-
-    p_og = OggStreamFlush( p_sout, &p_stream->os, 0 );
-
-
-
+
+
+
+
+
+
-
-    ogg_stream_clear( &p_stream->os );
@@ -510 +513 @@
-    }
-
+    /* set HEADER flag */
+    for( p_og = p_hdr; p_og != NULL; p_og = p_og->p_next )
+    {
+        p_og->i_flags |= SOUT_BUFFER_FLAGS_HEADER;
+    }
-    return( p_hdr );
-}

src/stream_output/stream_output.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-5 2003/02/24 23:28:18
+6 2003/02/25 17:17:43
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -635 +635 @@
-    p_buffer->i_buffer_size = i_size;
-
-
-
-
-
+   
+ 
+    
+    
-    p_buffer->i_bitrate = 0;
+    p_buffer->i_flags   = 0x0000;
-    p_buffer->p_next = NULL;
-
@@ -716 +717 @@
-    p_dup->i_pts    = p_buffer->i_pts;
-    p_dup->i_length = p_buffer->i_length;
+    p_dup->i_flags  = p_buffer->i_flags;
-    p_sout->p_vlc->pf_memcpy( p_dup->p_buffer, p_buffer->p_buffer, p_buffer->i_size );
-