History

avfilter/af_dynaudnorm: do not hang forever if only EOF is received

Paul B Mahol committed 6 years ago

Commit d4d62801 parent 7bb09e51 file · +2 −6Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/af_dynaudnorm.c+2−6
@@ -67,7 +67,6 @@ typedef struct DynamicAudioNormalizerContext { · 66 unmodified lines
6767 double *weights;
6868
6969 int channels;
70− int delay;
7170 int eof;
7271 int64_t pts;
7372
@@ -345,7 +344,6 @@ static int config_input(AVFilterLink *inlink) · 271 unmodified lines
345344 init_gaussian_filter(s);
346345
347346 s->channels = inlink->channels;
348− s->delay = s->filter_size;
349347
350348 return 0;
351349 }
@@ -717,7 +715,6 @@ static int flush_buffer(DynamicAudioNormalizerContext *s, AVFilterLink *inlink, · 365 unmodified lines
717715 }
718716 }
719717
720− s->delay--;
721718 return filter_frame(inlink, out);
722719 }
723720
@@ -734,7 +731,6 @@ static int flush(AVFilterLink *outlink) · 10 unmodified lines
734731
735732 s->pts = out->pts;
736733 ret = ff_filter_frame(outlink, out);
737− s->delay = s->queue.available;
738734 }
739735
740736 return ret;
@@ -772,10 +768,10 @@ static int activate(AVFilterContext *ctx) · 31 unmodified lines
772768 s->eof = 1;
773769 }
774770
775− if (s->eof && s->delay > 0)
771+ if (s->eof && s->queue.available)
776772 return flush(outlink);
777773
778− if (s->eof && s->delay <= 0) {
774+ if (s->eof && !s->queue.available) {
779775 ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
780776 return 0;
781777 }

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