generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oggdec: Metadata is per-stream; don't merge multiple streams' together

Browse Source 
Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-03-12 05:16:44 +00:00
parent e4d2d8c5d7
commit b53cde48bd
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/flacdec.c
View File

@ -113,7 +113,7 @@ static int flac_read_header(AVFormatContext *s,
}
/* process supported blocks other than STREAMINFO */
if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
if (ff_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");
}
}

2
libavformat/oggdec.h
View File

@ -115,7 +115,7 @@ extern const struct ogg_codec ff_vorbis_codec;
extern const AVMetadataConv ff_vorbiscomment_metadata_conv[];
int ff_vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
int ff_vorbis_comment(AVFormatContext *ms, AVMetadata **m, uint8_t *buf, int size);
static inline int
ogg_find_stream (struct ogg * ogg, int serial)

2
libavformat/oggparseflac.c
View File

@ -68,7 +68,7 @@ flac_header (AVFormatContext * s, int idx)
st->time_base.num = 1;
st->time_base.den = st->codec->sample_rate;
} else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
ff_vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4);
}
return 1;

2
libavformat/oggparsespeex.c
View File

@ -75,7 +75,7 @@ static int speex_header(AVFormatContext *s, int idx) {
st->time_base.num = 1;
st->time_base.den = st->codec->sample_rate;
} else
ff_vorbis_comment(s, p, os->psize);
ff_vorbis_comment(s, &st->metadata, p, os->psize);
spxp->seq++;
return 1;

2
libavformat/oggparsetheora.c
View File

@ -109,7 +109,7 @@ theora_header (AVFormatContext * s, int idx)
st->need_parsing = AVSTREAM_PARSE_HEADERS;
} else if (os->buf[os->pstart] == 0x83) {
ff_vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 7, os->psize - 8);
}
st->codec->extradata = av_realloc (st->codec->extradata,

6
libavformat/oggparsevorbis.c
View File

@ -42,7 +42,7 @@ const AVMetadataConv ff_vorbiscomment_metadata_conv[] = {
};
int
ff_vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
ff_vorbis_comment(AVFormatContext * as, AVMetadata **m, uint8_t *buf, int size)
{
const uint8_t *p = buf;
const uint8_t *end = buf + size;
@ -101,7 +101,7 @@ ff_vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
memcpy(ct, v, vl);
ct[vl] = 0;
av_metadata_set2(&as->metadata, tt, ct,
av_metadata_set2(m, tt, ct,
AV_METADATA_DONT_STRDUP_KEY |
AV_METADATA_DONT_STRDUP_VAL);
}
@ -220,7 +220,7 @@ vorbis_header (AVFormatContext * s, int idx)
st->time_base.den = st->codec->sample_rate;
} else if (os->buf[os->pstart] == 3) {
if (os->psize > 8)
ff_vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 7, os->psize - 8);
} else {
st->codec->extradata_size =
fixup_vorbis_headers(s, priv, &st->codec->extradata);