RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

avcocdec/mpegaudio_parser: add MP3 ADU headers parser

Browse Source 
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Gilles Chanteperdrix 2015-02-13 22:51:33 +01:00 committed by Michael Niedermayer
parent b533949813
commit 8ca098f444
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/mpegaudio_parser.c
View File

@ -64,7 +64,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
}else{ }else{
while(i<buf_size){ while(i<buf_size){
int ret, sr, channels, bit_rate, frame_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++]; 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); 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; break;
} }
} }
@ -110,7 +120,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
AVCodecParser ff_mpegaudio_parser = { 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), .priv_data_size = sizeof(MpegAudioParseContext),
.parser_parse = mpegaudio_parse, .parser_parse = mpegaudio_parse,
.parser_close = ff_parse_close, .parser_close = ff_parse_close,

1
libavcodec/mpegaudiodecheader.c
View File

@ -134,6 +134,7 @@ int avpriv_mpa_decode_header2(uint32_t head, int *sample_rate, int *channels, in
break; break;
default: default:
case 3: case 3:
if (*codec_id != AV_CODEC_ID_MP3ADU)
*codec_id = AV_CODEC_ID_MP3; *codec_id = AV_CODEC_ID_MP3;
if (s->lsf) if (s->lsf)
*frame_size = 576; *frame_size = 576;

4
libavcodec/version.h
View File

@ -29,8 +29,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 21 #define LIBAVCODEC_VERSION_MINOR 22
#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \