#include "libavutil/common.h"
#include "avformat.h"
+#include "internal.h"
#include "gxf.h"
struct gxf_stream_info {
static int get_sindex(AVFormatContext *s, int id, int format) {
int i;
AVStream *st = NULL;
- for (i = 0; i < s->nb_streams; i++) {
- if (s->streams[i]->id == id)
- return i;
- }
+ i = ff_find_stream_index(s, id);
+ if (i >= 0)
+ return i;
st = av_new_stream(s, id);
if (!st)
return AVERROR(ENOMEM);
if (tmp != 1)
goto start;
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) {
- url_fseek(pb, last_pos, SEEK_SET);
+ if (url_fseek(pb, last_pos, SEEK_SET) < 0)
+ goto out;
goto start;
}
get_byte(pb);
cur_timestamp = get_be32(pb);
last_found_pos = url_ftell(pb) - 16 - 6;
if ((track >= 0 && track != cur_track) || (timestamp >= 0 && timestamp > cur_timestamp)) {
- url_fseek(pb, last_pos, SEEK_SET);
- goto start;
+ if (url_fseek(pb, last_pos, SEEK_SET) >= 0)
+ goto start;
}
out:
if (last_found_pos)
}
static int gxf_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) {
+ int res = 0;
uint64_t pos;
uint64_t maxlen = 100 * 1024 * 1024;
AVStream *st = s->streams[0];
if (idx < st->nb_index_entries - 2)
maxlen = st->index_entries[idx + 2].pos - pos;
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);
if (FFABS(found - timestamp) > 4)
return -1;
int64_t *pos, int64_t pos_limit) {
ByteIOContext *pb = s->pb;
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);
*pos = url_ftell(pb);
return res;