virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

avfilter/vsrc_gradients: switch to activate

Browse Source 
Allow to set the EOF timestamp.
This commit is contained in:
Paul B Mahol
2020-09-04 18:50:57 +02:00
parent e8819d86fa
commit 9f5f971efd
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libavfilter/vsrc_gradients.c
View File

@ -19,6 +19,7 @@
*/ */
#include "avfilter.h" #include "avfilter.h"
#include "filters.h"
#include "formats.h" #include "formats.h"
#include "video.h" #include "video.h"
#include "internal.h" #include "internal.h"
@ -247,19 +248,23 @@ static int draw_gradients_slice16(AVFilterContext *ctx, void *arg, int job, int
return 0; return 0;
} }
static int gradients_request_frame(AVFilterLink *outlink) static int activate(AVFilterContext *ctx)
{ {
AVFilterContext *ctx = outlink->src;
GradientsContext *s = ctx->priv; GradientsContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0];
if (s->duration >= 0 &&
av_rescale_q(s->pts, outlink->time_base, AV_TIME_BASE_Q) >= s->duration) {
ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
return 0;
}
if (ff_outlink_frame_wanted(outlink)) {
AVFrame *frame = ff_get_video_buffer(outlink, s->w, s->h); AVFrame *frame = ff_get_video_buffer(outlink, s->w, s->h);
float angle = fmodf(s->pts * s->speed, 2.f * M_PI); float angle = fmodf(s->pts * s->speed, 2.f * M_PI);
const float w2 = s->w / 2.f; const float w2 = s->w / 2.f;
const float h2 = s->h / 2.f; const float h2 = s->h / 2.f;
if (s->duration >= 0 &&
av_rescale_q(s->pts, outlink->time_base, AV_TIME_BASE_Q) >= s->duration)
return AVERROR_EOF;
s->fx0 = (s->x0 - w2) * cosf(angle) - (s->y0 - h2) * sinf(angle) + w2; s->fx0 = (s->x0 - w2) * cosf(angle) - (s->y0 - h2) * sinf(angle) + w2;
s->fy0 = (s->x0 - w2) * sinf(angle) + (s->y0 - h2) * cosf(angle) + h2; s->fy0 = (s->x0 - w2) * sinf(angle) + (s->y0 - h2) * cosf(angle) + h2;
@ -275,16 +280,19 @@ static int gradients_request_frame(AVFilterLink *outlink)
frame->sample_aspect_ratio = (AVRational) {1, 1}; frame->sample_aspect_ratio = (AVRational) {1, 1};
frame->pts = s->pts++; frame->pts = s->pts++;
ctx->internal->execute(ctx, s->draw_slice, frame, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); ctx->internal->execute(ctx, s->draw_slice, frame, NULL,
FFMIN(outlink->h, ff_filter_get_nb_threads(ctx)));
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
}
return FFERROR_NOT_READY;
} }
static const AVFilterPad gradients_outputs[] = { static const AVFilterPad gradients_outputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.request_frame = gradients_request_frame,
.config_props = config_output, .config_props = config_output,
}, },
{ NULL } { NULL }
@ -298,5 +306,6 @@ AVFilter ff_vsrc_gradients = {
.query_formats = query_formats, .query_formats = query_formats,
.inputs = NULL, .inputs = NULL,
.outputs = gradients_outputs, .outputs = gradients_outputs,
.activate = activate,
.flags = AVFILTER_FLAG_SLICE_THREADS, .flags = AVFILTER_FLAG_SLICE_THREADS,
}; };