frontends/omx: initialize film_grain_target

set film_grain_target to NULL, and not using it
in omx path.

CC: 22.3
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20139>
(cherry picked from commit 7f71f732ea76e0376e58069200d19beb74b2cb62)

diff --git a/.pick_status.json b/.pick_status.json
index 5fed0d2..9e4c09e 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5854,7 +5854,7 @@
         "description": "frontends/omx: initialize film_grain_target",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },

diff --git a/src/gallium/frontends/omx/bellagio/vid_dec_av1.c b/src/gallium/frontends/omx/bellagio/vid_dec_av1.c
index a0a407c..7aab606 100644 (file)
--- a/src/gallium/frontends/omx/bellagio/vid_dec_av1.c
+++ b/src/gallium/frontends/omx/bellagio/vid_dec_av1.c
@@ -1638,6 +1638,7 @@ static void frame_header_obu(vid_dec_PrivateType *priv, struct vl_vlc *vlc)
 
    film_grain_params(priv, vlc);
 
+   priv->picture.av1.film_grain_target = NULL;
    priv->picture.av1.picture_parameter.pic_info_fields.frame_type = hdr->frame_type;
    priv->picture.av1.picture_parameter.pic_info_fields.show_frame = hdr->show_frame;
    priv->picture.av1.picture_parameter.pic_info_fields.error_resilient_mode =