Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
345b6087
Commit
345b6087
authored
Nov 01, 2006
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get rid of broken file-cat option (closes #807)
parent
6b623212
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
137 deletions
+39
-137
modules/access/file.c
modules/access/file.c
+39
-137
No files found.
modules/access/file.c
View file @
345b6087
...
...
@@ -92,7 +92,7 @@ vlc_module_begin();
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_
string
(
"file-cat"
,
NULL
,
NULL
,
CAT_TEXT
,
CAT_LONGTEXT
,
VLC_TRUE
);
add_
deprecated
(
"file-cat"
,
VLC_TRUE
);
set_capability
(
"access2"
,
50
);
add_shortcut
(
"file"
);
add_shortcut
(
"stream"
);
...
...
@@ -115,13 +115,7 @@ struct access_sys_t
unsigned
int
i_nb_reads
;
vlc_bool_t
b_kfir
;
/* Files list */
unsigned
filec
;
int
*
filev
;
int64_t
*
sizev
;
/* Current file */
unsigned
filep
;
int
fd
;
/* */
vlc_bool_t
b_seekable
;
...
...
@@ -135,7 +129,6 @@ static int Open( vlc_object_t *p_this )
{
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_sys_t
*
p_sys
;
char
*
catlist
;
vlc_bool_t
b_stdin
=
!
strcmp
(
p_access
->
psz_path
,
"-"
);
...
...
@@ -145,8 +138,7 @@ static int Open( vlc_object_t *p_this )
STANDARD_READ_ACCESS_INIT
;
p_sys
->
i_nb_reads
=
0
;
p_sys
->
b_kfir
=
VLC_FALSE
;
p_sys
->
filec
=
1
;
p_sys
->
filep
=
0
;
int
fd
=
p_sys
->
fd
=
-
1
;
if
(
!
strcasecmp
(
p_access
->
psz_access
,
"stream"
))
{
...
...
@@ -165,68 +157,13 @@ static int Open( vlc_object_t *p_this )
p_sys
->
b_pace_control
=
VLC_TRUE
;
}
/* Count number of files */
catlist
=
var_CreateGetString
(
p_access
,
"file-cat"
);
if
(
catlist
==
NULL
)
{
free
(
p_sys
);
return
VLC_ENOMEM
;
}
if
(
*
catlist
)
{
for
(
const
char
*
ptr
=
catlist
;
ptr
!=
NULL
;
p_sys
->
filec
++
)
{
ptr
=
strchr
(
ptr
,
','
);
if
(
ptr
!=
NULL
)
ptr
++
;
}
}
p_sys
->
filev
=
calloc
(
p_sys
->
filec
,
sizeof
(
p_sys
->
filev
[
0
]));
if
(
p_sys
->
filev
==
NULL
)
{
free
(
catlist
);
free
(
p_sys
);
return
VLC_ENOMEM
;
}
p_sys
->
sizev
=
calloc
(
p_sys
->
filec
,
sizeof
(
p_sys
->
sizev
[
0
]));
if
(
p_sys
->
sizev
==
NULL
)
{
free
(
catlist
);
free
(
p_sys
->
filev
);
free
(
p_sys
);
return
VLC_ENOMEM
;
}
/* Open files */
char
*
filename
=
catlist
;
for
(
unsigned
i
=
0
;
i
<
p_sys
->
filec
;
i
++
)
{
int
fd
=
-
1
;
if
(
i
==
0
)
{
/* Open file */
msg_Dbg
(
p_access
,
"opening file `%s'"
,
p_access
->
psz_path
);
if
(
b_stdin
)
fd
=
dup
(
0
);
else
fd
=
open_file
(
p_access
,
p_access
->
psz_path
);
}
else
{
assert
(
filename
!=
NULL
);
char
*
ptr
=
strchr
(
filename
,
','
);
if
(
ptr
!=
NULL
)
*
ptr
=
0
;
msg_Dbg
(
p_access
,
"opening additionnal file `%s'"
,
filename
);
fd
=
open_file
(
p_access
,
filename
);
filename
=
ptr
+
1
;
}
#ifdef HAVE_SYS_STAT_H
struct
stat
st
;
...
...
@@ -249,30 +186,21 @@ static int Open( vlc_object_t *p_this )
if
(
fd
==
-
1
)
{
free
(
catlist
);
p_sys
->
filec
=
i
;
Close
(
p_this
);
free
(
p_sys
);
return
VLC_EGENERIC
;
}
p_sys
->
filev
[
i
]
=
fd
;
p_sys
->
fd
=
fd
;
#ifdef HAVE_SYS_STAT_H
p_sys
->
sizev
[
i
]
=
st
.
st_size
;
p_access
->
info
.
i_size
+=
st
.
st_size
;
p_access
->
info
.
i_size
=
st
.
st_size
;
if
(
!
S_ISREG
(
st
.
st_mode
)
&&
!
S_ISBLK
(
st
.
st_mode
)
&&
(
!
S_ISCHR
(
st
.
st_mode
)
||
(
st
.
st_size
==
0
)))
// If one file is not seekable, the concatenation is not either
p_sys
->
b_seekable
=
VLC_FALSE
;
#else
p_sys
->
b_seekable
=
!
b_stdin
;
#endif
}
free
(
catlist
);
if
(
p_sys
->
b_seekable
&&
!
p_access
->
info
.
i_size
)
if
(
p_sys
->
b_seekable
&&
(
p_access
->
info
.
i_size
==
0
))
{
/* FIXME that's bad because all others access will be probed */
msg_Err
(
p_access
,
"file is empty, aborting"
);
...
...
@@ -291,11 +219,7 @@ static void Close (vlc_object_t * p_this)
access_t
*
p_access
=
(
access_t
*
)
p_this
;
access_sys_t
*
p_sys
=
p_access
->
p_sys
;
for
(
unsigned
i
=
0
;
i
<
p_sys
->
filec
;
i
++
)
close
(
p_sys
->
filev
[
i
]);
free
(
p_sys
->
filev
);
free
(
p_sys
->
sizev
);
close
(
p_sys
->
fd
);
free
(
p_sys
);
}
...
...
@@ -306,7 +230,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
{
access_sys_t
*
p_sys
=
p_access
->
p_sys
;
int
i_ret
;
int
fd
=
p_sys
->
f
ilev
[
p_sys
->
filep
]
;
int
fd
=
p_sys
->
f
d
;
#if !defined(WIN32) && !defined(UNDER_CE)
if
(
!
p_sys
->
b_pace_control
)
...
...
@@ -373,28 +297,16 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
(
p_sys
->
i_nb_reads
%
INPUT_FSTAT_NB_READS
)
==
0
)
{
struct
stat
st
;
int
i
=
p_sys
->
filep
;
if
((
fstat
(
fd
,
&
st
)
==
0
)
&&
(
p_
sys
->
sizev
[
i
]
!=
st
.
st_size
))
&&
(
p_
access
->
info
.
i_size
!=
st
.
st_size
))
{
p_access
->
info
.
i_size
+=
st
.
st_size
-
p_sys
->
sizev
[
i
];
p_sys
->
sizev
[
i
]
=
st
.
st_size
;
p_access
->
info
.
i_size
=
st
.
st_size
;
p_access
->
info
.
i_update
|=
INPUT_UPDATE_SIZE
;
}
}
#endif
/* If we reached an EOF then switch to the next file in the list */
if
(
i_ret
==
0
)
{
if
(
++
p_sys
->
filep
<
p_sys
->
filec
)
/* We have to read some data */
return
Read
(
p_access
,
p_buffer
,
i_len
);
else
p_sys
->
filep
--
;
}
if
(
i_ret
>
0
)
p_access
->
info
.
i_pos
+=
i_ret
;
else
if
(
i_ret
==
0
)
...
...
@@ -425,17 +337,7 @@ static int Seek (access_t *p_access, int64_t i_pos)
p_access
->
info
.
b_eof
=
VLC_FALSE
;
/* Determine which file we need to access */
unsigned
i
=
0
;
assert
(
p_sys
->
filec
>
0
);
while
(
i_pos
>
p_sys
->
sizev
[
i
])
{
i_pos
-=
p_sys
->
sizev
[
i
++
];
assert
(
i
<
p_sys
->
filec
);
}
p_sys
->
filep
=
i
;
lseek
(
p_sys
->
filev
[
i
],
i_pos
,
SEEK_SET
);
lseek
(
p_sys
->
fd
,
i_pos
,
SEEK_SET
);
return
VLC_SUCCESS
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment