[vlc-commits] cache_read: add error log
Thomas Guillem
git at videolan.org
Thu Oct 22 11:01:31 CEST 2015
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Oct 21 12:02:48 2015 +0200| [c47c2f60a3e9142879de9157f4b57e9f9d764a80] | committer: Thomas Guillem
cache_read: add error log
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c47c2f60a3e9142879de9157f4b57e9f9d764a80
---
modules/stream_filter/cache_read.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/modules/stream_filter/cache_read.c b/modules/stream_filter/cache_read.c
index 5a32433..7baaed7 100644
--- a/modules/stream_filter/cache_read.c
+++ b/modules/stream_filter/cache_read.c
@@ -259,7 +259,7 @@ static ssize_t AStreamReadNoSeekStream(stream_t *s, void *buf, size_t len)
#ifdef STREAM_DEBUG
msg_Dbg(s, "AStreamReadStream: %zd pos=%"PRId64" tk=%d start=%"PRId64
- " offset=%d end=%"PRId64, len, sys->i_pos, p_sys->i_tk,
+ " offset=%d end=%"PRId64, len, sys->i_pos, sys->i_tk,
tk->i_start, sys->i_offset, tk->i_end);
#endif
@@ -393,7 +393,10 @@ static int AStreamSeekStream(stream_t *s, uint64_t i_pos)
* TODO it is stupid to seek now, it would be better to delay it
*/
if (stream_Seek(s->p_source, tk->i_end))
+ {
+ msg_Err(s, "AStreamSeekStream: hard seek failed");
return VLC_EGENERIC;
+ }
}
else if (i_pos > tk->i_end)
{
@@ -403,7 +406,10 @@ static int AStreamSeekStream(stream_t *s, uint64_t i_pos)
const int i_read_max = __MIN(10 * STREAM_READ_ATONCE, i_skip);
int i_read = 0;
if ((i_read = AStreamReadNoSeekStream(s, NULL, i_read_max)) <= 0)
+ {
+ msg_Err(s, "AStreamSeekStream: skip failed");
return VLC_EGENERIC;
+ }
i_skip -= i_read_max;
}
}
@@ -415,7 +421,10 @@ static int AStreamSeekStream(stream_t *s, uint64_t i_pos)
#endif
/* Nothing good, seek and choose oldest segment */
if (stream_Seek(s->p_source, i_pos))
+ {
+ msg_Err(s, "AStreamSeekStream: hard seek failed");
return VLC_EGENERIC;
+ }
tk->i_start = i_pos;
tk->i_end = i_pos;
More information about the vlc-commits
mailing list