[FFmpeg-cvslog] lavfi/atempo: avoid asendcmd assertion failure
Rajiv Harlalka
git at videolan.org
Wed Mar 13 11:45:42 EET 2024
ffmpeg | branch: master | Rajiv Harlalka <rajivharlalka009 at gmail.com> | Tue Mar 12 21:01:16 2024 -0600| [4700925d22c79988688596bda8e862ef3ff39293] | committer: Kieran Kunhya
lavfi/atempo: avoid asendcmd assertion failure
Check for zeros equal to the total samples early, because in
that case we would already be leaving the first few frames out.
Fixes trac ticket #10692
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4700925d22c79988688596bda8e862ef3ff39293
---
libavfilter/af_atempo.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c
index 4621b67b03..654b080e89 100644
--- a/libavfilter/af_atempo.c
+++ b/libavfilter/af_atempo.c
@@ -531,21 +531,21 @@ static int yae_load_frag(ATempoContext *atempo,
dst = frag->data;
start = atempo->position[0] - atempo->size;
- zeros = 0;
- if (frag->position[0] < start) {
- // what we don't have we substitute with zeros:
- zeros = FFMIN(start - frag->position[0], (int64_t)nsamples);
- av_assert0(zeros != nsamples);
-
- memset(dst, 0, zeros * atempo->stride);
- dst += zeros * atempo->stride;
- }
+ // what we don't have we substitute with zeros:
+ zeros =
+ frag->position[0] < start ?
+ FFMIN(start - frag->position[0], (int64_t)nsamples) : 0;
if (zeros == nsamples) {
return 0;
}
+ if (frag->position[0] < start) {
+ memset(dst, 0, zeros * atempo->stride);
+ dst += zeros * atempo->stride;
+ }
+
// get the remaining data from the ring buffer:
na = (atempo->head < atempo->tail ?
atempo->tail - atempo->head :
More information about the ffmpeg-cvslog
mailing list