aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorRajiv Harlalka <rajivharlalka009@gmail.com>2024-03-12 21:01:16 -0600
committerKieran Kunhya <kierank@obe.tv>2024-03-13 09:45:17 +0000
commit4700925d22c79988688596bda8e862ef3ff39293 (patch)
treebee1f107de1d9ba1f6e62dd27eb16324f1d44a25 /libavfilter
parent8996945d459cee6623eacb5952fc685134a97c3f (diff)
downloadffmpeg-4700925d22c79988688596bda8e862ef3ff39293.tar.gz
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
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_atempo.c18
1 files 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 :