From 4efdadc8ec50332c812e8a95e8c67f5a260e7cb0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 25 May 2014 14:05:51 +0200 Subject: matroskadec: export just the STREAMINFO block as FLAC extradata It contains all information that is used by the decoder and the other FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well. --- libavformat/matroskadec.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'libavformat/matroskadec.c') diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 828c191222..2056391525 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -47,6 +47,7 @@ #include "libavutil/mathematics.h" #include "libavcodec/bytestream.h" +#include "libavcodec/flac.h" #include "libavcodec/mpeg4audio.h" #include "avformat.h" @@ -1438,12 +1439,30 @@ static int matroska_aac_sri(int samplerate) return sri; } +static int matroska_parse_flac(AVFormatContext *s, + MatroskaTrack *track, + int *offset) +{ + uint8_t *p = track->codec_priv.data; + int size = track->codec_priv.size; + + if (size < 8 + FLAC_STREAMINFO_SIZE || p[4] & 0x7f) { + av_log(s, AV_LOG_WARNING, "Invalid FLAC private data\n"); + track->codec_priv.size = 0; + return 0; + } + *offset = 8; + track->codec_priv.size = 8 + FLAC_STREAMINFO_SIZE; + + return 0; +} + static int matroska_parse_tracks(AVFormatContext *s) { MatroskaDemuxContext *matroska = s->priv_data; MatroskaTrack *tracks = matroska->tracks.elem; AVStream *st; - int i, j; + int i, j, ret; for (i = 0; i < matroska->tracks.nb_elem; i++) { MatroskaTrack *track = &tracks[i]; @@ -1666,6 +1685,10 @@ static int matroska_parse_tracks(AVFormatContext *s) st->codec->block_align = track->audio.sub_packet_size; extradata_offset = 78; } + } else if (codec_id == AV_CODEC_ID_FLAC && track->codec_priv.size) { + ret = matroska_parse_flac(s, track, &extradata_offset); + if (ret < 0) + return ret; } track->codec_priv.size -= extradata_offset; -- cgit v1.2.3