avfilter: no need to request more samples if internal frame is available

Paul B Mahol committed 2 years ago

Commit c979ccd1 parent 66a02a84 files · +5 −5Browse files

Showing the changes to libavfilter (4 of 4 files). Show all

Unified · Split

4 files

libavfilter/af_amultiply.c +1 −1
libavfilter/af_anlms.c +1 −1
libavfilter/af_arls.c +1 −1
libavfilter/af_asdr.c +2 −2

libavfilter/af_amultiply.c+1−1

@@ -110,7 +110,7 @@ static int activate(AVFilterContext *ctx) · 109 unmodified lines
110	110
111	111	if (ff_outlink_frame_wanted(ctx->outputs[0])) {
112	112	for (i = 0; i < 2; i++) {
113		− if (ff_inlink_queued_samples(ctx->inputs[i]) > 0)
	113	+ if (s->frames[i] \|\| ff_inlink_queued_samples(ctx->inputs[i]) > 0)
114	114	continue;
115	115	ff_inlink_request_frame(ctx->inputs[i]);
116	116	return 0;

libavfilter/af_anlms.c+1−1

@@ -162,7 +162,7 @@ static int activate(AVFilterContext *ctx) · 161 unmodified lines
162	162
163	163	if (ff_outlink_frame_wanted(ctx->outputs[0])) {
164	164	for (i = 0; i < 2; i++) {
165		− if (ff_inlink_queued_samples(ctx->inputs[i]) > 0)
	165	+ if (s->frame[i] \|\| ff_inlink_queued_samples(ctx->inputs[i]) > 0)
166	166	continue;
167	167	ff_inlink_request_frame(ctx->inputs[i]);
168	168	return 0;

libavfilter/af_arls.c+1−1

@@ -159,7 +159,7 @@ static int activate(AVFilterContext *ctx) · 158 unmodified lines
159	159
160	160	if (ff_outlink_frame_wanted(ctx->outputs[0])) {
161	161	for (i = 0; i < 2; i++) {
162		− if (ff_inlink_queued_samples(ctx->inputs[i]) > 0)
	162	+ if (s->frame[i] \|\| ff_inlink_queued_samples(ctx->inputs[i]) > 0)
163	163	continue;
164	164	ff_inlink_request_frame(ctx->inputs[i]);
165	165	return 0;

libavfilter/af_asdr.c+2−2

@@ -186,11 +186,11 @@ static int activate(AVFilterContext *ctx) · 185 unmodified lines
186	186
187	187	if (ff_outlink_frame_wanted(outlink)) {
188	188	for (int i = 0; i < 2; i++) {
189		− if (ff_inlink_queued_samples(ctx->inputs[i]) > 0)
	189	+ if (s->cache[i] \|\| ff_inlink_queued_samples(ctx->inputs[i]) > 0)
190	190	continue;
191	191	ff_inlink_request_frame(ctx->inputs[i]);
	192	+ return 0;
192	193	}
193		− return 0;
194	194	}
195	195
196	196	return FFERROR_NOT_READY;