diff options
| author | Leo Liu <leo.liu@amd.com> | 2015-02-23 13:50:06 -0500 |
|---|---|---|
| committer | Leo Liu <leo.liu@amd.com> | 2015-02-24 10:39:49 -0500 |
| commit | 9c7b343bc0a6aa6065055cbc1c0a891ccc445984 (patch) | |
| tree | 062c33d4bbe95d3af96acf0c7201f6626deb2de6 /src/gallium/state_trackers/omx | |
| parent | fece147be53880ac8e8e5e2863f91cdd01d98b5c (diff) | |
| download | external_mesa3d-9c7b343bc0a6aa6065055cbc1c0a891ccc445984.zip external_mesa3d-9c7b343bc0a6aa6065055cbc1c0a891ccc445984.tar.gz external_mesa3d-9c7b343bc0a6aa6065055cbc1c0a891ccc445984.tar.bz2 | |
st/omx/dec/h264: fix picture out-of-order with poc type 0 v2
poc counter should be reset with IDR frame,
otherwise there would be a re-order issue with
frames before and after IDR
v2: add commit message
Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Cc: "10.4 10.5" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/gallium/state_trackers/omx')
| -rw-r--r-- | src/gallium/state_trackers/omx/vid_dec_h264.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/omx/vid_dec_h264.c b/src/gallium/state_trackers/omx/vid_dec_h264.c index 7b57785..e01e873 100644 --- a/src/gallium/state_trackers/omx/vid_dec_h264.c +++ b/src/gallium/state_trackers/omx/vid_dec_h264.c @@ -706,6 +706,11 @@ static void slice_header(vid_dec_PrivateType *priv, struct vl_rbsp *rbsp, if (pic_order_cnt_lsb != priv->codec_data.h264.pic_order_cnt_lsb) vid_dec_h264_EndFrame(priv); + if (IdrPicFlag) { + priv->codec_data.h264.pic_order_cnt_msb = 0; + priv->codec_data.h264.pic_order_cnt_lsb = 0; + } + if ((pic_order_cnt_lsb < priv->codec_data.h264.pic_order_cnt_lsb) && (priv->codec_data.h264.pic_order_cnt_lsb - pic_order_cnt_lsb) >= (max_pic_order_cnt_lsb / 2)) pic_order_cnt_msb = priv->codec_data.h264.pic_order_cnt_msb + max_pic_order_cnt_lsb; |