| @@ -25,7 +25,7 @@ · 24 unmodified lines |
| 25 | 25 | #include "formats.h" |
| 26 | 26 | #include "internal.h" |
| 27 | 27 | #include "video.h" |
| 28 | | −#include "framesync.h" |
| 28 | +#include "framesync2.h" |
| 29 | 29 | |
| 30 | 30 | typedef struct MidEqualizerContext { |
| 31 | 31 | const AVClass *class; |
| @@ -89,8 +89,8 @@ static int process_frame(FFFrameSync *fs) · 57 unmodified lines |
| 89 | 89 | AVFrame *out, *in0, *in1; |
| 90 | 90 | int ret; |
| 91 | 91 | |
| 92 | | − if ((ret = ff_framesync_get_frame(&s->fs, 0, &in0, 0)) < 0 || |
| 93 | | − (ret = ff_framesync_get_frame(&s->fs, 1, &in1, 0)) < 0) |
| 92 | + if ((ret = ff_framesync2_get_frame(&s->fs, 0, &in0, 0)) < 0 || |
| 93 | + (ret = ff_framesync2_get_frame(&s->fs, 1, &in1, 0)) < 0) |
| 94 | 94 | return ret; |
| 95 | 95 | |
| 96 | 96 | if (ctx->is_disabled) { |
| @@ -311,7 +311,7 @@ static int config_output(AVFilterLink *outlink) · 214 unmodified lines |
| 311 | 311 | outlink->sample_aspect_ratio = in0->sample_aspect_ratio; |
| 312 | 312 | outlink->frame_rate = in0->frame_rate; |
| 313 | 313 | |
| 314 | | − if ((ret = ff_framesync_init(&s->fs, ctx, 2)) < 0) |
| 314 | + if ((ret = ff_framesync2_init(&s->fs, ctx, 2)) < 0) |
| 315 | 315 | return ret; |
| 316 | 316 | |
| 317 | 317 | in = s->fs.in; |
| @@ -326,26 +326,20 @@ static int config_output(AVFilterLink *outlink) · 8 unmodified lines |
| 326 | 326 | s->fs.opaque = s; |
| 327 | 327 | s->fs.on_event = process_frame; |
| 328 | 328 | |
| 329 | | − return ff_framesync_configure(&s->fs); |
| 329 | + return ff_framesync2_configure(&s->fs); |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | | −static int filter_frame(AVFilterLink *inlink, AVFrame *buf) |
| 332 | +static int activate(AVFilterContext *ctx) |
| 333 | 333 | { |
| 334 | | − MidEqualizerContext *s = inlink->dst->priv; |
| 335 | | − return ff_framesync_filter_frame(&s->fs, inlink, buf); |
| 336 | | −} |
| 337 | | − |
| 338 | | −static int request_frame(AVFilterLink *outlink) |
| 339 | | −{ |
| 340 | | − MidEqualizerContext *s = outlink->src->priv; |
| 341 | | − return ff_framesync_request_frame(&s->fs, outlink); |
| 334 | + MidEqualizerContext *s = ctx->priv; |
| 335 | + return ff_framesync2_activate(&s->fs); |
| 342 | 336 | } |
| 343 | 337 | |
| 344 | 338 | static av_cold void uninit(AVFilterContext *ctx) |
| 345 | 339 | { |
| 346 | 340 | MidEqualizerContext *s = ctx->priv; |
| 347 | 341 | |
| 348 | | − ff_framesync_uninit(&s->fs); |
| 342 | + ff_framesync2_uninit(&s->fs); |
| 349 | 343 | av_freep(&s->histogram[0]); |
| 350 | 344 | av_freep(&s->histogram[1]); |
| 351 | 345 | av_freep(&s->cchange); |
| @@ -355,13 +349,11 @@ static const AVFilterPad midequalizer_inputs[] = { · 3 unmodified lines |
| 355 | 349 | { |
| 356 | 350 | .name = "in0", |
| 357 | 351 | .type = AVMEDIA_TYPE_VIDEO, |
| 358 | | − .filter_frame = filter_frame, |
| 359 | 352 | .config_props = config_input0, |
| 360 | 353 | }, |
| 361 | 354 | { |
| 362 | 355 | .name = "in1", |
| 363 | 356 | .type = AVMEDIA_TYPE_VIDEO, |
| 364 | | − .filter_frame = filter_frame, |
| 365 | 357 | .config_props = config_input1, |
| 366 | 358 | }, |
| 367 | 359 | { NULL } |
| @@ -372,7 +364,6 @@ static const AVFilterPad midequalizer_outputs[] = { · 4 unmodified lines |
| 372 | 364 | .name = "default", |
| 373 | 365 | .type = AVMEDIA_TYPE_VIDEO, |
| 374 | 366 | .config_props = config_output, |
| 375 | | − .request_frame = request_frame, |
| 376 | 367 | }, |
| 377 | 368 | { NULL } |
| 378 | 369 | }; |
| @@ -383,6 +374,7 @@ AVFilter ff_vf_midequalizer = { · 4 unmodified lines |
| 383 | 374 | .priv_size = sizeof(MidEqualizerContext), |
| 384 | 375 | .uninit = uninit, |
| 385 | 376 | .query_formats = query_formats, |
| 377 | + .activate = activate, |
| 386 | 378 | .inputs = midequalizer_inputs, |
| 387 | 379 | .outputs = midequalizer_outputs, |
| 388 | 380 | .priv_class = &midequalizer_class, |