eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-05 14:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/f_sidedata: also handle global side data in filter links

Browse Source 
Should fix issue #21071

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-12-01 11:07:43 -03:00
parent e0845ec2cf
commit 52c84b06d5
1 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
libavfilter/f_sidedata.c
View File

@@ -27,10 +27,8 @@
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/frame.h" #include "libavutil/frame.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "audio.h"
#include "avfilter.h" #include "avfilter.h"
#include "filters.h" #include "filters.h"
#include "video.h"
enum SideDataMode { enum SideDataMode {
SIDEDATA_SELECT, SIDEDATA_SELECT,
@@ -96,6 +94,31 @@ static av_cold int init(AVFilterContext *ctx)
return 0; return 0;
} }
static int config_props(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
SideDataContext *s = ctx->priv;
const AVFrameSideData *sd = NULL;
if (s->type != -1)
sd = av_frame_side_data_get(outlink->side_data, outlink->nb_side_data, s->type);
switch (s->mode) {
case SIDEDATA_SELECT:
break;
case SIDEDATA_DELETE:
if (s->type == -1)
av_frame_side_data_free(&outlink->side_data, &outlink->nb_side_data);
else if (sd)
av_frame_side_data_remove(&outlink->side_data, &outlink->nb_side_data, s->type);
break;
default:
av_assert0(0);
};
return 0;
}
static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
@@ -143,6 +166,14 @@ static const AVFilterPad ainputs[] = {
}, },
}; };
static const AVFilterPad aoutputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.config_props = config_props,
},
};
const FFFilter ff_af_asidedata = { const FFFilter ff_af_asidedata = {
.p.name = "asidedata", .p.name = "asidedata",
.p.description = NULL_IF_CONFIG_SMALL("Manipulate audio frame side data."), .p.description = NULL_IF_CONFIG_SMALL("Manipulate audio frame side data."),
@@ -152,7 +183,7 @@ const FFFilter ff_af_asidedata = {
.priv_size = sizeof(SideDataContext), .priv_size = sizeof(SideDataContext),
.init = init, .init = init,
FILTER_INPUTS(ainputs), FILTER_INPUTS(ainputs),
FILTER_OUTPUTS(ff_audio_default_filterpad), FILTER_OUTPUTS(aoutputs),
}; };
#endif /* CONFIG_ASIDEDATA_FILTER */ #endif /* CONFIG_ASIDEDATA_FILTER */
@@ -169,6 +200,14 @@ static const AVFilterPad inputs[] = {
}, },
}; };
static const AVFilterPad outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_props,
},
};
const FFFilter ff_vf_sidedata = { const FFFilter ff_vf_sidedata = {
.p.name = "sidedata", .p.name = "sidedata",
.p.description = NULL_IF_CONFIG_SMALL("Manipulate video frame side data."), .p.description = NULL_IF_CONFIG_SMALL("Manipulate video frame side data."),
@@ -178,6 +217,6 @@ const FFFilter ff_vf_sidedata = {
.priv_size = sizeof(SideDataContext), .priv_size = sizeof(SideDataContext),
.init = init, .init = init,
FILTER_INPUTS(inputs), FILTER_INPUTS(inputs),
FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_OUTPUTS(outputs),
}; };
#endif /* CONFIG_SIDEDATA_FILTER */ #endif /* CONFIG_SIDEDATA_FILTER */