author | shihong.zheng <shihong.zheng@amlogic.com> | 2019-12-17 12:44:13 (GMT) |
---|---|---|
committer | Zhi Zhou <zhi.zhou@amlogic.com> | 2019-12-19 10:24:57 (GMT) |
commit | a18da6451372c2a7c62065d9d6d6aabf014080ec (patch) | |
tree | 5ae12b298473687f37a1e8022a959c3c157d6fa6 | |
parent | b3456c9e4c1bdd011ab67758dd92129f390e5aca (diff) | |
download | media_modules-a18da6451372c2a7c62065d9d6d6aabf014080ec.zip media_modules-a18da6451372c2a7c62065d9d6d6aabf014080ec.tar.gz media_modules-a18da6451372c2a7c62065d9d6d6aabf014080ec.tar.bz2 |
vmh264: fix baseline fast output bug. [1/1]
PD#OTT-7765
Problem:
baseline h264 stream but reorder_pic_num is 2.
fast output set will cause output frame disorder.
Solution:
add reorder_pic_num check when set baseline
fast output 8.
Verify:
S905X
Change-Id: Ia6a5ace66296d0034404f7974b6e43de485ea997
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
-rw-r--r-- | drivers/frame_provider/decoder/h264_multi/vmh264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/frame_provider/decoder/h264_multi/vmh264.c b/drivers/frame_provider/decoder/h264_multi/vmh264.c index fec86ef..2b3e5c3 100644 --- a/drivers/frame_provider/decoder/h264_multi/vmh264.c +++ b/drivers/frame_provider/decoder/h264_multi/vmh264.c @@ -5621,7 +5621,8 @@ static irqreturn_t vh264_isr_thread_fn(struct vdec_s *vdec, int irq) true : false; } - if (!field_pic_flag && ((p_H264_Dpb->mSPS.profile_idc == BASELINE) || + if (!field_pic_flag && (((p_H264_Dpb->mSPS.profile_idc == BASELINE) && + (p_H264_Dpb->reorder_pic_num < 2)) || (((unsigned long)(hw->vh264_amstream_dec_info .param)) & 0x8))) { p_H264_Dpb->fast_output_enable = |