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
1434 }1434 }
1435 }1435 }
1436 1436
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))) {
1438 AVFrame *fin = ff_get_audio_buffer(inlink, s->win_size);1439 AVFrame *fin = ff_get_audio_buffer(inlink, s->win_size);
1439 if (!fin)1440 if (!fin)
1440 return AVERROR(ENOMEM);1441 return AVERROR(ENOMEM);
@@ -1462,7 +1463,7 @@ static int activate(AVFilterContext *ctx) · 21 unmodified lines
1462 1463
1463 av_frame_free(&fin);1464 av_frame_free(&fin);
1464 av_audio_fifo_drain(s->fifo, s->hop_size);1465 av_audio_fifo_drain(s->fifo, s->hop_size);
1465 if (ret <= 0)1466 if (ret <= 0 && !ff_outlink_get_status(inlink))
1466 return ret;1467 return ret;
1467 }1468 }
1468 1469
@@ -1493,15 +1494,18 @@ static int activate(AVFilterContext *ctx) · 24 unmodified lines
1493 }1494 }
1494 1495
1495 FF_FILTER_FORWARD_STATUS(inlink, outlink);1496 FF_FILTER_FORWARD_STATUS(inlink, outlink);
1496 if (ff_outlink_frame_wanted(outlink) && av_audio_fifo_size(s->fifo) < s->win_size) {1497 if (av_audio_fifo_size(s->fifo) >= s->win_size ||
1497 ff_inlink_request_frame(inlink);1498 ff_outlink_get_status(inlink) == AVERROR_EOF) {
1499 ff_filter_set_ready(ctx, 10);
1498 return 0;1500 return 0;
1499 }1501 }
1500 1502
1501 if (av_audio_fifo_size(s->fifo) >= s->win_size) {1503 if (ff_outlink_frame_wanted(outlink) && av_audio_fifo_size(s->fifo) < s->win_size &&
1502 ff_filter_set_ready(ctx, 10);1504 ff_outlink_get_status(inlink) != AVERROR_EOF) {
1505 ff_inlink_request_frame(inlink);
1503 return 0;1506 return 0;
1504 }1507 }
1508
1505 return FFERROR_NOT_READY;1509 return FFERROR_NOT_READY;
1506}1510}
1507 1511

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