This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new aa70cd0d19 avfilter/vf_vpp_amf: look for HDR metadata in link side data
aa70cd0d19 is described below
commit aa70cd0d191e068250dde7f7a3ff09d29204865e
Author: James Almer <[email protected]>
AuthorDate: Wed Mar 11 10:51:08 2026 -0300
Commit: James Almer <[email protected]>
CommitDate: Fri Mar 13 12:52:57 2026 -0300
avfilter/vf_vpp_amf: look for HDR metadata in link side data
This is the correct way to use and propagate this kind of metadata.
Signed-off-by: James Almer <[email protected]>
---
doc/filters.texi | 13 --------
libavfilter/vf_amf_common.h | 2 --
libavfilter/vf_vpp_amf.c | 72 ++++++---------------------------------------
3 files changed, 9 insertions(+), 78 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 569ff516d4..7f0c3cb99c 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -25664,19 +25664,6 @@ Full (or JPEG) color range.
@end table
-@item master_display
-Set SMPTE2084 mastering display color volume info using libx265-style parameter
-string, format is @code{G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)}.
-Just like in libx265, %hu are unsigned 16bit integers and %u are unsigned
-32bit integers. The SEI includes X,Y display primaries for RGB channels and
-white point (WP) in units of 0.00002 and max,min luminance (L) values
-in units of 0.0001 candela per meter square.
-
-@item max_cll
-Set SMPTE2084 Max CLL and Max FALL values using libx265-style parameter string:
-@code{%hu,%hu}, where %hu are unsigned 16bit integers. The first value is the
-max content light level, the second value is the maximum picture average light
level.
-
@anchor{color_profile}
@item color_profile
Specify all color properties at once.
diff --git a/libavfilter/vf_amf_common.h b/libavfilter/vf_amf_common.h
index 209ee966d8..0290a52c45 100644
--- a/libavfilter/vf_amf_common.h
+++ b/libavfilter/vf_amf_common.h
@@ -43,8 +43,6 @@ typedef struct AMFFilterContext {
int fill_color;
int keep_ratio;
- char *disp_master;
- char *max_cll;
AVMasteringDisplayMetadata *master_display;
AVContentLightMetadata *light_meta;
diff --git a/libavfilter/vf_vpp_amf.c b/libavfilter/vf_vpp_amf.c
index c86325642a..5d5955f4b2 100644
--- a/libavfilter/vf_vpp_amf.c
+++ b/libavfilter/vf_vpp_amf.c
@@ -88,12 +88,11 @@ static int amf_filter_config_output(AVFilterLink *outlink)
size_t size = 0;
int ret;
AMF_RESULT res;
+ const AVFrameSideData *sd;
enum AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM amf_color_profile;
enum AVPixelFormat in_format;
const int chroma_den = 50000;
const int luma_den = 10000;
- const int total_max_cll_args = 2;
- const int total_disp_meta_args = 10;
ret = amf_init_filter_config(outlink, &in_format);
if (ret < 0)
@@ -155,64 +154,20 @@ static int amf_filter_config_output(AVFilterLink *outlink)
AMF_ASSIGN_PROPERTY_INT64(res, ctx->component,
AMF_VIDEO_CONVERTER_INPUT_TRANSFER_CHARACTERISTIC, ctx->in_trc);
}
- if (ctx->disp_master) {
- ctx->master_display = av_mastering_display_metadata_alloc();
+ sd = av_frame_side_data_get(inlink->side_data, inlink->nb_side_data,
+ AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
+ if (sd) {
+ ctx->master_display = av_memdup(sd->data, sd->size);
if (!ctx->master_display)
return AVERROR(ENOMEM);
-
- ret = sscanf(ctx->disp_master,
- "G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)",
- (uint16_t*)&ctx->master_display->display_primaries[1][0].num,
- (uint16_t*)&ctx->master_display->display_primaries[1][1].num,
- (uint16_t*)&ctx->master_display->display_primaries[2][0].num,
- (uint16_t*)&ctx->master_display->display_primaries[2][1].num,
- (uint16_t*)&ctx->master_display->display_primaries[0][0].num,
- (uint16_t*)&ctx->master_display->display_primaries[0][1].num,
- (uint16_t*)&ctx->master_display->white_point[0].num,
- (uint16_t*)&ctx->master_display->white_point[1].num,
- (unsigned*)&ctx->master_display->max_luminance.num,
- (unsigned*)&ctx->master_display->min_luminance.num
- );
-
- if (ret != total_disp_meta_args) {
- av_freep(&ctx->master_display);
- av_log(avctx, AV_LOG_ERROR, "failed to parse mastering_display
option\n");
- return AVERROR(EINVAL);
- }
-
- ctx->master_display->display_primaries[1][0].den = chroma_den;
- ctx->master_display->display_primaries[1][1].den = chroma_den;
- ctx->master_display->display_primaries[2][0].den = chroma_den;
- ctx->master_display->display_primaries[2][1].den = chroma_den;
- ctx->master_display->display_primaries[0][0].den = chroma_den;
- ctx->master_display->display_primaries[0][1].den = chroma_den;
- ctx->master_display->white_point[0].den = chroma_den;
- ctx->master_display->white_point[1].den = chroma_den;
- ctx->master_display->max_luminance.den = luma_den;
- ctx->master_display->min_luminance.den = luma_den;
-
- ctx->master_display->has_primaries = 1;
- ctx->master_display->has_luminance = 1;
}
-
- if (ctx->max_cll) {
- ctx->light_meta = av_content_light_metadata_alloc(&size);
+ sd = av_frame_side_data_get(inlink->side_data, inlink->nb_side_data,
+ AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
+ if (sd) {
+ ctx->light_meta = av_memdup(sd->data, sd->size);
if (!ctx->light_meta)
return AVERROR(ENOMEM);
-
- ret = sscanf(ctx->max_cll,
- "%hu,%hu",
- (uint16_t*)&ctx->light_meta->MaxCLL,
- (uint16_t*)&ctx->light_meta->MaxFALL
- );
-
- if (ret != total_max_cll_args) {
- av_freep(ctx->light_meta);
- ctx->light_meta = NULL;
- av_log(avctx, AV_LOG_ERROR, "failed to parse max_cll option\n");
- return AVERROR(EINVAL);
- }
}
if (ctx->light_meta || ctx->master_display) {
@@ -228,8 +183,6 @@ static int amf_filter_config_output(AVFilterLink *outlink)
hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer);
}
- } else {
- av_log(avctx, AV_LOG_WARNING, "master_display/max_cll options are
applicable only if in_trc is set to SMPTE2084\n");
}
}
@@ -316,13 +269,6 @@ static const AVOption vpp_amf_options[] = {
{ "force_divisible_by", "enforce that the output resolution is divisible
by a defined integer when force_original_aspect_ratio is used",
OFFSET(force_divisible_by), AV_OPT_TYPE_INT, { .i64 = 1}, 1, 256, FLAGS },
{ "reset_sar", "reset SAR to 1 and scale to square pixels if scaling
proportionally", OFFSET(reset_sar), AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, FLAGS
},
- { "master_display",
- "set SMPTE2084 mastering display color volume info using libx265-style
parameter string (G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)).",
- OFFSET(disp_master), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS
- },
-
- { "max_cll", "set SMPTE2084 Max CLL and Max FALL values using
libx265-style parameter string (%hu,%hu)", OFFSET(max_cll), AV_OPT_TYPE_STRING,
{ .str = NULL }, 0, 0, FLAGS },
-
{ NULL },
};
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
