Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
776959f7
Commit
776959f7
authored
Aug 24, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream: common implementation of stream_Read() loop
parent
7ff25f98
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
7 deletions
+34
-7
src/input/stream.c
src/input/stream.c
+34
-7
No files found.
src/input/stream.c
View file @
776959f7
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#include <vlc_memory.h>
#include <vlc_memory.h>
#include <vlc_access.h>
#include <vlc_access.h>
#include <vlc_charset.h>
#include <vlc_charset.h>
#include <vlc_interrupt.h>
#include <libvlc.h>
#include <libvlc.h>
#include "stream.h"
#include "stream.h"
...
@@ -302,6 +303,33 @@ error:
...
@@ -302,6 +303,33 @@ error:
return
NULL
;
return
NULL
;
}
}
static
ssize_t
stream_ReadRaw
(
stream_t
*
s
,
void
*
buf
,
size_t
len
)
{
size_t
copy
=
0
;
ssize_t
ret
=
0
;
while
(
len
>
0
)
{
if
(
vlc_killed
())
{
ret
=
-
1
;
break
;
}
ret
=
s
->
pf_read
(
s
,
buf
,
len
);
if
(
ret
<=
0
)
break
;
assert
((
size_t
)
ret
<=
len
);
if
(
buf
!=
NULL
)
buf
=
(
unsigned
char
*
)
buf
+
ret
;
len
-=
ret
;
copy
+=
ret
;
}
return
(
copy
>
0
)
?
(
ssize_t
)
copy
:
ret
;
}
/**
/**
* Reads data from a byte stream.
* Reads data from a byte stream.
*
*
...
@@ -321,14 +349,13 @@ ssize_t stream_Read(stream_t *s, void *buf, size_t len)
...
@@ -321,14 +349,13 @@ ssize_t stream_Read(stream_t *s, void *buf, size_t len)
block_t
*
peek
=
priv
->
peek
;
block_t
*
peek
=
priv
->
peek
;
size_t
copy
=
0
;
size_t
copy
=
0
;
if
(
unlikely
(
len
==
0
))
return
0
;
if
(
peek
!=
NULL
)
if
(
peek
!=
NULL
)
{
{
copy
=
peek
->
i_buffer
<
len
?
peek
->
i_buffer
:
len
;
copy
=
peek
->
i_buffer
<
len
?
peek
->
i_buffer
:
len
;
assert
(
copy
>
0
);
if
(
unlikely
(
len
==
0
))
return
0
;
if
(
buf
!=
NULL
)
if
(
buf
!=
NULL
)
memcpy
(
buf
,
peek
->
p_buffer
,
copy
);
memcpy
(
buf
,
peek
->
p_buffer
,
copy
);
...
@@ -347,7 +374,7 @@ ssize_t stream_Read(stream_t *s, void *buf, size_t len)
...
@@ -347,7 +374,7 @@ ssize_t stream_Read(stream_t *s, void *buf, size_t len)
return
copy
;
return
copy
;
}
}
ssize_t
ret
=
s
->
pf_read
(
s
,
buf
,
len
);
ssize_t
ret
=
s
tream_ReadRaw
(
s
,
buf
,
len
);
return
(
ret
>=
0
)
?
(
ssize_t
)(
ret
+
copy
)
return
(
ret
>=
0
)
?
(
ssize_t
)(
ret
+
copy
)
:
((
copy
>
0
)
?
(
ssize_t
)
copy
:
ret
);
:
((
copy
>
0
)
?
(
ssize_t
)
copy
:
ret
);
}
}
...
@@ -387,7 +414,7 @@ ssize_t stream_Peek(stream_t *s, const uint8_t **restrict bufp, size_t len)
...
@@ -387,7 +414,7 @@ ssize_t stream_Peek(stream_t *s, const uint8_t **restrict bufp, size_t len)
return
0
;
return
0
;
}
}
ssize_t
ret
=
s
->
pf_read
(
s
,
peek
->
p_buffer
,
len
);
ssize_t
ret
=
s
tream_ReadRaw
(
s
,
peek
->
p_buffer
,
len
);
if
(
ret
<
0
)
if
(
ret
<
0
)
{
{
block_Release
(
peek
);
block_Release
(
peek
);
...
@@ -412,7 +439,7 @@ ssize_t stream_Peek(stream_t *s, const uint8_t **restrict bufp, size_t len)
...
@@ -412,7 +439,7 @@ ssize_t stream_Peek(stream_t *s, const uint8_t **restrict bufp, size_t len)
}
}
peek
->
i_buffer
=
avail
;
peek
->
i_buffer
=
avail
;
ssize_t
ret
=
s
->
pf_read
(
s
,
peek
->
p_buffer
+
avail
,
len
-
avail
);
ssize_t
ret
=
s
tream_ReadRaw
(
s
,
peek
->
p_buffer
+
avail
,
len
-
avail
);
*
bufp
=
peek
->
p_buffer
;
*
bufp
=
peek
->
p_buffer
;
if
(
ret
>=
0
)
if
(
ret
>=
0
)
peek
->
i_buffer
+=
ret
;
peek
->
i_buffer
+=
ret
;
...
...
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