MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fftools/ffmpeg_filter: store just the link label in OutputFilter

Browse Source 
Not the entire AVFilterInOut. This is simpler.
This commit is contained in:
Anton Khirnov 2023-05-21 20:17:19 +02:00
parent da7ae627e1
commit 7ea10bfef3
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fftools/ffmpeg.h
View File

@ -289,8 +289,10 @@ typedef struct OutputFilter {
struct FilterGraph *graph;
uint8_t *name;
/* temporary storage until stream maps are processed */
AVFilterInOut *out_tmp;
/* for filters that are not yet bound to an output stream,
* this stores the output linklabel, if any */
uint8_t *linklabel;
enum AVMediaType type;
/* desired output stream properties */

8
fftools/ffmpeg_filter.c
View File

@ -324,7 +324,7 @@ void fg_free(FilterGraph **pfg)
for (int j = 0; j < fg->nb_outputs; j++) {
OutputFilter *ofilter = fg->outputs[j];
avfilter_inout_free(&ofilter->out_tmp);
av_freep(&ofilter->linklabel);
av_freep(&ofilter->name);
av_channel_layout_uninit(&ofilter->ch_layout);
av_freep(&fg->outputs[j]);
@ -661,16 +661,18 @@ int init_complex_filtergraph(FilterGraph *fg)
for (cur = outputs; cur;) {
OutputFilter *const ofilter = ofilter_alloc(fg);
ofilter->out_tmp = cur;
ofilter->linklabel = cur->name;
cur->name = NULL;
ofilter->type = avfilter_pad_get_type(cur->filter_ctx->output_pads,
cur->pad_idx);
ofilter->name = describe_filter_link(fg, cur, 0);
cur = cur->next;
ofilter->out_tmp->next = NULL;
}
fail:
avfilter_inout_free(&inputs);
avfilter_inout_free(&outputs);
avfilter_graph_free(&graph);
return ret;
}

8
fftools/ffmpeg_mux_init.c
View File

@ -1260,7 +1260,7 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o,
if (ofilter) {
ost->filter = ofilter;
ofilter->ost = ost;
avfilter_inout_free(&ofilter->out_tmp);
av_freep(&ofilter->linklabel);
} else {
ret = init_simple_filtergraph(ost->ist, ost, filters);
if (ret < 0) {
@ -1451,8 +1451,8 @@ static void map_manual(Muxer *mux, const OptionsContext *o, const StreamMap *map
for (j = 0; j < nb_filtergraphs; j++) {
fg = filtergraphs[j];
for (k = 0; k < fg->nb_outputs; k++) {
AVFilterInOut *out = fg->outputs[k]->out_tmp;
if (out && !strcmp(out->name, map->linklabel)) {
const char *linklabel = fg->outputs[k]->linklabel;
if (linklabel && !strcmp(linklabel, map->linklabel)) {
ofilter = fg->outputs[k];
goto loop_end;
}
@ -1562,7 +1562,7 @@ static void create_streams(Muxer *mux, const OptionsContext *o)
for (int j = 0; j < fg->nb_outputs; j++) {
OutputFilter *ofilter = fg->outputs[j];
if (!ofilter->out_tmp || ofilter->out_tmp->name)
if (ofilter->linklabel || ofilter->ost)
continue;
switch (ofilter->type) {