* http.c
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: http.c,v 1.12 2004/03/03 13:25:53 fenrir Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* Preamble
*****************************************************************************/
#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
#include <vlc/sout.h>
#include "vlc_httpd.h"
#define DEFAULT_PORT 8080
/*****************************************************************************
- * Exported prototypes
+ * Module descriptor
*****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+#define SOUT_CFG_PREFIX "sout-http-"
+
+#define USER_TEXT N_("Username")
+#define USER_LONGTEXT N_("Allows you to give a user name that will be " \
+ "requested to access the stream." )
+#define PASS_TEXT N_("Password")
+#define PASS_LONGTEXT N_("Allows you to give a password that will be " \
+ "requested to access the stream." )
-static int Write( sout_access_out_t *, sout_buffer_t * );
-static int Seek ( sout_access_out_t *, off_t );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
vlc_module_begin();
- set_description( _("HTTP stream ouput") );
+ set_description( _("HTTP stream output") );
set_capability( "sout access", 0 );
add_shortcut( "http" );
add_shortcut( "mmsh" );
+ add_string( SOUT_CFG_PREFIX "user", "", NULL, "User", "", VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "pwd", "", NULL, "Password", "", VLC_TRUE );
set_callbacks( Open, Close );
vlc_module_end();
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+static const char *ppsz_sout_options[] = {
+ "user", "pwd", NULL
+};
+
+static int Write( sout_access_out_t *, block_t * );
+static int Seek ( sout_access_out_t *, off_t );
+
struct sout_access_out_sys_t
{
/* host */
vlc_bool_t b_header_complete;
};
-#if 0
-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" },
- { ".wma", "audio/x-ms-wma" },
- { ".wmv", "video/x-ms-wmv" },
- { ".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" );
-}
-#endif
-
/*****************************************************************************
* Open: open the file
*****************************************************************************/
char *psz_bind_addr;
int i_bind_port;
char *psz_file_name;
-
+ char *psz_user = NULL;
+ char *psz_pwd = NULL;
char *psz_mime = NULL;
+ vlc_value_t val;
if( !( p_sys = p_access->p_sys =
malloc( sizeof( sout_access_out_sys_t ) ) ) )
return( VLC_EGENERIC );
}
+ sout_ParseCfg( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
+
/* p_access->psz_name host.name:port/filename */
psz_name = psz_parser = strdup( p_access->psz_name );
psz_file_name = strdup( psz_file_name );
}
- p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_access), psz_bind_addr, i_bind_port );
+ p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_access), psz_bind_addr,
+ i_bind_port );
if( p_sys->p_httpd_host == NULL )
{
- msg_Err( p_access, "cannot listen on %s:%d", psz_bind_addr, i_bind_port );
+ msg_Err( p_access, "cannot listen on %s:%d",
+ psz_bind_addr, i_bind_port );
free( psz_name );
free( psz_file_name );
psz_mime = "video/x-ms-asf-stream";
}
- p_sys->p_httpd_stream = httpd_StreamNew( p_sys->p_httpd_host,
- psz_file_name, psz_mime,
- sout_cfg_find_value( p_access->p_cfg, "user" ),
- sout_cfg_find_value( p_access->p_cfg, "pwd" ) );
+ var_Get( p_access, SOUT_CFG_PREFIX "user", &val );
+ if( val.psz_string && *val.psz_string )
+ psz_user = val.psz_string;
+ else if( val.psz_string )
+ free( val.psz_string );
+
+ var_Get( p_access, SOUT_CFG_PREFIX "pwd", &val );
+ if( val.psz_string && *val.psz_string )
+ psz_pwd = val.psz_string;
+ else if( val.psz_string )
+ free( val.psz_string );
+
+ p_sys->p_httpd_stream =
+ httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime,
+ psz_user, psz_pwd );
+ if( psz_user ) free( psz_user );
+ if( psz_pwd ) free( psz_pwd );
+
if( p_sys->p_httpd_stream == NULL )
{
msg_Err( p_access, "cannot add stream %s", psz_file_name );
p_access->pf_write = Write;
p_access->pf_seek = Seek;
+
+ /* update p_sout->i_out_pace_nocontrol */
+ p_access->p_sout->i_out_pace_nocontrol++;
+
return VLC_SUCCESS;
}
sout_access_out_t *p_access = (sout_access_out_t*)p_this;
sout_access_out_sys_t *p_sys = p_access->p_sys;
+ /* update p_sout->i_out_pace_nocontrol */
+ p_access->p_sout->i_out_pace_nocontrol--;
+
httpd_StreamDelete( p_sys->p_httpd_stream );
httpd_HostDelete( p_sys->p_httpd_host );
/*****************************************************************************
* Write:
*****************************************************************************/
-static int Write( sout_access_out_t *p_access, sout_buffer_t *p_buffer )
+static int Write( sout_access_out_t *p_access, block_t *p_buffer )
{
- sout_access_out_sys_t *p_sys = p_access->p_sys;
+ sout_access_out_sys_t *p_sys = p_access->p_sys;
int i_err = 0;
while( p_buffer )
{
- sout_buffer_t *p_next;
+ block_t *p_next;
- if( p_buffer->i_flags & SOUT_BUFFER_FLAGS_HEADER )
+ if( p_buffer->i_flags & BLOCK_FLAG_HEADER )
{
/* gather header */
if( p_sys->b_header_complete )
p_sys->i_header_size = 0;
p_sys->b_header_complete = VLC_FALSE;
}
- if( (int)(p_buffer->i_size + p_sys->i_header_size) > p_sys->i_header_allocated )
+ if( (int)(p_buffer->i_buffer + 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 );
+ p_sys->i_header_allocated =
+ p_buffer->i_buffer + 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;
+ p_buffer->i_buffer );
+ p_sys->i_header_size += p_buffer->i_buffer;
}
else if( !p_sys->b_header_complete )
{
p_sys->b_header_complete = VLC_TRUE;
- httpd_StreamHeader( p_sys->p_httpd_stream, p_sys->p_header, p_sys->i_header_size );
+ httpd_StreamHeader( p_sys->p_httpd_stream, p_sys->p_header,
+ p_sys->i_header_size );
}
/* send data */
- i_err = httpd_StreamSend( p_sys->p_httpd_stream, p_buffer->p_buffer, p_buffer->i_size );
+ i_err = httpd_StreamSend( p_sys->p_httpd_stream, p_buffer->p_buffer,
+ p_buffer->i_buffer );
p_next = p_buffer->p_next;
- sout_BufferDelete( p_access->p_sout, p_buffer );
+ block_Release( p_buffer );
p_buffer = p_next;
if( i_err < 0 )
if( i_err < 0 )
{
- sout_buffer_t *p_next;
- while( p_buffer )
- {
- p_next = p_buffer->p_next;
- sout_BufferDelete( p_access->p_sout, p_buffer );
- p_buffer = p_next;
- }
+ block_ChainRelease( p_buffer );
}
return( i_err < 0 ? VLC_EGENERIC : VLC_SUCCESS );
msg_Warn( p_access, "HTTP sout access cannot seek" );
return VLC_EGENERIC;
}
-
projects / vlc / blobdiff