videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

libavformat/subfile: Improve AVSEEK_SIZE/SEEK_END seeking 

The subfile protocol treats an end of 0 as meaning "until EOF"; this got
implemented by simply setting the end to INT64_MAX. But seeking relative
to EOF or AVSEEK_SIZE seeking hasn't been adapted; the result is that
e.g. the duration of transport streams isn't correctly determined when
this option is used. This is fixed in this patch.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-06-20 06:33:41 +02:00 committed by Nicolas George
parent e51cc7ed85
commit 4877b5869e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/subfile.c
View File

@ -116,11 +116,17 @@ static int subfile_read(URLContext *h, unsigned char *buf, int size)
static int64_t subfile_seek(URLContext *h, int64_t pos, int whence)
{
SubfileContext *c = h->priv_data;
int64_t new_pos = -1;
int64_t new_pos = -1, end;
int ret;
if (whence == AVSEEK_SIZE || whence == SEEK_END) {
end = c->end;
if (end == INT64_MAX && (end = ffurl_seek(c->h, 0, AVSEEK_SIZE)) < 0)
return end;
}
if (whence == AVSEEK_SIZE)
return c->end - c->start;
return end - c->start;
switch (whence) {
case SEEK_SET:
new_pos = c->start + pos;
@ -129,7 +135,7 @@ static int64_t subfile_seek(URLContext *h, int64_t pos, int whence)
new_pos += pos;
break;
case SEEK_END:
new_pos = c->end + c->pos;
new_pos = end + c->pos;
break;
}
if (new_pos < c->start)