openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 03:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mp3: Properly use AVCodecContext API

Browse Source 
Rather than having an unitialized context on the stack, allocate it with
defaults and free it when unneeded.

CC: libav-stable@libav.org
This commit is contained in:
Vittorio Giovara 2015-03-09 23:02:00 +00:00
parent 9272c965d9
commit fe99c52fa9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mp3dec.c
View File

@ -31,6 +31,7 @@
#include "id3v1.h" #include "id3v1.h"
#include "replaygain.h" #include "replaygain.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/mpegaudiodecheader.h" #include "libavcodec/mpegaudiodecheader.h"
#define XING_FLAG_FRAMES 0x01 #define XING_FLAG_FRAMES 0x01
@ -55,7 +56,10 @@ static int mp3_read_probe(AVProbeData *p)
int fsize, frames, sample_rate; int fsize, frames, sample_rate;
uint32_t header; uint32_t header;
uint8_t *buf, *buf0, *buf2, *end; uint8_t *buf, *buf0, *buf2, *end;
AVCodecContext avctx; 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);
@ -70,7 +74,9 @@ static int mp3_read_probe(AVProbeData *p)
for(frames = 0; buf2 < end; frames++) { for(frames = 0; buf2 < end; frames++) {
header = AV_RB32(buf2); header = AV_RB32(buf2);
fsize = avpriv_mpa_decode_header(&avctx, header, &sample_rate, &sample_rate, &sample_rate, &sample_rate); fsize = avpriv_mpa_decode_header(avctx, header, &sample_rate,
&sample_rate, &sample_rate,
&sample_rate);
if(fsize < 0) if(fsize < 0)
break; break;
buf2 += fsize; buf2 += fsize;
@ -79,6 +85,7 @@ static int mp3_read_probe(AVProbeData *p)
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)