From: Christian König Date: Wed, 19 Feb 2014 17:49:17 +0000 (+0100) Subject: st/omx/dec/h264: fix prevFrameNumOffset handling X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=754fa3a0d22596eab4991b7b5dd7cf383bd2f138;p=mesa.git st/omx/dec/h264: fix prevFrameNumOffset handling Signed-off-by: Christian König --- diff --git a/src/gallium/state_trackers/omx/vid_dec_h264.c b/src/gallium/state_trackers/omx/vid_dec_h264.c index 5f4a261705c..7f1c2facc39 100644 --- a/src/gallium/state_trackers/omx/vid_dec_h264.c +++ b/src/gallium/state_trackers/omx/vid_dec_h264.c @@ -765,6 +765,8 @@ static void slice_header(vid_dec_PrivateType *priv, struct vl_rbsp *rbsp, else FrameNumOffset = priv->codec_data.h264.prevFrameNumOffset; + priv->codec_data.h264.prevFrameNumOffset = FrameNumOffset; + if (sps->num_ref_frames_in_pic_order_cnt_cycle != 0) absFrameNum = FrameNumOffset + frame_num; else @@ -814,6 +816,8 @@ static void slice_header(vid_dec_PrivateType *priv, struct vl_rbsp *rbsp, else FrameNumOffset = priv->codec_data.h264.prevFrameNumOffset; + priv->codec_data.h264.prevFrameNumOffset = FrameNumOffset; + if (IdrPicFlag) tempPicOrderCnt = 0; else if (nal_ref_idc == 0)