} else
crop->out_sar = link->sample_aspect_ratio;
- av_log(ctx, AV_LOG_INFO, "w:%d h:%d sar:%d/%d -> w:%d h:%d sar:%d/%d\n",
+ av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d sar:%d/%d -> w:%d h:%d sar:%d/%d\n",
link->w, link->h, link->sample_aspect_ratio.num, link->sample_aspect_ratio.den,
crop->w, crop->h, crop->out_sar.num, crop->out_sar.den);
return 0;
}
-static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
+static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AVFilterContext *ctx = link->dst;
CropContext *crop = ctx->priv;
int i;
ref2 = avfilter_ref_buffer(picref, ~0);
+ if (!ref2)
+ return AVERROR(ENOMEM);
+
ref2->video->w = crop->w;
ref2->video->h = crop->h;
ref2->data[3] += crop->x * crop->max_step[3];
}
- ff_start_frame(link->dst->outputs[0], ref2);
+ return ff_start_frame(link->dst->outputs[0], ref2);
}
-static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
+static int draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
AVFilterContext *ctx = link->dst;
CropContext *crop = ctx->priv;
if (y >= crop->y + crop->h || y + h <= crop->y)
- return;
+ return 0;
if (y < crop->y) {
h -= crop->y - y;
if (y + h > crop->y + crop->h)
h = crop->y + crop->h - y;
- ff_draw_slice(ctx->outputs[0], y - crop->y, h, slice_dir);
+ return ff_draw_slice(ctx->outputs[0], y - crop->y, h, slice_dir);
}
-static void end_frame(AVFilterLink *link)
+static int end_frame(AVFilterLink *link)
{
CropContext *crop = link->dst->priv;
crop->var_values[VAR_N] += 1.0;
- avfilter_unref_buffer(link->cur_buf);
- ff_end_frame(link->dst->outputs[0]);
+ return ff_end_frame(link->dst->outputs[0]);
}
AVFilter avfilter_vf_crop = {
.init = init,
.uninit = uninit,
- .inputs = (const AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .start_frame = start_frame,
- .draw_slice = draw_slice,
- .end_frame = end_frame,
- .get_video_buffer = ff_null_get_video_buffer,
- .config_props = config_input, },
- { .name = NULL}},
- .outputs = (const AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .config_props = config_output, },
- { .name = NULL}},
+ .inputs = (const AVFilterPad[]) {{ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .start_frame = start_frame,
+ .draw_slice = draw_slice,
+ .end_frame = end_frame,
+ .get_video_buffer = ff_null_get_video_buffer,
+ .config_props = config_input, },
+ { .name = NULL}},
+ .outputs = (const AVFilterPad[]) {{ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = config_output, },
+ { .name = NULL}},
};