From: Leo Liu Date: Fri, 23 Sep 2016 15:42:16 +0000 (-0400) Subject: st/omx/dec/h265: set the default reference picture set for reference X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c50b68e6a882c95b58f46fba87c8f3531a2913d1;p=mesa.git st/omx/dec/h265: set the default reference picture set for reference It will fix the corruption for frame, that only has one stort term ref picture set, we set NULL rps for this case previously, causing taking incorrect reference. Instead we should take that only short term set as reference Signed-off-by: Leo Liu Reviewed-by: Emil Velikov --- diff --git a/src/gallium/state_trackers/omx/vid_dec_h265.c b/src/gallium/state_trackers/omx/vid_dec_h265.c index f3bf66f783c..acd225d9921 100644 --- a/src/gallium/state_trackers/omx/vid_dec_h265.c +++ b/src/gallium/state_trackers/omx/vid_dec_h265.c @@ -656,7 +656,7 @@ static void slice_header(vid_dec_PrivateType *priv, struct vl_rbsp *rbsp, struct pipe_h265_sps *sps; bool first_slice_segment_in_pic_flag; bool dependent_slice_segment_flag = false; - struct ref_pic_set *rps = NULL; + struct ref_pic_set *rps; unsigned poc_lsb, poc_msb, slice_prev_poc; unsigned max_poc_lsb, prev_poc_lsb, prev_poc_msb; unsigned num_st_rps; @@ -789,7 +789,9 @@ static void slice_header(vid_dec_PrivateType *priv, struct vl_rbsp *rbsp, rps = (struct ref_pic_set *) priv->codec_data.h265.ref_pic_set_list + idx; - } + } else + rps = (struct ref_pic_set *) + priv->codec_data.h265.ref_pic_set_list; if (is_bla_picture(nal_unit_type)) { rps->num_neg_pics = 0;