virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mp3dec: replace avpriv_mpa_decode_header with avpriv_mpegaudio_decode_header

Browse Source 
The latter does not require a full AVCodecContext and still provides all
the functionality needed here.
This commit is contained in:
Anton Khirnov 2015-01-02 09:49:20 +01:00
parent 955aec3c7c
commit 72d658766e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/mp3dec.c
View File

@ -53,13 +53,9 @@ typedef struct MP3DecContext {
static int mp3_read_probe(AVProbeData *p) static int mp3_read_probe(AVProbeData *p)
{ {
int max_frames, first_frames = 0; int max_frames, first_frames = 0;
int fsize, frames, sample_rate; int frames, ret;
uint32_t header; uint32_t header;
uint8_t *buf, *buf0, *buf2, *end; uint8_t *buf, *buf0, *buf2, *end;
AVCodecContext *avctx = avcodec_alloc_context3(NULL);
if (!avctx)
return AVERROR(ENOMEM);
buf0 = p->buf; buf0 = p->buf;
end = p->buf + p->buf_size - sizeof(uint32_t); end = p->buf + p->buf_size - sizeof(uint32_t);
@ -73,19 +69,18 @@ static int mp3_read_probe(AVProbeData *p)
buf2 = buf; buf2 = buf;
for(frames = 0; buf2 < end; frames++) { for(frames = 0; buf2 < end; frames++) {
MPADecodeHeader h;
header = AV_RB32(buf2); header = AV_RB32(buf2);
fsize = avpriv_mpa_decode_header(avctx, header, &sample_rate, ret = avpriv_mpegaudio_decode_header(&h, header);
&sample_rate, &sample_rate, if (ret != 0)
&sample_rate);
if(fsize < 0)
break; break;
buf2 += fsize; buf2 += h.frame_size;
} }
max_frames = FFMAX(max_frames, frames); max_frames = FFMAX(max_frames, frames);
if(buf == buf0) if(buf == buf0)
first_frames= frames; first_frames= frames;
} }
avcodec_free_context(&avctx);
// keep this in sync with ac3 probe, both need to avoid // keep this in sync with ac3 probe, both need to avoid
// issues with MPEG-files! // issues with MPEG-files!
if (first_frames >= 10) if (first_frames >= 10)