#define SEEKPOINT_SIZE 18
typedef struct FLACDecContext {
+ AVClass *class;
+ int raw_packet_size;
int found_seektable;
} FLACDecContext;
{
/* the real seek index offset should be the size of metadata blocks with the offset in the frame blocks */
int i;
- for(i=0; i<st->nb_index_entries; i++) {
- st->index_entries[i].pos += metadata_head_size;
+ for(i=0; i<st->internal->nb_index_entries; i++) {
+ st->internal->index_entries[i].pos += metadata_head_size;
}
}
}
av_freep(&buffer);
} else if (metadata_type == FLAC_METADATA_TYPE_PICTURE) {
- ret = ff_flac_parse_picture(s, buffer, metadata_size);
+ ret = ff_flac_parse_picture(s, buffer, metadata_size, 1);
av_freep(&buffer);
if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Error parsing attached picture.\n");
return ret;
}
-static int raw_flac_probe(AVProbeData *p)
+static int raw_flac_probe(const AVProbeData *p)
{
if ((p->buf[2] & 0xF0) == 0) // blocksize code invalid
return 0;
return AVPROBE_SCORE_EXTENSION / 4 + 1;
}
-static int flac_probe(AVProbeData *p)
+static int flac_probe(const AVProbeData *p)
{
if ((AV_RB16(p->buf) & 0xFFFE) == 0xFFF8)
return raw_flac_probe(p);
static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_index,
int64_t *ppos, int64_t pos_limit)
{
- AVPacket pkt, out_pkt;
+ AVPacket *pkt = s->internal->parse_pkt;
AVStream *st = s->streams[stream_index];
AVCodecParserContext *parser;
int ret;
if (avio_seek(s->pb, *ppos, SEEK_SET) < 0)
return AV_NOPTS_VALUE;
- av_init_packet(&pkt);
parser = av_parser_init(st->codecpar->codec_id);
if (!parser){
return AV_NOPTS_VALUE;
parser->flags |= PARSER_FLAG_USE_CODEC_TS;
for (;;){
- ret = ff_raw_read_partial_packet(s, &pkt);
+ uint8_t *data;
+ int size;
+
+ ret = ff_raw_read_partial_packet(s, pkt);
if (ret < 0){
if (ret == AVERROR(EAGAIN))
continue;
else {
- av_packet_unref(&pkt);
- av_assert1(!pkt.size);
+ av_packet_unref(pkt);
+ av_assert1(!pkt->size);
}
}
- av_init_packet(&out_pkt);
av_parser_parse2(parser, st->internal->avctx,
- &out_pkt.data, &out_pkt.size, pkt.data, pkt.size,
- pkt.pts, pkt.dts, *ppos);
+ &data, &size, pkt->data, pkt->size,
+ pkt->pts, pkt->dts, *ppos);
- av_packet_unref(&pkt);
- if (out_pkt.size){
- int size = out_pkt.size;
+ av_packet_unref(pkt);
+ if (size) {
if (parser->pts != AV_NOPTS_VALUE){
// seeking may not have started from beginning of a frame
// calculate frame start position from next frame backwards
}
index = av_index_search_timestamp(s->streams[0], timestamp, flags);
- if(index<0 || index >= s->streams[0]->nb_index_entries)
+ if(index<0 || index >= s->streams[0]->internal->nb_index_entries)
return -1;
- e = s->streams[0]->index_entries[index];
+ e = s->streams[0]->internal->index_entries[index];
pos = avio_seek(s->pb, e.pos, SEEK_SET);
if (pos >= 0) {
return 0;
return -1;
}
+FF_RAW_DEMUXER_CLASS(flac)
AVInputFormat ff_flac_demuxer = {
.name = "flac",
.long_name = NULL_IF_CONFIG_SMALL("raw FLAC"),
.extensions = "flac",
.raw_codec_id = AV_CODEC_ID_FLAC,
.priv_data_size = sizeof(FLACDecContext),
+ .priv_class = &flac_demuxer_class,
};