X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Ffile.c;h=91ae8636690cc11a0e1c7c6b687d38f513cc1317;hb=e03575f14bbe12673de2ede04879f452299a9e2c;hp=660070947fd115b2289240ba37d34d2eb7d97114;hpb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;p=vlc diff --git a/modules/access_output/file.c b/modules/access_output/file.c index 660070947f..91ae863669 100644 --- a/modules/access_output/file.c +++ b/modules/access_output/file.c @@ -25,33 +25,30 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include +#include +#include +#include + +#include #include #include #include -#include -#include "vlc_strings.h" +#include +#include -#ifdef HAVE_UNISTD_H -# include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) && !defined( UNDER_CE ) # include +# define lseek _lseeki64 +#else +# include #endif -/* For those platforms that don't use these */ -#ifndef STDOUT_FILENO -# define STDOUT_FILENO 1 -#endif #ifndef O_LARGEFILE # define O_LARGEFILE 0 #endif @@ -66,31 +63,35 @@ static void Close( vlc_object_t * ); #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( 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(); +#define SYNC_TEXT N_("Synchronous writing") +#define SYNC_LONGTEXT N_( "Open the file with synchronous writing.") + +vlc_module_begin () + 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", "stream" ) + add_bool( SOUT_CFG_PREFIX "append", false, NULL, APPEND_TEXT,APPEND_LONGTEXT, + true ) + add_bool( SOUT_CFG_PREFIX "sync", false, NULL, SYNC_TEXT,SYNC_LONGTEXT, + false ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { - "append", NULL +static const char *const ppsz_sout_options[] = { + "append", "sync", 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 * ); +static int Control( sout_access_out_t *, int, va_list ); struct sout_access_out_sys_t { @@ -103,8 +104,8 @@ 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 i_flags; - vlc_value_t val; + int fd; + bool sync; config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg ); @@ -114,51 +115,50 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - if( !( p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ) ) ) - { - return( VLC_ENOMEM ); - } - - i_flags = O_RDWR|O_CREAT|O_LARGEFILE; - - var_Get( p_access, SOUT_CFG_PREFIX "append", &val ); - i_flags |= val.b_bool ? O_APPEND : O_TRUNC; + bool append = var_GetBool( p_access, SOUT_CFG_PREFIX "append" ); + sync = var_GetBool( p_access, SOUT_CFG_PREFIX "sync" ); if( !strcmp( p_access->psz_path, "-" ) ) { -#if defined(WIN32) - setmode (STDOUT_FILENO, O_BINARY); +#ifndef UNDER_CE +#ifdef WIN32 + setmode (fileno (stdout), O_BINARY); #endif - p_access->p_sys->i_handle = STDOUT_FILENO; + fd = vlc_dup (fileno (stdout)); msg_Dbg( p_access, "using stdout" ); +#else +#warning stdout is not supported on Windows Mobile, but may be used on Windows CE + fd = -1; +#endif } else { - int fd; char *psz_tmp = str_format( p_access, p_access->psz_path ); path_sanitize( psz_tmp ); - fd = utf8_open( psz_tmp, i_flags, 0666 ); + fd = vlc_open( psz_tmp, O_RDWR | O_CREAT | O_LARGEFILE | +#ifdef O_SYNC + (sync ? O_SYNC : 0) | +#endif + (append ? 0 : O_TRUNC), 0666 ); free( psz_tmp ); + } - if( fd == -1 ) - { - msg_Err( p_access, "cannot open `%s' (%m)", p_access->psz_path ); - free( p_access->p_sys ); - return( VLC_EGENERIC ); - } - p_access->p_sys->i_handle = fd; + if (fd == -1) + { + msg_Err( p_access, "cannot open `%s' (%m)", p_access->psz_path ); + return VLC_EGENERIC; } p_access->pf_write = Write; p_access->pf_read = Read; p_access->pf_seek = Seek; + p_access->pf_control = Control; + p_access->p_sys = (void *)(intptr_t)fd; - msg_Dbg( p_access, "file access output opened (`%s')", p_access->psz_path ); - - /* Update pace control flag */ - if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) ) - p_access->p_sout->i_out_pace_nocontrol++; + msg_Dbg( p_access, "file access output opened (%s)", p_access->psz_path ); + if (append) + lseek (fd, 0, SEEK_END); return VLC_SUCCESS; } @@ -170,20 +170,26 @@ static void Close( vlc_object_t * p_this ) { sout_access_out_t *p_access = (sout_access_out_t*)p_this; - if( strcmp( p_access->psz_path, "-" ) ) + close( (intptr_t)p_access->p_sys ); + + msg_Dbg( p_access, "file access output closed" ); +} + +static int Control( sout_access_out_t *p_access, int i_query, va_list args ) +{ + switch( i_query ) { - if( p_access->p_sys->i_handle ) + case ACCESS_OUT_CONTROLS_PACE: { - close( p_access->p_sys->i_handle ); + bool *pb = va_arg( args, bool * ); + *pb = strcmp( p_access->psz_access, "stream" ); + break; } - } - free( 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_Dbg( p_access, "file access output closed" ); + default: + return VLC_EGENERIC; + } + return VLC_SUCCESS; } /***************************************************************************** @@ -191,14 +197,13 @@ static void Close( vlc_object_t * p_this ) *****************************************************************************/ static ssize_t Read( sout_access_out_t *p_access, block_t *p_buffer ) { - if( strcmp( p_access->psz_path, "-" ) ) - { - return read( p_access->p_sys->i_handle, p_buffer->p_buffer, - p_buffer->i_buffer ); - } + ssize_t val; - msg_Err( p_access, "cannot read while using stdout" ); - return VLC_EGENERIC; + do + val = read( (intptr_t)p_access->p_sys, p_buffer->p_buffer, + p_buffer->i_buffer ); + while (val == -1 && errno == EINTR); + return val; } /***************************************************************************** @@ -210,15 +215,29 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) while( p_buffer ) { - block_t *p_next = p_buffer->p_next;; - - i_write += write( p_access->p_sys->i_handle, - p_buffer->p_buffer, p_buffer->i_buffer ); - block_Release( p_buffer ); + ssize_t val = write ((intptr_t)p_access->p_sys, + p_buffer->p_buffer, p_buffer->i_buffer); + if (val == -1) + { + if (errno == EINTR) + continue; + block_ChainRelease (p_buffer); + return -1; + } - p_buffer = p_next; + if ((size_t)val >= p_buffer->i_buffer) + { + block_t *p_next = p_buffer->p_next; + block_Release (p_buffer); + p_buffer = p_next; + } + else + { + p_buffer->p_buffer += val; + p_buffer->i_buffer -= val; + } + i_write += val; } - return i_write; } @@ -227,17 +246,5 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) *****************************************************************************/ static int Seek( sout_access_out_t *p_access, off_t i_pos ) { - if( strcmp( p_access->psz_path, "-" ) ) - { -#if defined( WIN32 ) && !defined( UNDER_CE ) - return( _lseeki64( p_access->p_sys->i_handle, i_pos, SEEK_SET ) ); -#else - return( lseek( p_access->p_sys->i_handle, i_pos, SEEK_SET ) ); -#endif - } - else - { - msg_Err( p_access, "cannot seek while using stdout" ); - return VLC_EGENERIC; - } + return lseek( (intptr_t)p_access->p_sys, i_pos, SEEK_SET ); }