#include "raw.h"
#include "id3v2.h"
#include "oggdec.h"
+#include "vorbiscomment.h"
static int flac_read_header(AVFormatContext *s,
AVFormatParameters *ap)
AVStream *st = av_new_stream(s, 0);
if (!st)
return AVERROR(ENOMEM);
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_FLAC;
st->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */
/* skip ID3v2 header if found */
ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
- if (ret == ID3v2_HEADER_SIZE && ff_id3v2_match(buf)) {
+ if (ret == ID3v2_HEADER_SIZE && ff_id3v2_match(buf, ID3v2_DEFAULT_MAGIC)) {
int len = ff_id3v2_tag_len(buf);
url_fseek(s->pb, len - ID3v2_HEADER_SIZE, SEEK_CUR);
} else {
}
/* if fLaC marker is not found, assume there is no header */
- if (get_le32(s->pb) != MKTAG('f','L','a','C'))
+ if (get_le32(s->pb) != MKTAG('f','L','a','C')) {
+ url_fseek(s->pb, -4, SEEK_CUR);
return 0;
+ }
/* process metadata blocks */
while (!url_feof(s->pb) && !metadata_last) {
case FLAC_METADATA_TYPE_VORBIS_COMMENT:
buffer = av_mallocz(metadata_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!buffer) {
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
}
if (get_buffer(s->pb, buffer, metadata_size) != metadata_size) {
av_freep(&buffer);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
break;
/* skip metadata block for unsupported types */
}
/* process supported blocks other than STREAMINFO */
if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
- if (vorbis_comment(s, buffer, metadata_size)) {
+ if (ff_vorbis_comment(s, &s->metadata, buffer, metadata_size)) {
av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n");
}
}
uint8_t *bufptr = p->buf;
uint8_t *end = p->buf + p->buf_size;
- if(ff_id3v2_match(bufptr))
+ if(ff_id3v2_match(bufptr, ID3v2_DEFAULT_MAGIC))
bufptr += ff_id3v2_tag_len(bufptr);
if(bufptr > end-4 || memcmp(bufptr, "fLaC", 4)) return 0;
.flags= AVFMT_GENERIC_INDEX,
.extensions = "flac",
.value = CODEC_ID_FLAC,
+ .metadata_conv = ff_vorbiscomment_metadata_conv,
};