Fixed the issue that QSV VPP tonemap cannot be triggered

VPL requires at least one type of the metadata to trigger tone-mapping. Signed-off-by: nyanmisaka <[email protected]>
jellyfin · Sep 5, 2024 · 1b57fb0 · 1b57fb0
1 parent ca08a83
commit 1b57fb0
Showing 1 changed file with 33 additions and 6 deletions.
diff --git a/debian/patches/0021-add-fixes-for-qsv-vpp-filters.patch b/debian/patches/0021-add-fixes-for-qsv-vpp-filters.patch
@@ -166,7 +166,34 @@ Index: FFmpeg/libavfilter/vf_vpp_qsv.c
  static int vpp_set_frame_ext_params(AVFilterContext *ctx, const AVFrame *in, AVFrame *out,  QSVVPPFrameParam *fp)
  {
  #if QSV_ONEVPL
-@@ -494,9 +518,9 @@ static int vpp_set_frame_ext_params(AVFi
+@@ -461,14 +485,19 @@ static int vpp_set_frame_ext_params(AVFi
+
+     memset(&clli_conf, 0, sizeof(mfxExtContentLightLevelInfo));
+     sd = av_frame_get_side_data(in, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
+-    if (vpp->tonemap && sd) {
+-        AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data;
++    if (vpp->tonemap) {
++        AVContentLightMetadata *clm = sd ? (AVContentLightMetadata *)sd->data : NULL;
+
+-        clli_conf.Header.BufferId         = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
+-        clli_conf.Header.BufferSz         = sizeof(mfxExtContentLightLevelInfo);
+-        clli_conf.MaxContentLightLevel    = FFMIN(clm->MaxCLL,  65535);
+-        clli_conf.MaxPicAverageLightLevel = FFMIN(clm->MaxFALL, 65535);
+-        tm = 1;
++        // Dumped from VP HAL, VPL requires at least one type of the metadata to trigger tone-mapping
++        #define HAL_HDR_DEFAULT_MAXCLL 4000
++        #define HAL_HDR_DEFAULT_MAXFALL 400
++        if (clm || !tm) {
++            clli_conf.Header.BufferId         = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
++            clli_conf.Header.BufferSz         = sizeof(mfxExtContentLightLevelInfo);
++            clli_conf.MaxContentLightLevel    = FFMIN(clm ? clm->MaxCLL  : HAL_HDR_DEFAULT_MAXCLL,  65535);
++            clli_conf.MaxPicAverageLightLevel = FFMIN(clm ? clm->MaxFALL : HAL_HDR_DEFAULT_MAXFALL, 65535);
++            tm = 1;
++        }
+     }
+
+     if (tm) {
+@@ -494,9 +523,9 @@ static int vpp_set_frame_ext_params(AVFi
      outvsi_conf.Header.BufferId          = MFX_EXTBUFF_VIDEO_SIGNAL_INFO_OUT;
      outvsi_conf.Header.BufferSz          = sizeof(mfxExtVideoSignalInfo);
      outvsi_conf.VideoFullRange           = (out->color_range == AVCOL_RANGE_JPEG);
@@ -179,7 +206,7 @@ Index: FFmpeg/libavfilter/vf_vpp_qsv.c
      outvsi_conf.ColourDescriptionPresent = 1;
 
      if (memcmp(&vpp->invsi_conf, &invsi_conf, sizeof(mfxExtVideoSignalInfo)) ||
-@@ -686,12 +710,24 @@ static int config_output(AVFilterLink *o
+@@ -686,12 +715,24 @@ static int config_output(AVFilterLink *o
 
      if (inlink->w != outlink->w || inlink->h != outlink->h || in_format != vpp->out_format) {
          if (QSV_RUNTIME_VERSION_ATLEAST(mfx_version, 1, 19)) {
@@ -208,7 +235,7 @@ Index: FFmpeg/libavfilter/vf_vpp_qsv.c
 
              INIT_MFX_EXTBUF(scale_conf, MFX_EXTBUFF_VPP_SCALING);
              SET_MFX_PARAM_FIELD(scale_conf, ScalingMode, mode);
-@@ -880,19 +916,13 @@ static const AVOption vpp_options[] = {
+@@ -880,19 +921,13 @@ static const AVOption vpp_options[] = {
      { "height", "Output video height(0=input video height, -1=keep input video aspect)", OFFSET(oh), AV_OPT_TYPE_STRING, { .str="w*ch/cw" }, 0, 255, .flags = FLAGS },
      { "format", "Output pixel format", OFFSET(output_format_str), AV_OPT_TYPE_STRING, { .str = "same" }, .flags = FLAGS },
      { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = 4 }, 0, INT_MAX, .flags = FLAGS },
@@ -229,7 +256,7 @@ Index: FFmpeg/libavfilter/vf_vpp_qsv.c
 
      { "rate", "Generate output at frame rate or field rate, available only for deinterlace mode",
        OFFSET(field_rate), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS, .unit = "rate" },
-@@ -923,8 +953,9 @@ static const AVOption vpp_options[] = {
+@@ -923,8 +958,9 @@ static const AVOption vpp_options[] = {
      { "out_color_transfer", "Output color transfer characteristics",
        OFFSET(color_transfer_str),  AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS },
 
@@ -240,7 +267,7 @@ Index: FFmpeg/libavfilter/vf_vpp_qsv.c
      { NULL }
  };
 
-@@ -978,19 +1009,14 @@ static const AVOption qsvscale_options[]
+@@ -978,19 +1014,14 @@ static const AVOption qsvscale_options[]
      { "h",      "Output video height(0=input video height, -1=keep input video aspect)", OFFSET(oh), AV_OPT_TYPE_STRING, { .str = "ih"   }, .flags = FLAGS },
      { "format", "Output pixel format", OFFSET(output_format_str), AV_OPT_TYPE_STRING, { .str = "same" }, .flags = FLAGS },
 
@@ -262,7 +289,7 @@ Index: FFmpeg/libavfilter/vf_vpp_qsv.c
      { NULL },
  };
 
-@@ -1015,6 +1041,7 @@ static const AVOption qsvdeint_options[]
+@@ -1015,6 +1046,7 @@ static const AVOption qsvdeint_options[]
      { "bob",   "bob algorithm",                  0, AV_OPT_TYPE_CONST,      {.i64 = MFX_DEINTERLACING_BOB}, MFX_DEINTERLACING_BOB, MFX_DEINTERLACING_ADVANCED, FLAGS, .unit = "mode"},
      { "advanced", "Motion adaptive algorithm",   0, AV_OPT_TYPE_CONST, {.i64 = MFX_DEINTERLACING_ADVANCED}, MFX_DEINTERLACING_BOB, MFX_DEINTERLACING_ADVANCED, FLAGS, .unit = "mode"},