mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-31 05:26:37 +02:00
avcocdec/mpegaudio_parser: add MP3 ADU headers parser
Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
b533949813
commit
8ca098f444
@ -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,
|
||||
|
@ -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
|
||||
|
@ -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, \
|
||||
|
Loading…
Reference in New Issue
Block a user