Skip to content

correct dead loop when decode level 6 and above h264 stream #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wangqin1 wants to merge 3 commits into
base: intel-media-sg1
Choose a base branch
from
Open

correct dead loop when decode level 6 and above h264 stream #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ead76fe
Update umc_h264_task_supplier.h
wangqin1 Jan 2, 2024
77b792e
Update umc_h264_dec.h
wangqin1 Jan 8, 2024
56e6428
Update umc_h264_task_supplier.h
wangqin1 Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions _studio/shared/umc/codec/h264_dec/include/umc_h264_dec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,7 @@ class H264VideoDecoderParams : public VideoDecoderParams
H264_LEVEL_61 = 61,
H264_LEVEL_62 = 62,

#if (MFX_VERSION >= MFX_VERSION_NEXT)
H264_LEVEL_MAX = 62,
#else
H264_LEVEL_MAX = 52,
#endif

H264_LEVEL_9 = 9 // for SVC profiles
};
Expand Down
8 changes: 2 additions & 6 deletions _studio/shared/umc/codec/h264_dec/include/umc_h264_task_supplier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,13 +724,11 @@ inline int32_t CalculateDPBSize(uint8_t & level_idc, int32_t width, int32_t heig
case H264VideoDecoderParams::H264_LEVEL_52:
MaxDPBMbs = 184320;
break;
#if (MFX_VERSION >= MFX_VERSION_NEXT)
case H264VideoDecoderParams::H264_LEVEL_6:
case H264VideoDecoderParams::H264_LEVEL_61:
case H264VideoDecoderParams::H264_LEVEL_62:
MaxDPBMbs = 696320;
break;
#endif
default:
// We don't support level greater than 5.2 but
// relax resolution constrains up to 4K, hence
Expand Down Expand Up @@ -792,15 +790,13 @@ inline int32_t CalculateDPBSize(uint8_t & level_idc, int32_t width, int32_t heig
// can be used to calculate the DPB size.
case H264VideoDecoderParams::H264_LEVEL_51:
case H264VideoDecoderParams::H264_LEVEL_52:
level_idc = H264VideoDecoderParams::H264_LEVEL_52;
level_idc = H264VideoDecoderParams::H264_LEVEL_6;
break;
#if (MFX_VERSION >= MFX_VERSION_NEXT)
case H264VideoDecoderParams::H264_LEVEL_6:
case H264VideoDecoderParams::H264_LEVEL_61:
case H264VideoDecoderParams::H264_LEVEL_62:
level_idc = H264VideoDecoderParams::H264_LEVEL_MAX;
level_idc = INTERNAL_MAX_LEVEL;
break;
#endif
default:
throw h264_exception(UMC_ERR_FAILED);
}
Expand Down