The previous approach was just wrong.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
typedef struct TAKDemuxContext {
int mlast_frame;
typedef struct TAKDemuxContext {
int mlast_frame;
} TAKDemuxContext;
static int tak_probe(AVProbeData *p)
} TAKDemuxContext;
static int tak_probe(AVProbeData *p)
av_log(s, AV_LOG_VERBOSE, "\n");
break;
}
av_log(s, AV_LOG_VERBOSE, "\n");
break;
}
- case TAK_METADATA_END:
- if (pb->seekable) {
- int64_t curpos = avio_tell(pb);
+ case TAK_METADATA_END: {
+ int64_t curpos = avio_tell(pb);
ff_ape_parse_tag(s);
avio_seek(pb, curpos, SEEK_SET);
}
ff_ape_parse_tag(s);
avio_seek(pb, curpos, SEEK_SET);
}
+
+ tc->data_end += curpos;
default:
ret = avio_skip(pb, size);
if (ret < 0)
default:
ret = avio_skip(pb, size);
if (ret < 0)
if (size != 11)
return AVERROR_INVALIDDATA;
tc->mlast_frame = 1;
if (size != 11)
return AVERROR_INVALIDDATA;
tc->mlast_frame = 1;
- tc->left = get_bits_longlong(&gb, TAK_LAST_FRAME_POS_BITS) +
- get_bits(&gb, TAK_LAST_FRAME_SIZE_BITS);
+ tc->data_end = get_bits_longlong(&gb, TAK_LAST_FRAME_POS_BITS) +
+ get_bits(&gb, TAK_LAST_FRAME_SIZE_BITS);
av_freep(&buffer);
} else if (type == TAK_METADATA_ENCODER) {
av_log(s, AV_LOG_VERBOSE, "encoder version: %0X\n",
av_freep(&buffer);
} else if (type == TAK_METADATA_ENCODER) {
av_log(s, AV_LOG_VERBOSE, "encoder version: %0X\n",
if (tc->mlast_frame) {
AVIOContext *pb = s->pb;
if (tc->mlast_frame) {
AVIOContext *pb = s->pb;
- size = FFMIN(tc->left, 1024);
- if (!size)
+ left = tc->data_end - avio_tell(s->pb);
+ size = FFMIN(left, 1024);
+ if (size <= 0)
return AVERROR_EOF;
ret = av_get_packet(pb, pkt, size);
return AVERROR_EOF;
ret = av_get_packet(pb, pkt, size);
return ret;
pkt->stream_index = 0;
return ret;
pkt->stream_index = 0;
} else {
ret = ff_raw_read_partial_packet(s, pkt);
}
} else {
ret = ff_raw_read_partial_packet(s, pkt);
}