Commit b5bc7424 authored by Reimar Döffinger's avatar Reimar Döffinger

Check url_fseek results in gxf demuxer.

Originally committed as revision 24179 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 369b4963
...@@ -397,9 +397,11 @@ start: ...@@ -397,9 +397,11 @@ start:
if (tmp != 1) if (tmp != 1)
goto start; goto start;
last_pos = url_ftell(pb); last_pos = url_ftell(pb);
url_fseek(pb, -5, SEEK_CUR); if (url_fseek(pb, -5, SEEK_CUR) < 0)
goto out;
if (!parse_packet_header(pb, &type, &len) || type != PKT_MEDIA) { if (!parse_packet_header(pb, &type, &len) || type != PKT_MEDIA) {
url_fseek(pb, last_pos, SEEK_SET); if (url_fseek(pb, last_pos, SEEK_SET) < 0)
goto out;
goto start; goto start;
} }
get_byte(pb); get_byte(pb);
...@@ -407,8 +409,8 @@ start: ...@@ -407,8 +409,8 @@ start:
cur_timestamp = get_be32(pb); cur_timestamp = get_be32(pb);
last_found_pos = url_ftell(pb) - 16 - 6; last_found_pos = url_ftell(pb) - 16 - 6;
if ((track >= 0 && track != cur_track) || (timestamp >= 0 && timestamp > cur_timestamp)) { if ((track >= 0 && track != cur_track) || (timestamp >= 0 && timestamp > cur_timestamp)) {
url_fseek(pb, last_pos, SEEK_SET); if (url_fseek(pb, last_pos, SEEK_SET) >= 0)
goto start; goto start;
} }
out: out:
if (last_found_pos) if (last_found_pos)
...@@ -477,6 +479,7 @@ static int gxf_packet(AVFormatContext *s, AVPacket *pkt) { ...@@ -477,6 +479,7 @@ static int gxf_packet(AVFormatContext *s, AVPacket *pkt) {
} }
static int gxf_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { static int gxf_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) {
int res = 0;
uint64_t pos; uint64_t pos;
uint64_t maxlen = 100 * 1024 * 1024; uint64_t maxlen = 100 * 1024 * 1024;
AVStream *st = s->streams[0]; AVStream *st = s->streams[0];
...@@ -492,7 +495,9 @@ static int gxf_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int ...@@ -492,7 +495,9 @@ static int gxf_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int
if (idx < st->nb_index_entries - 2) if (idx < st->nb_index_entries - 2)
maxlen = st->index_entries[idx + 2].pos - pos; maxlen = st->index_entries[idx + 2].pos - pos;
maxlen = FFMAX(maxlen, 200 * 1024); maxlen = FFMAX(maxlen, 200 * 1024);
url_fseek(s->pb, pos, SEEK_SET); res = url_fseek(s->pb, pos, SEEK_SET);
if (res < 0)
return res;
found = gxf_resync_media(s, maxlen, -1, timestamp); found = gxf_resync_media(s, maxlen, -1, timestamp);
if (FFABS(found - timestamp) > 4) if (FFABS(found - timestamp) > 4)
return -1; return -1;
...@@ -503,7 +508,8 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index, ...@@ -503,7 +508,8 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,
int64_t *pos, int64_t pos_limit) { int64_t *pos, int64_t pos_limit) {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
int64_t res; int64_t res;
url_fseek(pb, *pos, SEEK_SET); if (url_fseek(pb, *pos, SEEK_SET) < 0)
return AV_NOPTS_VALUE;
res = gxf_resync_media(s, pos_limit - *pos, -1, -1); res = gxf_resync_media(s, pos_limit - *pos, -1, -1);
*pos = url_ftell(pb); *pos = url_ftell(pb);
return res; return res;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment