History

lavfi: move AVFilterLink.{frame,sample}_count_{in,out} to FilterLink

Anton Khirnov committed 2 years ago

Commit 42cbf661 parent a23d56556 files · +209 −116Browse files

Showing the changes to libavfilter/f_loop.c (1 of 56 files). Show all

Unified · Split

libavfilter/f_loop.c+4−2
@@ -144,6 +144,7 @@ static int push_samples(AVFilterContext *ctx, int nb_samples) · 143 unmodified lines
144144
145145 static int afilter_frame(AVFilterLink *inlink, AVFrame *frame)
146146 {
147+ FilterLink *inl = ff_filter_link(inlink);
147148 AVFilterContext *ctx = inlink->dst;
148149 AVFilterLink *outlink = ctx->outputs[0];
149150 LoopContext *s = ctx->priv;
@@ -158,7 +159,7 @@ static int afilter_frame(AVFilterLink *inlink, AVFrame *frame) · 8 unmodified lines
158159 int drain = 0;
159160
160161 if (s->start < 0)
161− s->start = inlink->sample_count_out - written;
162+ s->start = inl->sample_count_out - written;
162163
163164 ret = av_audio_fifo_write(s->fifo, (void **)frame->extended_data, written);
164165 if (ret < 0)
@@ -374,6 +375,7 @@ static int push_frame(AVFilterContext *ctx) · 209 unmodified lines
374375
375376 static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
376377 {
378+ FilterLink *inl = ff_filter_link(inlink);
377379 AVFilterContext *ctx = inlink->dst;
378380 AVFilterLink *outlink = ctx->outputs[0];
379381 FilterLink *outl = ff_filter_link(outlink);
@@ -381,7 +383,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 1 unmodified line
381383 int64_t duration;
382384 int ret = 0;
383385
384− if (((s->start >= 0 && inlink->frame_count_out >= s->start) ||
386+ if (((s->start >= 0 && inl->frame_count_out >= s->start) ||
385387 (s->time_pts != AV_NOPTS_VALUE &&
386388 frame->pts >= s->time_pts)) &&
387389 s->size > 0 && s->loop != 0) {

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