mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
avfilter/buffersink: add color_spaces, color_ranges params
An oversight in my previous series. This omission slipped under the radar because fftools/ffmpeg_filter.c did not use these options, instead preferring to insert an explicit format filter.
This commit is contained in:
parent
4618b5ebb9
commit
75f4cb81de
@ -48,6 +48,10 @@ typedef struct BufferSinkContext {
|
|||||||
/* only used for video */
|
/* only used for video */
|
||||||
enum AVPixelFormat *pixel_fmts; ///< list of accepted pixel formats
|
enum AVPixelFormat *pixel_fmts; ///< list of accepted pixel formats
|
||||||
int pixel_fmts_size;
|
int pixel_fmts_size;
|
||||||
|
enum AVColorSpace *color_spaces; ///< list of accepted color spaces
|
||||||
|
int color_spaces_size;
|
||||||
|
enum AVColorRange *color_ranges; ///< list of accepted color ranges
|
||||||
|
int color_ranges_size;
|
||||||
|
|
||||||
/* only used for audio */
|
/* only used for audio */
|
||||||
enum AVSampleFormat *sample_fmts; ///< list of accepted sample formats
|
enum AVSampleFormat *sample_fmts; ///< list of accepted sample formats
|
||||||
@ -250,19 +254,36 @@ int av_buffersink_get_ch_layout(const AVFilterContext *ctx, AVChannelLayout *out
|
|||||||
static int vsink_query_formats(AVFilterContext *ctx)
|
static int vsink_query_formats(AVFilterContext *ctx)
|
||||||
{
|
{
|
||||||
BufferSinkContext *buf = ctx->priv;
|
BufferSinkContext *buf = ctx->priv;
|
||||||
AVFilterFormats *formats = NULL;
|
|
||||||
unsigned i;
|
unsigned i;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
CHECK_LIST_SIZE(pixel_fmts)
|
CHECK_LIST_SIZE(pixel_fmts)
|
||||||
|
CHECK_LIST_SIZE(color_spaces)
|
||||||
|
CHECK_LIST_SIZE(color_ranges)
|
||||||
if (buf->pixel_fmts_size) {
|
if (buf->pixel_fmts_size) {
|
||||||
|
AVFilterFormats *formats = NULL;
|
||||||
for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++)
|
for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++)
|
||||||
if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0)
|
if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
if ((ret = ff_set_common_formats(ctx, formats)) < 0)
|
if ((ret = ff_set_common_formats(ctx, formats)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
} else {
|
}
|
||||||
if ((ret = ff_default_query_formats(ctx)) < 0)
|
|
||||||
|
if (buf->color_spaces_size) {
|
||||||
|
AVFilterFormats *formats = NULL;
|
||||||
|
for (i = 0; i < NB_ITEMS(buf->color_spaces); i++)
|
||||||
|
if ((ret = ff_add_format(&formats, buf->color_spaces[i])) < 0)
|
||||||
|
return ret;
|
||||||
|
if ((ret = ff_set_common_color_spaces(ctx, formats)) < 0)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (buf->color_ranges_size) {
|
||||||
|
AVFilterFormats *formats = NULL;
|
||||||
|
for (i = 0; i < NB_ITEMS(buf->color_ranges); i++)
|
||||||
|
if ((ret = ff_add_format(&formats, buf->color_ranges[i])) < 0)
|
||||||
|
return ret;
|
||||||
|
if ((ret = ff_set_common_color_ranges(ctx, formats)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -365,6 +386,8 @@ static int asink_query_formats(AVFilterContext *ctx)
|
|||||||
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
|
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
|
||||||
static const AVOption buffersink_options[] = {
|
static const AVOption buffersink_options[] = {
|
||||||
{ "pix_fmts", "set the supported pixel formats", OFFSET(pixel_fmts), AV_OPT_TYPE_BINARY, .flags = FLAGS },
|
{ "pix_fmts", "set the supported pixel formats", OFFSET(pixel_fmts), AV_OPT_TYPE_BINARY, .flags = FLAGS },
|
||||||
|
{ "color_spaces", "set the supported color spaces", OFFSET(color_spaces), AV_OPT_TYPE_BINARY, .flags = FLAGS },
|
||||||
|
{ "color_ranges", "set the supported color ranges", OFFSET(color_ranges), AV_OPT_TYPE_BINARY, .flags = FLAGS },
|
||||||
{ NULL },
|
{ NULL },
|
||||||
};
|
};
|
||||||
#undef FLAGS
|
#undef FLAGS
|
||||||
|
@ -55,6 +55,8 @@
|
|||||||
* The format can be constrained by setting options, using av_opt_set() and
|
* The format can be constrained by setting options, using av_opt_set() and
|
||||||
* related functions with the AV_OPT_SEARCH_CHILDREN flag.
|
* related functions with the AV_OPT_SEARCH_CHILDREN flag.
|
||||||
* - pix_fmts (int list),
|
* - pix_fmts (int list),
|
||||||
|
* - color_spaces (int list),
|
||||||
|
* - color_ranges (int list),
|
||||||
* - sample_fmts (int list),
|
* - sample_fmts (int list),
|
||||||
* - sample_rates (int list),
|
* - sample_rates (int list),
|
||||||
* - ch_layouts (string),
|
* - ch_layouts (string),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user