RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

check fifo size and realloc if needed 

Originally committed as revision 17420 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-02-18 04:42:31 +00:00
parent ef33facdfe
commit 50ced76f4b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/audiointerleave.c
View File

@ -61,6 +61,7 @@ int ff_audio_interleave_init(AVFormatContext *s,
aic->samples = aic->samples_per_frame; aic->samples = aic->samples_per_frame;
aic->time_base = time_base; aic->time_base = time_base;
aic->fifo_size = 100* *aic->samples;
av_fifo_init(&aic->fifo, 100 * *aic->samples); av_fifo_init(&aic->fifo, 100 * *aic->samples);
} }
} }
@ -103,6 +104,12 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
AudioInterleaveContext *aic = st->priv_data; AudioInterleaveContext *aic = st->priv_data;
if (st->codec->codec_type == CODEC_TYPE_AUDIO) { if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
unsigned new_size = av_fifo_size(&aic->fifo) + pkt->size;
if (new_size > aic->fifo_size) {
if (av_fifo_realloc2(&aic->fifo, new_size) < 0)
return -1;
aic->fifo_size = new_size;
}
av_fifo_generic_write(&aic->fifo, pkt->data, pkt->size, NULL); av_fifo_generic_write(&aic->fifo, pkt->data, pkt->size, NULL);
} else { } else {
// rewrite pts and dts to be decoded time line position // rewrite pts and dts to be decoded time line position