har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/src_movie: switch to activate

Browse Source 
Allow to set the EOF timestamp.
This commit is contained in:
Paul B Mahol 2020-08-31 19:10:43 +02:00
parent 939f4b35b8
commit abc884bcc0
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavfilter/src_movie.c
View File

@ -44,6 +44,7 @@
#include "audio.h" #include "audio.h"
#include "avfilter.h" #include "avfilter.h"
#include "filters.h"
#include "formats.h" #include "formats.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
@ -97,7 +98,6 @@ static const AVOption movie_options[]= {
}; };
static int movie_config_output_props(AVFilterLink *outlink); static int movie_config_output_props(AVFilterLink *outlink);
static int movie_request_frame(AVFilterLink *outlink);
static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec)
{ {
@ -309,7 +309,6 @@ static av_cold int movie_common_init(AVFilterContext *ctx)
if (!pad.name) if (!pad.name)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
pad.config_props = movie_config_output_props; pad.config_props = movie_config_output_props;
pad.request_frame = movie_request_frame;
if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) { if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) {
av_freep(&pad.name); av_freep(&pad.name);
return ret; return ret;
@ -595,17 +594,33 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id)
return pkt_out_id == out_id; return pkt_out_id == out_id;
} }
static int movie_request_frame(AVFilterLink *outlink) static int activate(AVFilterContext *ctx)
{ {
AVFilterContext *ctx = outlink->src; MovieContext *movie = ctx->priv;
unsigned out_id = FF_OUTLINK_IDX(outlink); int nb_eofs = 0;
int ret;
while (1) { for (int i = 0; i < ctx->nb_outputs; i++) {
ret = movie_push_frame(ctx, out_id); AVFilterLink *outlink = ctx->outputs[i];
if (ret)
return FFMIN(ret, 0); nb_eofs += !!ff_outlink_get_status(outlink);
if (ff_outlink_frame_wanted(outlink)) {
int ret = movie_push_frame(ctx, i);
if (ret == AVERROR_EOF) {
ff_outlink_set_status(outlink, AVERROR_EOF, movie->st[i].last_pts);
return 0;
} else if (ret) {
return FFMIN(ret, 0);
}
}
} }
if (nb_eofs != ctx->nb_outputs) {
ff_filter_set_ready(ctx, 100);
return 0;
}
return FFERROR_NOT_READY;
} }
static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
@ -666,6 +681,7 @@ AVFilter ff_avsrc_movie = {
.inputs = NULL, .inputs = NULL,
.outputs = NULL, .outputs = NULL,
.activate = activate,
.flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
.process_command = process_command .process_command = process_command
}; };
@ -687,6 +703,7 @@ AVFilter ff_avsrc_amovie = {
.inputs = NULL, .inputs = NULL,
.outputs = NULL, .outputs = NULL,
.activate = activate,
.priv_class = &amovie_class, .priv_class = &amovie_class,
.flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
.process_command = process_command, .process_command = process_command,