Assign local variable 'in' for 's->input' and replace 'inlink' by 'in->link' to avoid hard-coding ID 0 in more than one place.
Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -941,14 +941,14 @@ static int libplacebo_activate(AVFilterContext *ctx) · 940 unmodified lines | ||
| 941 | 941 | { |
| 942 | 942 | int ret; |
| 943 | 943 | LibplaceboContext *s = ctx->priv; |
| 944 | − AVFilterLink *inlink = ctx->inputs[0]; | |
| 944 | + LibplaceboInput *in = &s->input; | |
| 945 | 945 | AVFilterLink *outlink = ctx->outputs[0]; |
| 946 | 946 | int64_t pts; |
| 947 | 947 | |
| 948 | − FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); | |
| 948 | + FF_FILTER_FORWARD_STATUS_BACK(outlink, in->link); | |
| 949 | 949 | pl_log_level_update(s->log, get_log_level()); |
| 950 | 950 | |
| 951 | − if ((ret = handle_input(ctx, &s->input)) < 0) | |
| 951 | + if ((ret = handle_input(ctx, in)) < 0) | |
| 952 | 952 | return ret; |
| 953 | 953 | |
| 954 | 954 | if (ff_outlink_frame_wanted(outlink)) { |
| @@ -957,22 +957,22 @@ static int libplacebo_activate(AVFilterContext *ctx) · 2 unmodified lines | ||
| 957 | 957 | |
| 958 | 958 | if (s->fps.num) { |
| 959 | 959 | pts = outlink->frame_count_out; |
| 960 | − } else if (av_fifo_peek(s->input.out_pts, &pts, 1, 0) < 0) { | |
| 960 | + } else if (av_fifo_peek(in->out_pts, &pts, 1, 0) < 0) { | |
| 961 | 961 | /* No frames queued */ |
| 962 | − if (s->input.status) { | |
| 963 | − pts = s->input.status_pts; | |
| 962 | + if (in->status) { | |
| 963 | + pts = in->status_pts; | |
| 964 | 964 | } else { |
| 965 | − ff_inlink_request_frame(inlink); | |
| 965 | + ff_inlink_request_frame(in->link); | |
| 966 | 966 | return 0; |
| 967 | 967 | } |
| 968 | 968 | } |
| 969 | 969 | |
| 970 | − if (s->input.status && pts >= s->input.status_pts) { | |
| 971 | − ff_outlink_set_status(outlink, s->input.status, s->input.status_pts); | |
| 970 | + if (in->status && pts >= in->status_pts) { | |
| 971 | + ff_outlink_set_status(outlink, in->status, in->status_pts); | |
| 972 | 972 | return 0; |
| 973 | 973 | } |
| 974 | 974 | |
| 975 | − ret = pl_queue_update(s->input.queue, &mix, pl_queue_params( | |
| 975 | + ret = pl_queue_update(in->queue, &mix, pl_queue_params( | |
| 976 | 976 | .pts = pts * av_q2d(outlink->time_base), |
| 977 | 977 | .radius = pl_frame_mix_radius(&s->params), |
| 978 | 978 | .vsync_duration = av_q2d(av_inv_q(outlink->frame_rate)), |
| @@ -980,11 +980,11 @@ static int libplacebo_activate(AVFilterContext *ctx) · 1 unmodified line | ||
| 980 | 980 | |
| 981 | 981 | switch (ret) { |
| 982 | 982 | case PL_QUEUE_MORE: |
| 983 | − ff_inlink_request_frame(inlink); | |
| 983 | + ff_inlink_request_frame(in->link); | |
| 984 | 984 | return 0; |
| 985 | 985 | case PL_QUEUE_OK: |
| 986 | 986 | if (!s->fps.num) |
| 987 | − av_fifo_drain2(s->input.out_pts, 1); | |
| 987 | + av_fifo_drain2(in->out_pts, 1); | |
| 988 | 988 | return output_frame_mix(ctx, &mix, pts); |
| 989 | 989 | case PL_QUEUE_ERR: |
| 990 | 990 | return AVERROR_EXTERNAL; |