X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foggparsevorbis.c;h=6222962019912db9316505aa28aaabf32b1579bf;hb=2d4970d88dd507de1595b8ee3b65cc5da73af5ea;hp=0c765e2b83b0193ec2386ef8bbba77e2a115e330;hpb=9146ca3700a83c267b0f505a38c26b69992beb7d;p=ffmpeg diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 0c765e2b83b..62229620199 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -23,51 +23,59 @@ **/ #include +#include "libavutil/avstring.h" +#include "libavutil/bswap.h" +#include "libavcodec/get_bits.h" +#include "libavcodec/bytestream.h" #include "avformat.h" -#include "bitstream.h" -#include "bswap.h" -#include "ogg2.h" +#include "oggdec.h" -extern int -vorbis_comment (AVFormatContext * as, char *buf, int size) +/** + * VorbisComment metadata conversion mapping. + * from Ogg Vorbis I format specification: comment field and header specification + * http://xiph.org/vorbis/doc/v-comment.html + */ +const AVMetadataConv ff_vorbiscomment_metadata_conv[] = { + { "ARTIST" , "author" }, + { "DATE" , "year" }, + { "TRACKNUMBER", "track" }, + { 0 } +}; + +int +vorbis_comment(AVFormatContext * as, uint8_t *buf, int size) { - char *p = buf; - int s, n, j; + const uint8_t *p = buf; + const uint8_t *end = buf + size; + unsigned n, j; + int s; - if (size < 4) + if (size < 8) /* must have vendor_length and user_comment_list_length */ return -1; - s = le2me_32 (unaligned32 (p)); - p += 4; - size -= 4; + s = bytestream_get_le32(&p); - if (size < s + 4) + if (end - p - 4 < s || s < 0) return -1; p += s; - size -= s; - n = le2me_32 (unaligned32 (p)); - p += 4; - size -= 4; + n = bytestream_get_le32(&p); - while (size >= 4){ - char *t, *v; + while (end - p >= 4 && n > 0) { + const char *t, *v; int tl, vl; - s = le2me_32 (unaligned32 (p)); - p += 4; - size -= 4; + s = bytestream_get_le32(&p); - if (size < s) + if (end - p < s || s < 0) break; t = p; p += s; - size -= s; n--; - v = memchr (t, '=', s); + v = memchr(t, '=', s); if (!v) continue; @@ -75,39 +83,36 @@ vorbis_comment (AVFormatContext * as, char *buf, int size) vl = s - tl - 1; v++; - if (tl && vl){ - char tt[tl + 1]; - char ct[vl + 1]; + if (tl && vl) { + char *tt, *ct; + + tt = av_malloc(tl + 1); + ct = av_malloc(vl + 1); + if (!tt || !ct) { + av_freep(&tt); + av_freep(&ct); + av_log(as, AV_LOG_WARNING, "out-of-memory error. skipping VorbisComment tag.\n"); + continue; + } for (j = 0; j < tl; j++) - tt[j] = toupper (t[j]); + tt[j] = toupper(t[j]); tt[tl] = 0; - memcpy (ct, v, vl); + memcpy(ct, v, vl); ct[vl] = 0; - // took from Vorbis_I_spec - if (!strcmp (tt, "AUTHOR")) - strncpy (as->author, ct, FFMIN(sizeof (as->author), vl)); - else if (!strcmp (tt, "TITLE")) - strncpy (as->title, ct, FFMIN(sizeof (as->title), vl)); - else if (!strcmp (tt, "COPYRIGHT")) - strncpy (as->copyright, ct, FFMIN(sizeof (as->copyright), vl)); - else if (!strcmp (tt, "DESCRIPTION")) - strncpy (as->comment, ct, FFMIN(sizeof (as->comment), vl)); - else if (!strcmp (tt, "GENRE")) - strncpy (as->genre, ct, FFMIN(sizeof (as->genre), vl)); - else if (!strcmp (tt, "TRACKNUMBER")) - as->track = atoi (ct); - //Too bored to add others for today + av_metadata_set2(&as->metadata, tt, ct, + AV_METADATA_DONT_STRDUP_KEY | + AV_METADATA_DONT_STRDUP_VAL); } } - if (size > 0) - av_log (as, AV_LOG_INFO, "%i bytes of comment header remain\n", size); + if (p != end) + av_log(as, AV_LOG_INFO, "%ti bytes of comment header remain\n", end-p); if (n > 0) - av_log (as, AV_LOG_INFO, - "truncated comment header, %i comments not found\n", n); + av_log(as, AV_LOG_INFO, + "truncated comment header, %i comments not found\n", n); return 0; } @@ -117,7 +122,7 @@ vorbis_comment (AVFormatContext * as, char *buf, int size) * Vorbis Identification header from Vorbis_I_spec.html#vorbis-spec-codec * [vorbis_version] = read 32 bits as unsigned integer | Not used * [audio_channels] = read 8 bit integer as unsigned | Used - * [audio_sample_rate] = read 32 bits as unsigned integer | Used + * [audio_sample_rate] = read 32 bits as unsigned integer | Used * [bitrate_maximum] = read 32 bits as signed integer | Not used yet * [bitrate_nominal] = read 32 bits as signed integer | Not used yet * [bitrate_minimum] = read 32 bits as signed integer | Used as bitrate @@ -126,43 +131,104 @@ vorbis_comment (AVFormatContext * as, char *buf, int size) * [framing_flag] = read one bit | Not Used * */ +struct oggvorbis_private { + unsigned int len[3]; + unsigned char *packet[3]; +}; + + +static unsigned int +fixup_vorbis_headers(AVFormatContext * as, struct oggvorbis_private *priv, + uint8_t **buf) +{ + int i,offset, len; + unsigned char *ptr; + + len = priv->len[0] + priv->len[1] + priv->len[2]; + ptr = *buf = av_mallocz(len + len/255 + 64); + + ptr[0] = 2; + offset = 1; + offset += av_xiphlacing(&ptr[offset], priv->len[0]); + offset += av_xiphlacing(&ptr[offset], priv->len[1]); + for (i = 0; i < 3; i++) { + memcpy(&ptr[offset], priv->packet[i], priv->len[i]); + offset += priv->len[i]; + } + *buf = av_realloc(*buf, offset + FF_INPUT_BUFFER_PADDING_SIZE); + return offset; +} + + static int vorbis_header (AVFormatContext * s, int idx) { - ogg_t *ogg = s->priv_data; - ogg_stream_t *os = ogg->streams + idx; + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; AVStream *st = s->streams[idx]; - int cds = st->codec.extradata_size + os->psize + 2; - u_char *cdp; + struct oggvorbis_private *priv; if (os->seq > 2) return 0; - st->codec.extradata = av_realloc (st->codec.extradata, cds); - cdp = st->codec.extradata + st->codec.extradata_size; - *cdp++ = os->psize >> 8; - *cdp++ = os->psize & 0xff; - memcpy (cdp, os->buf + os->pstart, os->psize); - st->codec.extradata_size = cds; + if (os->seq == 0) { + os->private = av_mallocz(sizeof(struct oggvorbis_private)); + if (!os->private) + return 0; + } + if (os->psize < 1) + return -1; + + priv = os->private; + priv->len[os->seq] = os->psize; + priv->packet[os->seq] = av_mallocz(os->psize); + memcpy(priv->packet[os->seq], os->buf + os->pstart, os->psize); if (os->buf[os->pstart] == 1) { - u_char *p = os->buf + os->pstart + 11; //skip up to the audio channels - st->codec.channels = *p++; - st->codec.sample_rate = le2me_32 (unaligned32 (p)); - p += 8; //skip maximum and and nominal bitrate - st->codec.bit_rate = le2me_32 (unaligned32 (p)); //Minimum bitrate + const uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */ + unsigned blocksize, bs0, bs1; + + if (os->psize != 30) + return -1; + + if (bytestream_get_le32(&p) != 0) /* vorbis_version */ + return -1; + + st->codec->channels = bytestream_get_byte(&p); + st->codec->sample_rate = bytestream_get_le32(&p); + p += 4; // skip maximum bitrate + st->codec->bit_rate = bytestream_get_le32(&p); // nominal bitrate + p += 4; // skip minimum bitrate + + blocksize = bytestream_get_byte(&p); + bs0 = blocksize & 15; + bs1 = blocksize >> 4; + + if (bs0 > bs1) + return -1; + if (bs0 < 6 || bs1 > 13) + return -1; + + if (bytestream_get_byte(&p) != 1) /* framing_flag */ + return -1; - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_id = CODEC_ID_VORBIS; + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_VORBIS; + st->time_base.num = 1; + st->time_base.den = st->codec->sample_rate; } else if (os->buf[os->pstart] == 3) { - vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8); + if (os->psize > 8) + vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8); + } else { + st->codec->extradata_size = + fixup_vorbis_headers(s, priv, &st->codec->extradata); } return os->seq < 3; } -ogg_codec_t vorbis_codec = { +const struct ogg_codec ff_vorbis_codec = { .magic = "\001vorbis", .magicsize = 7, .header = vorbis_header