char str_val[256];
int64_t *times = NULL;
int64_t *filepositions = NULL;
- int ret = 0;
+ int ret = AVERROR(ENOSYS);
+ int64_t initial_pos = avio_tell(ioc);
while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) {
int64_t* current_array;
num_val = av_int2dbl(avio_rb64(ioc));
current_array[i] = num_val;
}
+ if (times && filepositions) {
+ // All done, exiting at a position allowing amf_parse_object
+ // to finish parsing the object
+ ret = 0;
+ break;
+ }
}
if (timeslen == fileposlen)
finish:
av_freep(×);
av_freep(&filepositions);
- avio_seek(ioc, max_pos, SEEK_SET);
+ // If we got unexpected data, but successfully reset back to
+ // the start pos, the caller can continue parsing
+ if (ret < 0 && avio_seek(ioc, initial_pos, SEEK_SET) > 0)
+ return 0;
return ret;
}
case AMF_DATA_TYPE_OBJECT: {
unsigned int keylen;
- if (!strcmp(KEYFRAMES_TAG, key) && depth == 1)
+ if (key && !strcmp(KEYFRAMES_TAG, key) && depth == 1)
if (parse_keyframes_index(s, ioc, vstream, max_pos) < 0)
return -1;
}
// if not streamed and no duration from metadata then seek to end to find the duration from the timestamps
- if(!url_is_streamed(s->pb) && (!s->duration || s->duration==AV_NOPTS_VALUE)){
+ if(s->pb->seekable && (!s->duration || s->duration==AV_NOPTS_VALUE)){
int size;
const int64_t pos= avio_tell(s->pb);
const int64_t fsize= avio_size(s->pb);
static int flv_read_seek(AVFormatContext *s, int stream_index,
int64_t ts, int flags)
{
- return ffio_read_seek(s->pb, stream_index, ts, flags);
+ return avio_seek_time(s->pb, stream_index, ts, flags);
}
#if 0 /* don't know enough to implement this */
if (ts - min_ts > (uint64_t)(max_ts - ts)) flags |= AVSEEK_FLAG_BACKWARD;
- if (url_is_streamed(s->pb)) {
+ if (!s->pb->seekable) {
if (stream_index < 0) {
stream_index = av_find_default_stream_index(s);
if (stream_index < 0)
ts = av_rescale_rnd(ts, 1000, AV_TIME_BASE,
flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
}
- ret = ffio_read_seek(s->pb, stream_index, ts, flags);
+ ret = avio_seek_time(s->pb, stream_index, ts, flags);
}
if (ret == AVERROR(ENOSYS))