X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Ffile.c;h=9cf4d98c99f6059f970529b214814b38b0e07528;hb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;hp=57e1abe59ff05b5f6cdc1588ec02833a1bb8ed21;hpb=7211d64eb0b68c60fdde0148a59f8a9f26b7d5fc;p=vlc diff --git a/modules/access_output/file.c b/modules/access_output/file.c index 57e1abe59f..9cf4d98c99 100644 --- a/modules/access_output/file.c +++ b/modules/access_output/file.c @@ -1,8 +1,8 @@ /***************************************************************************** * file.c ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: file.c,v 1.4 2003/03/03 14:21:08 gbazin Exp $ + * Copyright (C) 2001, 2002 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * Eric Petit @@ -19,52 +19,79 @@ * * 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 #include #include -#include -#include +#include #include +#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include -#include +#include +#include +#include +#include +#include +#include "vlc_strings.h" -#ifdef HAVE_UNISTD_H -# include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) && !defined( UNDER_CE ) # include +# define lseek _lseeki64 +#else +# include #endif -/***************************************************************************** - * Exported prototypes - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); - -static int Write( sout_access_out_t *, sout_buffer_t * ); -static int Seek ( sout_access_out_t *, off_t ); +#ifndef O_LARGEFILE +# define O_LARGEFILE 0 +#endif /***************************************************************************** * Module descriptor *****************************************************************************/ +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +#define SOUT_CFG_PREFIX "sout-file-" +#define APPEND_TEXT N_("Append to file") +#define APPEND_LONGTEXT N_( "Append to file if it exists instead " \ + "of replacing it.") + vlc_module_begin(); - set_description( _("File stream ouput") ); + set_description( N_("File stream output") ); + set_shortname( N_("File" )); set_capability( "sout access", 50 ); + set_category( CAT_SOUT ); + set_subcategory( SUBCAT_SOUT_ACO ); add_shortcut( "file" ); + add_shortcut( "stream" ); + add_bool( SOUT_CFG_PREFIX "append", 0, NULL, APPEND_TEXT,APPEND_LONGTEXT, + true ); set_callbacks( Open, Close ); vlc_module_end(); + +/***************************************************************************** + * Exported prototypes + *****************************************************************************/ +static const char *const ppsz_sout_options[] = { + "append", NULL +}; + +static ssize_t Write( sout_access_out_t *, block_t * ); +static int Seek ( sout_access_out_t *, off_t ); +static ssize_t Read ( sout_access_out_t *, block_t * ); + struct sout_access_out_sys_t { - FILE *p_file; - + int i_handle; }; /***************************************************************************** @@ -73,24 +100,55 @@ struct sout_access_out_sys_t static int Open( vlc_object_t *p_this ) { sout_access_out_t *p_access = (sout_access_out_t*)p_this; + int fd; + + config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg ); + + if( !p_access->psz_path ) + { + msg_Err( p_access, "no file name specified" ); + return VLC_EGENERIC; + } + + bool append = var_GetBool( p_access, SOUT_CFG_PREFIX "append" ); - if( !( p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ) ) ) + if( !strcmp( p_access->psz_path, "-" ) ) + { +#ifdef WIN32 + setmode (fileno (stdout), O_BINARY); +#endif + fd = dup (fileno (stdout)); + msg_Dbg( p_access, "using stdout" ); + } + else { - msg_Err( p_access, "out of memory" ); - return( VLC_EGENERIC ); + char *psz_tmp = str_format( p_access, p_access->psz_path ); + path_sanitize( psz_tmp ); + + fd = utf8_open( psz_tmp, O_RDWR | O_CREAT | O_LARGEFILE | + (append ? 0 : O_TRUNC), 0666 ); + free( psz_tmp ); } - if( !( p_access->p_sys->p_file = fopen( p_access->psz_name, "wb" ) ) ) + if (fd == -1) { - msg_Err( p_access, "cannot open `%s'", p_access->psz_name ); - free( p_access->p_sys ); - return( VLC_EGENERIC ); + msg_Err( p_access, "cannot open `%s' (%m)", p_access->psz_path ); + return VLC_EGENERIC; } - p_access->pf_write = Write; - p_access->pf_seek = Seek; + p_access->pf_write = Write; + p_access->pf_read = Read; + p_access->pf_seek = Seek; + p_access->p_sys = (void *)(intptr_t)fd; + + msg_Dbg( p_access, "file access output opened (%s)", p_access->psz_path ); + if (append) + lseek (fd, 0, SEEK_END); + + /* Update pace control flag */ + if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) ) + p_access->p_sout->i_out_pace_nocontrol++; - msg_Info( p_access, "Open: name:`%s'", p_access->psz_name ); return VLC_SUCCESS; } @@ -99,37 +157,45 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Close( vlc_object_t * p_this ) { - sout_access_out_t *p_access = (sout_access_out_t*)p_this; + sout_access_out_t *p_access = (sout_access_out_t*)p_this; - if( p_access->p_sys->p_file ) - { - fclose( p_access->p_sys->p_file ); - } - free( p_access->p_sys ); + close( (intptr_t)p_access->p_sys ); + + /* Update pace control flag */ + if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) ) + p_access->p_sout->i_out_pace_nocontrol--; - msg_Info( p_access, "Close" ); + msg_Dbg( p_access, "file access output closed" ); } /***************************************************************************** * Read: standard read on a file descriptor. *****************************************************************************/ -static int Write( sout_access_out_t *p_access, sout_buffer_t *p_buffer ) +static ssize_t Read( sout_access_out_t *p_access, block_t *p_buffer ) +{ + return read( (intptr_t)p_access->p_sys, p_buffer->p_buffer, + p_buffer->i_buffer ); +} + +/***************************************************************************** + * Write: standard write on a file descriptor. + *****************************************************************************/ +static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) { size_t i_write = 0; - do + while( p_buffer ) { - sout_buffer_t *p_next; + block_t *p_next = p_buffer->p_next;; - i_write += fwrite( p_buffer->p_buffer, 1, p_buffer->i_size, - p_access->p_sys->p_file ); - p_next = p_buffer->p_next; - sout_BufferDelete( p_access->p_sout, p_buffer ); - p_buffer = p_next; + i_write += write( (intptr_t)p_access->p_sys, + p_buffer->p_buffer, p_buffer->i_buffer ); + block_Release( p_buffer ); - } while( p_buffer ); + p_buffer = p_next; + } - return( i_write ); + return i_write; } /***************************************************************************** @@ -137,10 +203,5 @@ static int Write( sout_access_out_t *p_access, sout_buffer_t *p_buffer ) *****************************************************************************/ static int Seek( sout_access_out_t *p_access, off_t i_pos ) { - - msg_Dbg( p_access, "Seek: pos:"I64Fd, (int64_t)i_pos ); - return( fseek( p_access->p_sys->p_file, i_pos, SEEK_SET ) ); + return lseek( (intptr_t)p_access->p_sys, i_pos, SEEK_SET ); } - - -