History

avfilter/avf_showspectrum: properly handle EOF case

Paul B Mahol committed 6 years ago

Commit 7826fbf1 parent 1c32d7d1 file · +10 −6Browse files

Unified · Split

libavfilter/avf_showspectrum.c+10−6
@@ -1434,7 +1434,8 @@ static int activate(AVFilterContext *ctx) · 1433 unmodified lines
14341434 }
14351435 }
14361436
1437− if (s->outpicref && av_audio_fifo_size(s->fifo) >= s->win_size) {
1437+ if (s->outpicref && (av_audio_fifo_size(s->fifo) >= s->win_size ||
1438+ ff_outlink_get_status(inlink))) {
14381439 AVFrame *fin = ff_get_audio_buffer(inlink, s->win_size);
14391440 if (!fin)
14401441 return AVERROR(ENOMEM);
@@ -1462,7 +1463,7 @@ static int activate(AVFilterContext *ctx) · 21 unmodified lines
14621463
14631464 av_frame_free(&fin);
14641465 av_audio_fifo_drain(s->fifo, s->hop_size);
1465− if (ret <= 0)
1466+ if (ret <= 0 && !ff_outlink_get_status(inlink))
14661467 return ret;
14671468 }
14681469
@@ -1493,15 +1494,18 @@ static int activate(AVFilterContext *ctx) · 24 unmodified lines
14931494 }
14941495
14951496 FF_FILTER_FORWARD_STATUS(inlink, outlink);
1496− if (ff_outlink_frame_wanted(outlink) && av_audio_fifo_size(s->fifo) < s->win_size) {
1497− ff_inlink_request_frame(inlink);
1497+ if (av_audio_fifo_size(s->fifo) >= s->win_size ||
1498+ ff_outlink_get_status(inlink) == AVERROR_EOF) {
1499+ ff_filter_set_ready(ctx, 10);
14981500 return 0;
14991501 }
15001502
1501− if (av_audio_fifo_size(s->fifo) >= s->win_size) {
1502− ff_filter_set_ready(ctx, 10);
1503+ if (ff_outlink_frame_wanted(outlink) && av_audio_fifo_size(s->fifo) < s->win_size &&
1504+ ff_outlink_get_status(inlink) != AVERROR_EOF) {
1505+ ff_inlink_request_frame(inlink);
15031506 return 0;
15041507 }
1508+
15051509 return FFERROR_NOT_READY;
15061510 }
15071511

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t