History

avfilter/src_movie: switch to activate

Allow to set the EOF timestamp.

Paul B Mahol committed 6 years ago

Commit abc884b1 parent 939f4b31 file · +27 −10Browse files

Unified · Split

libavfilter/src_movie.c+27−10
@@ -44,6 +44,7 @@ · 43 unmodified lines
4444
4545 #include "audio.h"
4646 #include "avfilter.h"
47+#include "filters.h"
4748 #include "formats.h"
4849 #include "internal.h"
4950 #include "video.h"
@@ -97,7 +98,6 @@ static const AVOption movie_options[]= { · 47 unmodified lines
9798 };
9899
99100 static int movie_config_output_props(AVFilterLink *outlink);
100−static int movie_request_frame(AVFilterLink *outlink);
101101
102102 static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec)
103103 {
@@ -309,7 +309,6 @@ static av_cold int movie_common_init(AVFilterContext *ctx) · 205 unmodified lines
309309 if (!pad.name)
310310 return AVERROR(ENOMEM);
311311 pad.config_props = movie_config_output_props;
312− pad.request_frame = movie_request_frame;
313312 if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) {
314313 av_freep(&pad.name);
315314 return ret;
@@ -595,17 +594,33 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id) · 279 unmodified lines
595594 return pkt_out_id == out_id;
596595 }
597596
598−static int movie_request_frame(AVFilterLink *outlink)
597+static int activate(AVFilterContext *ctx)
599598 {
600− AVFilterContext *ctx = outlink->src;
601− unsigned out_id = FF_OUTLINK_IDX(outlink);
602− int ret;
599+ MovieContext *movie = ctx->priv;
600+ int nb_eofs = 0;
601+
602+ for (int i = 0; i < ctx->nb_outputs; i++) {
603+ AVFilterLink *outlink = ctx->outputs[i];
604+
605+ nb_eofs += !!ff_outlink_get_status(outlink);
606+ if (ff_outlink_frame_wanted(outlink)) {
607+ int ret = movie_push_frame(ctx, i);
603608
604− while (1) {
605− ret = movie_push_frame(ctx, out_id);
606− if (ret)
607− return FFMIN(ret, 0);
609+ if (ret == AVERROR_EOF) {
610+ ff_outlink_set_status(outlink, AVERROR_EOF, movie->st[i].last_pts);
611+ return 0;
612+ } else if (ret) {
613+ return FFMIN(ret, 0);
614+ }
615+ }
616+ }
617+
618+ if (nb_eofs != ctx->nb_outputs) {
619+ ff_filter_set_ready(ctx, 100);
620+ return 0;
608621 }
622+
623+ return FFERROR_NOT_READY;
609624 }
610625
611626 static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
@@ -666,6 +681,7 @@ AVFilter ff_avsrc_movie = { · 54 unmodified lines
666681
667682 .inputs = NULL,
668683 .outputs = NULL,
684+ .activate = activate,
669685 .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
670686 .process_command = process_command
671687 };
@@ -687,6 +703,7 @@ AVFilter ff_avsrc_amovie = { · 15 unmodified lines
687703
688704 .inputs = NULL,
689705 .outputs = NULL,
706+ .activate = activate,
690707 .priv_class = &amovie_class,
691708 .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
692709 .process_command = process_command,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t