diff options
| author | Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> | 2015-02-14 00:51:33 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:32:42 +0300 |
| commit | 8ca098f4445cd12d39b2c55b0dfb8c988b7b28ce (patch) | |
| tree | 34afa9f2561cc4a7534ddc2bd66be18ad0ffded7 | |
| parent | b533949813cc8eaa2eb68142b0fa384c231ab6c9 (diff) | |
avcocdec/mpegaudio_parser: add MP3 ADU headers parser
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegaudio_parser.c | 14 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodecheader.c | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 79dbf635b4..42f470685a 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -64,7 +64,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1, }else{ while(i<buf_size){ int ret, sr, channels, bit_rate, frame_size; - enum AVCodecID codec_id; + enum AVCodecID codec_id = avctx->codec_id; state= (state<<8) + buf[i++]; @@ -90,6 +90,16 @@ static int mpegaudio_parse(AVCodecParserContext *s1, avctx->bit_rate += (bit_rate - avctx->bit_rate) / (s->header_count - header_threshold); } } + + if (s1->flags & PARSER_FLAG_COMPLETE_FRAMES) { + s->frame_size = 0; + next = buf_size; + } else if (codec_id == AV_CODEC_ID_MP3ADU) { + av_log(avctx, AV_LOG_ERROR, + "MP3ADU full parser not implemented"); + return AVERROR_PATCHWELCOME; + } + break; } } @@ -110,7 +120,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 5db195725f..6af6e4b239 100644 --- a/libavcodec/mpegaudiodecheader.c +++ b/libavcodec/mpegaudiodecheader.c @@ -134,7 +134,8 @@ int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, in break; default: case 3: - *codec_id = AV_CODEC_ID_MP3; + if (*codec_id != AV_CODEC_ID_MP3ADU) + *codec_id = AV_CODEC_ID_MP3; if (s->lsf) *frame_size = 576; else diff --git a/libavcodec/version.h b/libavcodec/version.h index 8a86414f8e..e1e2904c85 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 21 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MINOR 22 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |