diff options
| author | Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> | 2015-02-13 22:51:33 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-02-21 23:37:42 +0200 |
| commit | 5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a (patch) | |
| tree | ff6b7712c530ca61f4e64ba783fe85f97a034465 | |
| parent | 5e5583efe41662294c5e1b76499ba338557f808d (diff) | |
| download | ffmpeg-5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a.tar.gz | |
mpegaudio_parser: add MP3 ADU headers parser
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/mpegaudio_parser.c | 13 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodecheader.c | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 58ea452773..84c20d882f 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -63,6 +63,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1, }else{ while(i<buf_size){ int ret, sr, channels, bit_rate, frame_size; + enum AVCodecID codec_id = avctx->codec_id; state= (state<<8) + buf[i++]; @@ -86,6 +87,16 @@ static int mpegaudio_parse(AVCodecParserContext *s1, avctx->bit_rate += (bit_rate - avctx->bit_rate) / s->header_count; } } + + if (s1->flags & PARSER_FLAG_COMPLETE_FRAMES) { + s->frame_size = 0; + next = buf_size; + } else if (codec_id == AV_CODEC_ID_MP3ADU) { + avpriv_report_missing_feature(avctx, + "MP3ADU full parser"); + return AVERROR_PATCHWELCOME; + } + break; } } @@ -106,7 +117,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1, AVCodecParser ff_mpegaudio_parser = { - .codec_ids = { AV_CODEC_ID_MP1, AV_CODEC_ID_MP2, AV_CODEC_ID_MP3 }, + .codec_ids = { AV_CODEC_ID_MP1, AV_CODEC_ID_MP2, AV_CODEC_ID_MP3, AV_CODEC_ID_MP3ADU }, .priv_data_size = sizeof(MpegAudioParseContext), .parser_parse = mpegaudio_parse, .parser_close = ff_parse_close, diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c index 25e73195b8..8efcbe4dab 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -134,7 +134,8 @@ int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_r break; default: case 3: - avctx->codec_id = AV_CODEC_ID_MP3; + if (avctx->codec_id != AV_CODEC_ID_MP3ADU) + avctx->codec_id = AV_CODEC_ID_MP3; if (s->lsf) *frame_size = 576; else diff --git a/libavcodec/version.h b/libavcodec/version.h index ca9d1bca8f..4890f46ce6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 15 +#define LIBAVCODEC_VERSION_MINOR 16 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |