History

fftools/ffmpeg_filter: remove remaining OutputStream usage in init_simple_filtergraph()

With this, nothing in ffmpeg_filter acesses OutputStream anymore, thus there are no more direct ties between filtering and muxing. Rename init_simple_filtergraph() to fg_create_simple() for consistency.

Anton Khirnov committed 2 years ago

Commit d103b611 parent 72cd0c23 files · +21 −17Browse files

Unified · Split

3 files
  1. fftools/ffmpeg.h +5 −4
  2. fftools/ffmpeg_filter.c +11 −11
  3. fftools/ffmpeg_mux_init.c +5 −2
fftools/ffmpeg.h+5−4
@@ -755,10 +755,11 @@ int find_codec(void *logctx, const char *name, · 754 unmodified lines
755755 int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_idx, int is_global);
756756
757757 int filtergraph_is_simple(const FilterGraph *fg);
758−int init_simple_filtergraph(InputStream *ist, OutputStream *ost,
759− char *graph_desc,
760− Scheduler *sch, unsigned sch_idx_enc,
761− const OutputFilterOptions *opts);
758+int fg_create_simple(FilterGraph **pfg,
759+ InputStream *ist,
760+ char *graph_desc,
761+ Scheduler *sch, unsigned sched_idx_enc,
762+ const OutputFilterOptions *opts);
762763 int fg_finalise_bindings(void);
763764
764765 /**
fftools/ffmpeg_filter.c+11−11
@@ -1180,25 +1180,27 @@ fail: · 1179 unmodified lines
11801180 return 0;
11811181 }
11821182
1183−int init_simple_filtergraph(InputStream *ist, OutputStream *ost,
1184− char *graph_desc,
1185− Scheduler *sch, unsigned sched_idx_enc,
1186− const OutputFilterOptions *opts)
1183+int fg_create_simple(FilterGraph **pfg,
1184+ InputStream *ist,
1185+ char *graph_desc,
1186+ Scheduler *sch, unsigned sched_idx_enc,
1187+ const OutputFilterOptions *opts)
11871188 {
1189+ const enum AVMediaType type = ist->par->codec_type;
11881190 FilterGraph *fg;
11891191 FilterGraphPriv *fgp;
11901192 int ret;
11911193
1192− ret = fg_create(&ost->fg_simple, graph_desc, sch);
1194+ ret = fg_create(pfg, graph_desc, sch);
11931195 if (ret < 0)
11941196 return ret;
1195− fg = ost->fg_simple;
1197+ fg = *pfg;
11961198 fgp = fgp_from_fg(fg);
11971199
11981200 fgp->is_simple = 1;
11991201
12001202 snprintf(fgp->log_name, sizeof(fgp->log_name), "%cf%s",
1201− av_get_media_type_string(ost->type)[0], opts->name);
1203+ av_get_media_type_string(type)[0], opts->name);
12021204
12031205 if (fg->nb_inputs != 1 || fg->nb_outputs != 1) {
12041206 av_log(fg, AV_LOG_ERROR, "Simple filtergraph '%s' was expected "
@@ -1208,16 +1210,14 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost, · 3 unmodified lines
12081210 graph_desc, fg->nb_inputs, fg->nb_outputs);
12091211 return AVERROR(EINVAL);
12101212 }
1211− if (fg->outputs[0]->type != ost->type) {
1213+ if (fg->outputs[0]->type != type) {
12121214 av_log(fg, AV_LOG_ERROR, "Filtergraph has a %s output, cannot connect "
12131215 "it to %s output stream\n",
12141216 av_get_media_type_string(fg->outputs[0]->type),
1215− av_get_media_type_string(ost->type));
1217+ av_get_media_type_string(type));
12161218 return AVERROR(EINVAL);
12171219 }
12181220
1219− ost->filter = fg->outputs[0];
1220−
12211221 ret = ifilter_bind_ist(fg->inputs[0], ist, opts->vs);
12221222 if (ret < 0)
12231223 return ret;
fftools/ffmpeg_mux_init.c+5−2
@@ -1010,8 +1010,11 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter, · 1009 unmodified lines
10101010 ost->filter = ofilter;
10111011 ret = ofilter_bind_enc(ofilter, ms->sch_idx_enc, &opts);
10121012 } else {
1013− ret = init_simple_filtergraph(ost->ist, ost, filters,
1014− mux->sch, ms->sch_idx_enc, &opts);
1013+ ret = fg_create_simple(&ost->fg_simple, ost->ist, filters,
1014+ mux->sch, ms->sch_idx_enc, &opts);
1015+ if (ret >= 0)
1016+ ost->filter = ost->fg_simple->outputs[0];
1017+
10151018 }
10161019 av_freep(&opts.nb_threads);
10171020 if (ret < 0)

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