aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-05-26 12:48:56 +0200
committerAnton Khirnov <anton@khirnov.net>2014-05-28 07:50:32 +0200
commit23f741f79327e31be7b2a75ebb2e02111e06e52f (patch)
tree7b8620d9fe6c673a180f547f461eb6d3fa4cf517
parent4efdadc8ec50332c812e8a95e8c67f5a260e7cb0 (diff)
downloadffmpeg-23f741f79327e31be7b2a75ebb2e02111e06e52f.tar.gz
matroskadec: parse the channel layout mask for FLAC
It is commonly stored in a vorbiscomment block in codec private data.
-rw-r--r--libavformat/Makefile3
-rw-r--r--libavformat/flacdec.c2
-rw-r--r--libavformat/matroskadec.c38
-rw-r--r--libavformat/oggdec.h3
-rw-r--r--libavformat/oggparsecelt.c2
-rw-r--r--libavformat/oggparseflac.c2
-rw-r--r--libavformat/oggparseogm.c2
-rw-r--r--libavformat/oggparseopus.c2
-rw-r--r--libavformat/oggparsespeex.c2
-rw-r--r--libavformat/oggparsetheora.c2
-rw-r--r--libavformat/oggparsevorbis.c7
11 files changed, 53 insertions, 12 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ae3bcbdd84..39cfafa5d3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -166,7 +166,8 @@ OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o
OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o
OBJS-$(CONFIG_M4V_MUXER) += rawenc.o
OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \
- isom.o rmsipr.o
+ isom.o rmsipr.o \
+ oggparsevorbis.o vorbiscomment.o
OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \
isom.o avc.o hevc.o \
flacenc_header.o avlanguage.o wv.o
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index ee40a204fe..05286c71cd 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -141,7 +141,7 @@ static int flac_read_header(AVFormatContext *s)
if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
AVDictionaryEntry *chmask;
- if (ff_vorbis_comment(s, &s->metadata, buffer, metadata_size)) {
+ if (ff_vorbis_comment(s, &s->metadata, buffer, metadata_size, 1)) {
av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n");
}
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 2056391525..e376baeac2 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -55,6 +55,7 @@
#include "internal.h"
#include "isom.h"
#include "matroska.h"
+#include "oggdec.h"
/* For ff_codec_get_id(). */
#include "riff.h"
#include "rmsipr.h"
@@ -1443,6 +1444,7 @@ static int matroska_parse_flac(AVFormatContext *s,
MatroskaTrack *track,
int *offset)
{
+ AVStream *st = track->stream;
uint8_t *p = track->codec_priv.data;
int size = track->codec_priv.size;
@@ -1454,6 +1456,42 @@ static int matroska_parse_flac(AVFormatContext *s,
*offset = 8;
track->codec_priv.size = 8 + FLAC_STREAMINFO_SIZE;
+ p += track->codec_priv.size;
+ size -= track->codec_priv.size;
+
+ /* parse the remaining metadata blocks if present */
+ while (size >= 4) {
+ int block_last, block_type, block_size;
+
+ flac_parse_block_header(p, &block_last, &block_type, &block_size);
+
+ p += 4;
+ size -= 4;
+ if (block_size > size)
+ return 0;
+
+ /* check for the channel mask */
+ if (block_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
+ AVDictionary *dict = NULL;
+ AVDictionaryEntry *chmask;
+
+ ff_vorbis_comment(s, &dict, p, block_size, 0);
+ chmask = av_dict_get(dict, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", NULL, 0);
+ if (chmask) {
+ uint64_t mask = strtol(chmask->value, NULL, 0);
+ if (!mask || mask & ~0x3ffffULL) {
+ av_log(s, AV_LOG_WARNING,
+ "Invalid value of WAVEFORMATEXTENSIBLE_CHANNEL_MASK\n");
+ } else
+ st->codec->channel_layout = mask;
+ }
+ av_dict_free(&dict);
+ }
+
+ p += block_size;
+ size -= block_size;
+ }
+
return 0;
}
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 918378d2ea..893c3306c7 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -122,7 +122,8 @@ extern const struct ogg_codec ff_speex_codec;
extern const struct ogg_codec ff_theora_codec;
extern const struct ogg_codec ff_vorbis_codec;
-int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, const uint8_t *buf, int size);
+int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m,
+ const uint8_t *buf, int size, int parse_picture);
static inline int
ogg_find_stream (struct ogg * ogg, int serial)
diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
index 0deccc2d08..e3ea586e9c 100644
--- a/libavformat/oggparsecelt.c
+++ b/libavformat/oggparsecelt.c
@@ -81,7 +81,7 @@ static int celt_header(AVFormatContext *s, int idx)
} else if (priv && priv->extra_headers_left) {
/* Extra headers (vorbiscomment) */
- ff_vorbis_comment(s, &st->metadata, p, os->psize);
+ ff_vorbis_comment(s, &st->metadata, p, os->psize, 1);
priv->extra_headers_left--;
return 1;
} else {
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index f59b4008dc..7808aad80c 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -69,7 +69,7 @@ flac_header (AVFormatContext * s, int idx)
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
} else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
- ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4);
+ ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4, 1);
}
return 1;
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 23136257bf..74d9e1054d 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -97,7 +97,7 @@ ogm_header(AVFormatContext *s, int idx)
} else if (bytestream2_peek_byte(&p) == 3) {
bytestream2_skip(&p, 7);
if (bytestream2_get_bytes_left(&p) > 1)
- ff_vorbis_comment(s, &st->metadata, p.buffer, bytestream2_get_bytes_left(&p) - 1);
+ ff_vorbis_comment(s, &st->metadata, p.buffer, bytestream2_get_bytes_left(&p) - 1, 1);
}
return 1;
diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c
index babd0f0fa6..cfdf35d2b8 100644
--- a/libavformat/oggparseopus.c
+++ b/libavformat/oggparseopus.c
@@ -74,7 +74,7 @@ static int opus_header(AVFormatContext *avf, int idx)
if (priv->need_comments) {
if (os->psize < 8 || memcmp(packet, "OpusTags", 8))
return AVERROR_INVALIDDATA;
- ff_vorbis_comment(avf, &st->metadata, packet + 8, os->psize - 8);
+ ff_vorbis_comment(avf, &st->metadata, packet + 8, os->psize - 8, 1);
priv->need_comments--;
return 1;
}
diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index 42480a3a27..6d70e99f26 100644
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -79,7 +79,7 @@ static int speex_header(AVFormatContext *s, int idx) {
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
} else
- ff_vorbis_comment(s, &st->metadata, p, os->psize);
+ ff_vorbis_comment(s, &st->metadata, p, os->psize, 1);
spxp->seq++;
return 1;
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index 035bdc24e2..8a5e1d8351 100644
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -116,7 +116,7 @@ static int theora_header(AVFormatContext *s, int idx)
}
break;
case 0x81:
- ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 7);
+ ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 7, 1);
case 0x82:
if (!thp->version)
return AVERROR_INVALIDDATA;
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 3eac0ba083..58cb4a67fc 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -72,7 +72,8 @@ static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)
}
int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,
- const uint8_t *buf, int size)
+ const uint8_t *buf, int size,
+ int parse_picture)
{
const uint8_t *p = buf;
const uint8_t *end = buf + size;
@@ -137,7 +138,7 @@ int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,
* 'METADATA_BLOCK_PICTURE'. This is the preferred and
* recommended way of embedding cover art within VorbisComments."
*/
- if (!strcmp(tt, "METADATA_BLOCK_PICTURE")) {
+ if (!strcmp(tt, "METADATA_BLOCK_PICTURE") && parse_picture) {
int ret;
char *pict = av_malloc(vl);
@@ -305,7 +306,7 @@ static int vorbis_header(AVFormatContext *s, int idx)
} else if (os->buf[os->pstart] == 3) {
if (os->psize > 8 &&
ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7,
- os->psize - 8) >= 0) {
+ os->psize - 8, 1) >= 0) {
unsigned new_len;
int ret = ff_replaygain_export(st, st->metadata);