--- libavutil/audio_fifo.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c index 243efc39e4..1ab0c9bcdc 100644 --- a/libavutil/audio_fifo.c +++ b/libavutil/audio_fifo.c @@ -80,7 +80,7 @@ AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels, goto error; for (i = 0; i < af->nb_buffers; i++) { - af->buf[i] = av_fifo_alloc(buf_size); + af->buf[i] = av_fifo_alloc2(buf_size, 1, 0); if (!af->buf[i]) goto error; } @@ -95,15 +95,19 @@ error: int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples) { + const size_t cur_size = av_fifo_can_read (af->buf[0]) + + av_fifo_can_write(af->buf[0]); int i, ret, buf_size; if ((ret = av_samples_get_buffer_size(&buf_size, af->channels, nb_samples, af->sample_fmt, 1)) < 0) return ret; - for (i = 0; i < af->nb_buffers; i++) { - if ((ret = av_fifo_realloc2(af->buf[i], buf_size)) < 0) - return ret; + if (buf_size > cur_size) { + for (i = 0; i < af->nb_buffers; i++) { + if ((ret = av_fifo_grow2(af->buf[i], buf_size - cur_size)) < 0) + return ret; + } } af->allocated_samples = nb_samples; return 0; @@ -126,8 +130,8 @@ int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples) size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) { - ret = av_fifo_generic_write(af->buf[i], data[i], size, NULL); - if (ret != size) + ret = av_fifo_write(af->buf[i], data[i], size); + if (ret < 0) return AVERROR_BUG; } af->nb_samples += nb_samples; @@ -137,21 +141,7 @@ int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples) int av_audio_fifo_peek(AVAudioFifo *af, void **data, int nb_samples) { - int i, ret, size; - - if (nb_samples < 0) - return AVERROR(EINVAL); - nb_samples = FFMIN(nb_samples, af->nb_samples); - if (!nb_samples) - return 0; - - size = nb_samples * af->sample_size; - for (i = 0; i < af->nb_buffers; i++) { - if ((ret = av_fifo_generic_peek(af->buf[i], data[i], size, NULL)) < 0) - return AVERROR_BUG; - } - - return nb_samples; + return av_audio_fifo_peek_at(af, data, nb_samples, 0); } int av_audio_fifo_peek_at(AVAudioFifo *af, void **data, int nb_samples, int offset) @@ -171,7 +161,7 @@ int av_audio_fifo_peek_at(AVAudioFifo *af, void **data, int nb_samples, int offs offset *= af->sample_size; size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) { - if ((ret = av_fifo_generic_peek_at(af->buf[i], data[i], offset, size, NULL)) < 0) + if ((ret = av_fifo_peek(af->buf[i], data[i], size, offset)) < 0) return AVERROR_BUG; } @@ -190,7 +180,7 @@ int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples) size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) { - if (av_fifo_generic_read(af->buf[i], data[i], size, NULL) < 0) + if (av_fifo_read(af->buf[i], data[i], size) < 0) return AVERROR_BUG; } af->nb_samples -= nb_samples; @@ -209,7 +199,7 @@ int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples) if (nb_samples) { size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) - av_fifo_drain(af->buf[i], size); + av_fifo_drain2(af->buf[i], size); af->nb_samples -= nb_samples; } return 0; -- 2.33.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".