mirrors/ffmpeg
0
0 Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-28 10:04:37 +08:00
Code Activity

avfilter/af_afwtdn: fix crash with EOF handling

Browse Source 
Fixes #22775. The backport has the same code changes as the patch
submitted by LiZhixuan on 2026-04-10.

(cherry picked from commit b1942734c7)

Assisted-by: Fairy
This commit is contained in:
Paul B Mahol authored and michaelni committed 2026-10-20 22:29:26 +00:00
1 parent 87783a03cf
commit 94ab38ff88
1 file changed
+19 -15
Download Patch File Download Diff File Expand all files Collapse all files
libavfilter/af_afwtdn.c
+19 -15
View File
@@ -410,6 +410,7 @@ typedef struct AudioFWTDNContext {
uint64_t sn;
int64_t eof_pts;
int eof;
int wavelet_type;
int channels;
@@ -1071,7 +1072,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
s->drop_samples = 0;
} else {
if (s->padd_samples < 0 && eof) {
out->nb_samples += s->padd_samples;
out->nb_samples = FFMAX(0, out->nb_samples + s->padd_samples);
s->padd_samples = 0;
}
if (!eof)
@@ -1210,23 +1211,26 @@ static int activate(AVFilterContext *ctx)
FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
if (ret < 0)
return ret;
if (ret > 0)
return filter_frame(inlink, in);
if (!s->eof) {
ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
if (ret < 0)
return ret;
if (ret > 0)
return filter_frame(inlink, in);
}
if (ff_inlink_acknowledge_status(inlink, &status, &pts)) {
if (status == AVERROR_EOF) {
while (s->padd_samples != 0) {
ret = filter_frame(inlink, NULL);
if (ret < 0)
return ret;
}
ff_outlink_set_status(outlink, status, pts);
return ret;
}
if (status == AVERROR_EOF)
s->eof = 1;
}
if (s->eof && s->padd_samples != 0) {
return filter_frame(inlink, NULL);
} else if (s->eof) {
ff_outlink_set_status(outlink, AVERROR_EOF, s->eof_pts);
return 0;
}
FF_FILTER_FORWARD_WANTED(outlink, inlink);
return FFERROR_NOT_READY;