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

mpegaudio_parser: add MP3 ADU headers parser

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Gilles Chanteperdrix 2015-02-13 22:51:33 +01:00 committed by Martin Storsjö
parent 5e5583efe4
commit 5cbae5651d
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/mpegaudio_parser.c
View File

@ -63,6 +63,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 = avctx->codec_id;
state= (state<<8) + buf[i++]; 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; 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; break;
} }
} }
@ -106,7 +117,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,

3
libavcodec/mpegaudiodecheader.c
View File

@ -134,7 +134,8 @@ int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_r
break; break;
default: default:
case 3: 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) if (s->lsf)
*frame_size = 576; *frame_size = 576;
else else

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 15 #define LIBAVCODEC_VERSION_MINOR 16
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \