diff options
| author | Marton Balint <cus@passwd.hu> | 2025-07-06 10:14:34 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2025-07-14 22:05:10 +0200 |
| commit | b24155cae11cd13987b3ca286fd4be1df33807fc (patch) | |
| tree | 63284861dc3d26ac9257da2d24e655cafd56f566 | |
| parent | 71468e85ae720cb63aa9689f0d94e9e9689b9de9 (diff) | |
| download | ffmpeg-b24155cae11cd13987b3ca286fd4be1df33807fc.tar.gz | |
avfilter/avfilter: add AVFilterGraph->max_buffered_frames to limit buffered frames
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 8 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 | ||||
| -rw-r--r-- | libavfilter/version.h | 4 |
4 files changed, 17 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 6018da37e1..d6e38245f8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2025-03-28 API changes, most recent first: +2025-07-xx - xxxxxxxxxd - lavfi 11.2.100 - avfilter.h + Add AVFilterGraph->max_buffered_frames. + 2025-07-07 - eca477da52 - lavc 62.6.100 - packet.h Add AV_PKT_DATA_RTCP_SR. diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index f85929dc5c..d2571b1404 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -629,6 +629,14 @@ typedef struct AVFilterGraph { avfilter_execute_func *execute; char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions + + /** + * Sets the maximum number of buffered frames in the filtergraph combined. + * + * Zero means no limit. This field must be set before calling + * avfilter_graph_config(). + */ + unsigned max_buffered_frames; } AVFilterGraph; /** diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 38b89db22a..86da0b9975 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -56,6 +56,8 @@ static const AVOption filtergraph_options[] = { AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, F|V }, {"aresample_swr_opts" , "default aresample filter options" , OFFSET(aresample_swr_opts) , AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, F|A }, + {"max_buffered_frames" , "maximum number of buffered frames allowed", OFFSET(max_buffered_frames), + AV_OPT_TYPE_UINT, {.i64 = 0}, 0, UINT_MAX, F|V|A }, { NULL }, }; @@ -1296,6 +1298,8 @@ int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx) { int ret; + if (graphctx->max_buffered_frames) + fffiltergraph(graphctx)->frame_queues.max_queued = graphctx->max_buffered_frames; if ((ret = graph_check_validity(graphctx, log_ctx))) return ret; if ((ret = graph_config_formats(graphctx, log_ctx))) diff --git a/libavfilter/version.h b/libavfilter/version.h index 3c1762dd93..bece922c7f 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 1 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 2 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |