Not having the header for a codec is a tell-tale of a broken file.
s->data_offset = FFMIN(s->data_offset, cur_os->sync_pos);
}
}else{
+ os->nb_header++;
os->pstart += os->psize;
os->psize = 0;
}
static int ogg_get_headers(AVFormatContext *s)
{
struct ogg *ogg = s->priv_data;
- int ret;
+ int ret, i;
do{
ret = ogg_packet(s, NULL, NULL, NULL, NULL);
return ret;
}while (!ogg->headers);
+ for (i = 0; i < ogg->nstreams; i++) {
+ struct ogg_stream *os = ogg->streams + i;
+
+ if (os->codec && os->codec->nb_header &&
+ os->nb_header < os->codec->nb_header) {
+ av_log(s, AV_LOG_ERROR,
+ "Headers mismatch for stream %d\n", i);
+ return AVERROR_INVALIDDATA;
+ }
+ }
av_dlog(s, "found headers\n");
return 0;
* 0 if granule is the end time of the associated packet.
*/
int granule_is_start;
+ /**
+ * Number of expected headers
+ */
+ int nb_header;
};
struct ogg_stream {
int incomplete; ///< whether we're expecting a continuation in the next page
int page_end; ///< current packet is the last one completed in the page
int keyframe_seek;
+ int nb_header; ///< set to the number of parsed headers
void *private;
};
.magic = "CELT ",
.magicsize = 8,
.header = celt_header,
+ .nb_header = 2,
};
.header = dirac_header,
.gptopts = dirac_gptopts,
.granule_is_start = 1,
+ .nb_header = 1,
};
const struct ogg_codec ff_old_dirac_codec = {
.header = old_dirac_header,
.gptopts = old_dirac_gptopts,
.granule_is_start = 1,
+ .nb_header = 1,
};
const struct ogg_codec ff_flac_codec = {
.magic = "\177FLAC",
.magicsize = 5,
- .header = flac_header
+ .header = flac_header,
+ .nb_header = 2,
};
const struct ogg_codec ff_old_flac_codec = {
.magic = "fLaC",
.magicsize = 4,
- .header = old_flac_header
+ .header = old_flac_header,
+ .nb_header = 0,
};
.header = ogm_header,
.packet = ogm_packet,
.granule_is_start = 1,
+ .nb_header = 2,
};
const struct ogg_codec ff_ogm_audio_codec = {
.header = ogm_header,
.packet = ogm_packet,
.granule_is_start = 1,
+ .nb_header = 2,
};
const struct ogg_codec ff_ogm_text_codec = {
.header = ogm_header,
.packet = ogm_packet,
.granule_is_start = 1,
+ .nb_header = 2,
};
const struct ogg_codec ff_ogm_old_codec = {
.header = ogm_dshow_header,
.packet = ogm_packet,
.granule_is_start = 1,
+ .nb_header = 1,
};
.magic = "fishead",
.magicsize = 8,
.header = skeleton_header,
+ .nb_header = 0,
};
.magic = "Speex ",
.magicsize = 8,
.header = speex_header,
- .packet = speex_packet
+ .packet = speex_packet,
+ .nb_header = 2,
};
.magic = "\200theora",
.magicsize = 7,
.header = theora_header,
- .gptopts = theora_gptopts
+ .gptopts = theora_gptopts,
+ .nb_header = 3,
};
.magicsize = 7,
.header = vorbis_header,
.packet = vorbis_packet,
+ .nb_header = 3,
};