Changeset 144bd771d6ccb981b245942cae439f942f54fe31

Timestamp:

03/10/04 18:10:40 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1078938640 +0000

git-parent:

[f50eee0d06b197f99fc9f3bec869fbbe2f4e3ebf]

git-author:

Gildas Bazin <gbazin@videolan.org> 1078938640 +0000

Message:

* modules/access/file.c:

+ implemented a --file-cat config option that accepts a coma separated list of file names.

This option allows opening splitted files as a single (concatenated) input.

Files:

• modules/access/file.c (modified) (15 diffs)

modules/access/file.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-: file.c,v 1.23 2004/03/01 12:50:39 gbazin Exp 
+
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -54 +54 @@
-/* stat() support for large files on win32 */
-#if defined( WIN32 ) && !defined( UNDER_CE )
-(a,b) _stati64(a,b)
+ _stati64
-#define fstat(a,b) _fstati64(a,b)
+#endif
+
+#ifdef UNDER_CE
+#   define close(a) CloseHandle((HANDLE)a)
-#endif
-
@@ -66 +70 @@
-static void    Seek   ( input_thread_t *, off_t );
-static ssize_t Read   ( input_thread_t *, byte_t *, size_t );
+
+static int     _OpenFile( input_thread_t *, char * );
-
-/*****************************************************************************
@@ -74 +80 @@
-    "Allows you to modify the default caching value for file streams. This " \
-    "value should be set in miliseconds units." )
+#define CAT_TEXT N_("Concatenate with additional files")
+#define CAT_LONGTEXT N_( \
+    "Allows you to play splitted files as they were part of a unique file. " \
+    "Specify a coma (',') separated list of files." )
-
-vlc_module_begin();
-    set_description( _("Standard filesystem file input") );
-    add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+    add_string( "file-cat", NULL, NULL, CAT_TEXT, CAT_LONGTEXT, VLC_TRUE );
-    set_capability( "access", 50 );
-    add_shortcut( "file" );
@@ -89 +100 @@
- *                  fields
- *****************************************************************************/
+typedef struct file_entry_s
+{
+    char     *psz_name;
+    int64_t  i_size;
+
+} file_entry_t;
+
-typedef struct _input_socket_s
-{
@@ -95 +113 @@
-    unsigned int        i_nb_reads;
-    vlc_bool_t          b_kfir;
+
+    /* Files list */
+    file_entry_t **p_files;
+    int          i_files;
+
+    /* Current file */
+    int  i_index;
+
-} _input_socket_t;
-
@@ -106 +132 @@
-#ifdef HAVE_SYS_STAT_H
-    int                 i_stat;
-#if defined( WIN32 ) && !defined( UNDER_CE )
-    struct _stati64     stat_info;
-#else
-    struct stat         stat_info;
-#endif
-#endif
-    _input_socket_t *   p_access_data;
-    vlc_bool_t          b_stdin, b_kfir = 0;
-    vlc_value_t         val;
+
+    file_entry_t *      p_file;
-
-    p_input->i_mtu = 0;
@@ -218 +242 @@
-    else
-    {
-
-
-
-
-
-
-
-
-
-
-
+
+
-            free( p_access_data );
-            return VLC_EGENERIC;
-        }
-        p_input->stream.p_selected_area->i_size =
-                GetFileSize( (HANDLE)p_access_data->_socket.i_handle, NULL );
-#else
-        p_access_data->_socket.i_handle = open( psz_name,
-                                                O_NONBLOCK /*| O_LARGEFILE*/ );
-        if( p_access_data->_socket.i_handle == -1 )
-        {
-#   ifdef HAVE_ERRNO_H
-            msg_Err( p_input, "cannot open file %s (%s)", psz_name,
-                              strerror(errno) );
-#   else
-            msg_Err( p_input, "cannot open file %s", psz_name );
-#   endif
-            free( p_access_data );
-            return VLC_EGENERIC;
-        }
-#endif
-    }
-
@@ -264 +262 @@
-    p_input->i_pts_delay = val.i_int * 1000;
-
+    /*
+     * Get the additional list of files
+     */
+    p_access_data->p_files = NULL;
+    p_access_data->i_files = p_access_data->i_index = 0;
+    p_file = (file_entry_t *)malloc( sizeof(file_entry_t) );
+    p_file->i_size = p_input->stream.p_selected_area->i_size;
+    p_file->psz_name = strdup( psz_name );
+    TAB_APPEND( p_access_data->i_files, p_access_data->p_files, p_file );
+
+    var_Create( p_input, "file-cat", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Get( p_input, "file-cat", &val );
+
+    if( val.psz_string && *val.psz_string )
+    {
+        char *psz_parser = psz_name = val.psz_string;
+        int64_t i_size;
+
+        while( psz_name && *psz_name )
+        {
+            psz_parser = strchr( psz_name, ',' );
+            if( psz_parser ) *psz_parser = 0;
+
+            psz_name = strdup( psz_name );
+            if( psz_name )
+            {
+                msg_Dbg( p_input, "adding file `%s'", psz_name );
+
+#ifdef HAVE_SYS_STAT_H
+                if( !stat( psz_name, &stat_info ) )
+                {
+                    p_input->stream.p_selected_area->i_size +=
+                        stat_info.st_size;
+                    i_size = stat_info.st_size;
+                }
+                else
+                {
+                    msg_Dbg( p_input, "cannot stat() file `%s'", psz_name );
+                    i_size = 0;
+                }
+#endif
+
+                p_file = (file_entry_t *)malloc( sizeof(file_entry_t) );
+                p_file->i_size = i_size;
+                p_file->psz_name = psz_name;
+
+                TAB_APPEND( p_access_data->i_files, p_access_data->p_files,
+                            p_file );
+            }
+
+            psz_name = psz_parser;
+            if( psz_name ) psz_name++;
+        }
+    }
+
+    if( val.psz_string ) free( val.psz_string );
+
-    return VLC_SUCCESS;
-}
@@ -272 +327 @@
-static void Close( vlc_object_t * p_this )
-{
-
-
+
+
+
-
-    msg_Info( p_input, "closing `%s/%s://%s'", 
-              p_input->psz_access, p_input->psz_demux, p_input->psz_name );
- 
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    free( p_access_data );
@@ -292 +351 @@
-static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
-{
- 
+
-    ssize_t i_ret;
- 
@@ -381 +440 @@
-            && (p_access_data->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 )
-    {
-#if defined( WIN32 ) && !defined( UNDER_CE )
-        struct _stati64 stat_info;
-#else
-        struct stat stat_info;
-
+
+
-        if ( fstat( p_access_data->_socket.i_handle, &stat_info ) == -1 )
-        {
@@ -395 +452 @@
-#   endif
-        }
-
-
-
+
+
+
+
-            p_input->stream.b_changed = 1;
-        }
-    }
-#endif
+
+    /* If we reached an EOF then switch to the next file in the list */
+    if ( i_ret == 0 && ++p_access_data->i_index < p_access_data->i_files )
+    {
+        int i_handle = p_access_data->_socket.i_handle;
+        char *psz_name =
+            p_access_data->p_files[p_access_data->i_index]->psz_name;
+
+        msg_Dbg( p_input, "opening file `%s'", psz_name );
+
+        if ( _OpenFile( p_input, psz_name ) != VLC_SUCCESS ) return i_ret;
+
+        close( i_handle );
+
+        /* We have to read some data */
+        return Read( p_input, p_buffer, i_len );
+    }
-
-    return i_ret;
@@ -412 +487 @@
-{
-#define S p_input->stream
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#if defined( WIN32 ) && !defined( UNDER_CE )
-i_handle, i_pos
+_socket.i_handle, i_pos - i_size
-#else
-i_handle, i_pos
+_socket.i_handle, i_pos - i_size
-#endif
-
@@ -436 +539 @@
-}
-
+/*****************************************************************************
+ * OpenFile: Opens a specific file
+ *****************************************************************************/
+static int _OpenFile( input_thread_t * p_input, char * psz_name )
+{
+    input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
+
+#ifdef UNDER_CE
+    wchar_t psz_filename[MAX_PATH];
+    MultiByteToWideChar( CP_ACP, 0, psz_name, -1, psz_filename, MAX_PATH );
+
+    p_access_data->i_handle =
+       (int)CreateFile( psz_filename, GENERIC_READ, FILE_SHARE_READ,
+                        NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+
+    if ( (HANDLE)p_access_data->i_handle == INVALID_HANDLE_VALUE )
+    {
+        msg_Err( p_input, "cannot open file %s", psz_name );
+        return VLC_EGENERIC;
+    }
+    p_input->stream.p_selected_area->i_size =
+        GetFileSize( (HANDLE)p_access_data->i_handle, NULL );
+#else
+
+    p_access_data->i_handle = open( psz_name, O_NONBLOCK /*| O_LARGEFILE*/ );
+    if ( p_access_data->i_handle == -1 )
+    {
+#   ifdef HAVE_ERRNO_H
+        msg_Err( p_input, "cannot open file %s (%s)", psz_name,
+                 strerror(errno) );
+#   else
+        msg_Err( p_input, "cannot open file %s", psz_name );
+#   endif
+        return VLC_EGENERIC;
+    }
+#endif
+
+    return VLC_SUCCESS;
+}