Unified · Split
| @@ -522,7 +522,7 @@ static int64_t guess_status_pts(AVFilterContext *ctx, int status, AVRational lin · 521 unmodified lines | |||
| 522 | return AV_NOPTS_VALUE; | 522 | return AV_NOPTS_VALUE; |
| 523 | } | 523 | } |
| 524 | 524 | ||
| 525 | static int ff_request_frame_to_filter(AVFilterLink *link) | 525 | static int request_frame_to_filter(AVFilterLink *link) |
| 526 | { | 526 | { |
| 527 | FilterLinkInternal * const li = ff_link_internal(link); | 527 | FilterLinkInternal * const li = ff_link_internal(link); |
| 528 | int ret = -1; | 528 | int ret = -1; |
| @@ -1027,7 +1027,7 @@ FF_ENABLE_DEPRECATION_WARNINGS · 498 unmodified lines | |||
| 1027 | return fabs(av_expr_eval(dsti->enable, dsti->var_values, NULL)) >= 0.5; | 1027 | return fabs(av_expr_eval(dsti->enable, dsti->var_values, NULL)) >= 0.5; |
| 1028 | } | 1028 | } |
| 1029 | 1029 | ||
| 1030 | static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) | 1030 | static int filter_frame_framed(AVFilterLink *link, AVFrame *frame) |
| 1031 | { | 1031 | { |
| 1032 | FilterLink *l = ff_filter_link(link); | 1032 | FilterLink *l = ff_filter_link(link); |
| 1033 | int (*filter_frame)(AVFilterLink *, AVFrame *); | 1033 | int (*filter_frame)(AVFilterLink *, AVFrame *); |
| @@ -1181,7 +1181,7 @@ static int take_samples(FilterLinkInternal *li, unsigned min, unsigned max, · 147 unmodified lines | |||
| 1181 | return 0; | 1181 | return 0; |
| 1182 | } | 1182 | } |
| 1183 | 1183 | ||
| 1184 | static int ff_filter_frame_to_filter(AVFilterLink *link) | 1184 | static int filter_frame_to_filter(AVFilterLink *link) |
| 1185 | { | 1185 | { |
| 1186 | FilterLinkInternal * const li = ff_link_internal(link); | 1186 | FilterLinkInternal * const li = ff_link_internal(link); |
| 1187 | AVFrame *frame = NULL; | 1187 | AVFrame *frame = NULL; |
| @@ -1201,9 +1201,9 @@ static int ff_filter_frame_to_filter(AVFilterLink *link) · 13 unmodified lines | |||
| 1201 | produce one or more: unblock its outputs. */ | 1201 | produce one or more: unblock its outputs. */ |
| 1202 | filter_unblock(dst); | 1202 | filter_unblock(dst); |
| 1203 | /* AVFilterPad.filter_frame() expect frame_count_out to have the value | 1203 | /* AVFilterPad.filter_frame() expect frame_count_out to have the value |
| 1204 | before the frame; ff_filter_frame_framed() will re-increment it. */ | 1204 | before the frame; filter_frame_framed() will re-increment it. */ |
| 1205 | li->l.frame_count_out--; | 1205 | li->l.frame_count_out--; |
| 1206 | ret = ff_filter_frame_framed(link, frame); | 1206 | ret = filter_frame_framed(link, frame); |
| 1207 | if (ret < 0 && ret != li->status_out) { | 1207 | if (ret < 0 && ret != li->status_out) { |
| 1208 | link_set_out_status(link, ret, AV_NOPTS_VALUE); | 1208 | link_set_out_status(link, ret, AV_NOPTS_VALUE); |
| 1209 | } else { | 1209 | } else { |
| @@ -1230,7 +1230,7 @@ static int forward_status_change(AVFilterContext *filter, FilterLinkInternal *li · 20 unmodified lines | |||
| 1230 | 1230 | ||
| 1231 | if (!li_out->status_in) { | 1231 | if (!li_out->status_in) { |
| 1232 | progress++; | 1232 | progress++; |
| 1233 | ret = ff_request_frame_to_filter(filter->outputs[out]); | 1233 | ret = request_frame_to_filter(filter->outputs[out]); |
| 1234 | if (ret < 0) | 1234 | if (ret < 0) |
| 1235 | return ret; | 1235 | return ret; |
| 1236 | } | 1236 | } |
| @@ -1249,7 +1249,7 @@ static int forward_status_change(AVFilterContext *filter, FilterLinkInternal *li · 12 unmodified lines | |||
| 1249 | return 0; | 1249 | return 0; |
| 1250 | } | 1250 | } |
| 1251 | 1251 | ||
| 1252 | static int ff_filter_activate_default(AVFilterContext *filter) | 1252 | static int filter_activate_default(AVFilterContext *filter) |
| 1253 | { | 1253 | { |
| 1254 | unsigned i; | 1254 | unsigned i; |
| 1255 | 1255 | ||
| @@ -1267,7 +1267,7 @@ static int ff_filter_activate_default(AVFilterContext *filter) · 11 unmodified lines | |||
| 1267 | for (i = 0; i < filter->nb_inputs; i++) { | 1267 | for (i = 0; i < filter->nb_inputs; i++) { |
| 1268 | FilterLinkInternal *li = ff_link_internal(filter->inputs[i]); | 1268 | FilterLinkInternal *li = ff_link_internal(filter->inputs[i]); |
| 1269 | if (samples_ready(li, li->l.min_samples)) { | 1269 | if (samples_ready(li, li->l.min_samples)) { |
| 1270 | return ff_filter_frame_to_filter(filter->inputs[i]); | 1270 | return filter_frame_to_filter(filter->inputs[i]); |
| 1271 | } | 1271 | } |
| 1272 | } | 1272 | } |
| 1273 | for (i = 0; i < filter->nb_inputs; i++) { | 1273 | for (i = 0; i < filter->nb_inputs; i++) { |
| @@ -1281,7 +1281,7 @@ static int ff_filter_activate_default(AVFilterContext *filter) · 7 unmodified lines | |||
| 1281 | FilterLinkInternal * const li = ff_link_internal(filter->outputs[i]); | 1281 | FilterLinkInternal * const li = ff_link_internal(filter->outputs[i]); |
| 1282 | if (li->frame_wanted_out && | 1282 | if (li->frame_wanted_out && |
| 1283 | !li->frame_blocked_in) { | 1283 | !li->frame_blocked_in) { |
| 1284 | return ff_request_frame_to_filter(filter->outputs[i]); | 1284 | return request_frame_to_filter(filter->outputs[i]); |
| 1285 | } | 1285 | } |
| 1286 | } | 1286 | } |
| 1287 | return FFERROR_NOT_READY; | 1287 | return FFERROR_NOT_READY; |
| @@ -1429,7 +1429,7 @@ int ff_filter_activate(AVFilterContext *filter) · 141 unmodified lines | |||
| 1429 | filter->filter->activate)); | 1429 | filter->filter->activate)); |
| 1430 | ctxi->ready = 0; | 1430 | ctxi->ready = 0; |
| 1431 | ret = filter->filter->activate ? filter->filter->activate(filter) : | 1431 | ret = filter->filter->activate ? filter->filter->activate(filter) : |
| 1432 | ff_filter_activate_default(filter); | 1432 | filter_activate_default(filter); |
| 1433 | if (ret == FFERROR_NOT_READY) | 1433 | if (ret == FFERROR_NOT_READY) |
| 1434 | ret = 0; | 1434 | ret = 0; |
| 1435 | return ret; | 1435 | return ret; |