X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Ffile.c;h=cdf51accde8e2e351015778adc852e98fe84a228;hb=9706bc1b42009a7c777dbe1d32027dea40f6c848;hp=fb694a3c8ea65e5f972d754784ee172bf8d333cd;hpb=49c5319575d754e806a0eebc93138a9c52f926ef;p=vlc diff --git a/modules/access/file.c b/modules/access/file.c index fb694a3c8e..cdf51accde 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -30,7 +30,8 @@ # include "config.h" #endif -#include +#include +#include #include #include #include @@ -86,16 +87,15 @@ static void Close( vlc_object_t * ); "value should be set in milliseconds." ) vlc_module_begin(); - set_description( _("File input") ); - set_shortname( _("File") ); + set_description( N_("File input") ); + set_shortname( N_("File") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); - add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); add_obsolete_string( "file-cat" ); - set_capability( "access2", 50 ); + set_capability( "access", 50 ); add_shortcut( "file" ); add_shortcut( "stream" ); - add_shortcut( "kfir" ); set_callbacks( Open, Close ); vlc_module_end(); @@ -112,13 +112,12 @@ static int open_file( access_t *, const char * ); struct access_sys_t { unsigned int i_nb_reads; - vlc_bool_t b_kfir; int fd; /* */ - vlc_bool_t b_seekable; - vlc_bool_t b_pace_control; + bool b_seekable; + bool b_pace_control; }; /***************************************************************************** @@ -129,31 +128,24 @@ static int Open( vlc_object_t *p_this ) access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; - vlc_bool_t b_stdin = !strcmp (p_access->psz_path, "-"); + bool b_stdin = !strcmp (p_access->psz_path, "-"); /* Update default_pts to a suitable value for file access */ var_Create( p_access, "file-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); STANDARD_READ_ACCESS_INIT; p_sys->i_nb_reads = 0; - p_sys->b_kfir = VLC_FALSE; int fd = p_sys->fd = -1; if (!strcasecmp (p_access->psz_access, "stream")) { - p_sys->b_seekable = VLC_FALSE; - p_sys->b_pace_control = VLC_FALSE; - } - else if (!strcasecmp (p_access->psz_access, "kfir")) - { - p_sys->b_seekable = VLC_FALSE; - p_sys->b_pace_control = VLC_FALSE; - p_sys->b_kfir = VLC_TRUE; + p_sys->b_seekable = false; + p_sys->b_pace_control = false; } else { - p_sys->b_seekable = VLC_TRUE; - p_sys->b_pace_control = VLC_TRUE; + p_sys->b_seekable = true; + p_sys->b_pace_control = true; } /* Open file */ @@ -192,10 +184,8 @@ static int Open( vlc_object_t *p_this ) #ifdef HAVE_SYS_STAT_H p_access->info.i_size = st.st_size; - if (!S_ISREG (st.st_mode) - && !S_ISBLK (st.st_mode) - && !S_ISCHR (st.st_mode)) - p_sys->b_seekable = VLC_FALSE; + if (!S_ISREG (st.st_mode)) + p_sys->b_seekable = false; #else p_sys->b_seekable = !b_stdin; # warning File size not known! @@ -226,43 +216,23 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) int fd = p_sys->fd; #if !defined(WIN32) && !defined(UNDER_CE) - if( !p_sys->b_pace_control ) + if( !p_sys->b_seekable ) { - if( !p_sys->b_kfir ) - { - /* Find if some data is available. This won't work under Windows. */ - do - { - struct pollfd ufd; - - if( p_access->b_die ) - return 0; - - memset (&ufd, 0, sizeof (ufd)); - ufd.fd = fd; - ufd.events = POLLIN; - - i_ret = poll (&ufd, 1, 500); - } - while (i_ret <= 0); - - i_ret = read (fd, p_buffer, i_len); - } - else - { - /* b_kfir ; work around a buggy poll() driver implementation */ - while (((i_ret = read (fd, p_buffer, i_len)) == 0) - && !p_access->b_die) - { - msleep( INPUT_ERROR_SLEEP ); - } - } + /* Note that POSIX regular files (b_seekable) opened for read are + * guaranteed to always set POLLIN immediately, so we can spare + * poll()ing them. */ + /* Wait until some data is available. Impossible on Windows. */ + struct pollfd ufd[2] = { + { .fd = fd, .events = POLLIN, }, + { .fd = vlc_object_waitpipe (p_access), .events = POLLIN, }, + }; + + if (poll (ufd, 2, -1) < 0 || ufd[1].revents) + return -1; } - else #endif /* WIN32 || UNDER_CE */ - /* b_pace_control || WIN32 */ - i_ret = read( fd, p_buffer, i_len ); + i_ret = read (fd, p_buffer, i_len); if( i_ret < 0 ) { switch (errno) @@ -273,14 +243,14 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) default: msg_Err (p_access, "read failed (%m)"); - intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), + intf_UserFatal (p_access, false, _("File reading failed"), _("VLC could not read the file.")); } - - /* Delay a bit to avoid consuming all the CPU. This is particularly - * useful when reading from an unconnected FIFO. */ - msleep( INPUT_ERROR_SLEEP ); } + else if( i_ret > 0 ) + p_access->info.i_pos += i_ret; + else if( i_ret == 0 ) + p_access->info.b_eof = true; p_sys->i_nb_reads++; @@ -298,12 +268,6 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) } } #endif - - if( i_ret > 0 ) - p_access->info.i_pos += i_ret; - else if( i_ret == 0 ) - p_access->info.b_eof = VLC_TRUE; - return i_ret; } @@ -314,7 +278,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) static int Seek (access_t *p_access, int64_t i_pos) { p_access->info.i_pos = i_pos; - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; lseek (p_access->p_sys->fd, i_pos, SEEK_SET); return VLC_SUCCESS; @@ -326,7 +290,7 @@ static int Seek (access_t *p_access, int64_t i_pos) static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; + bool *pb_bool; int *pi_int; int64_t *pi_64; @@ -335,13 +299,13 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ case ACCESS_CAN_SEEK: case ACCESS_CAN_FASTSEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + pb_bool = (bool*)va_arg( args, bool* ); *pb_bool = p_sys->b_seekable; break; case ACCESS_CAN_PAUSE: case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + pb_bool = (bool*)va_arg( args, bool* ); *pb_bool = p_sys->b_pace_control; break; @@ -353,7 +317,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = var_GetInteger( p_access, "file-caching" ) * I64C(1000); + *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C(1000); break; /* */ @@ -397,7 +361,7 @@ static int open_file (access_t *p_access, const char *path) if ( !p_sys->fd ) { msg_Err( p_access, "cannot open file %s", path ); - intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"), + intf_UserFatal( p_access, false, _("File reading failed"), _("VLC could not open the file \"%s\"."), path ); return VLC_EGENERIC; } @@ -411,7 +375,7 @@ static int open_file (access_t *p_access, const char *path) if (fd == -1) { msg_Err (p_access, "cannot open file %s (%m)", path); - intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), + intf_UserFatal (p_access, false, _("File reading failed"), _("VLC could not open the file \"%s\"."), path); return -1; }