RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/h264_levels: add MaxMBPS checking and update fate test. 

1. add MaxMBPS checking for level idc setting to align with AVC spec
   AnnexA table A-1/A-6 level limits.
2. update h264 level fate test.

Signed-off-by: Decai Lin <decai.lin@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Decai Lin 2019-03-20 17:14:47 +08:00 committed by Mark Thompson
parent 1e34014010
commit ec1e4a8baf
5 changed files with 74 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264_levels.c
View File

@ -89,6 +89,7 @@ const H264LevelDescriptor *ff_h264_get_level(int level_idc,
const H264LevelDescriptor *ff_h264_guess_level(int profile_idc,
int64_t bitrate,
int framerate,
int width, int height,
int max_dec_frame_buffering)
{
@ -120,6 +121,9 @@ const H264LevelDescriptor *ff_h264_guess_level(int profile_idc,
FFMIN(level->max_dpb_mbs / (width_mbs * height_mbs), 16);
if (max_dec_frame_buffering > max_dpb_frames)
continue;
if (framerate > (level->max_mbps / (width_mbs * height_mbs)))
continue;
}
return level;

1
libavcodec/h264_levels.h
View File

@ -46,6 +46,7 @@ const H264LevelDescriptor *ff_h264_get_level(int level_idc,
*/
const H264LevelDescriptor *ff_h264_guess_level(int profile_idc,
int64_t bitrate,
int framerate,
int width, int height,
int max_dec_frame_buffering);

8
libavcodec/h264_metadata_bsf.c
View File

@ -223,6 +223,7 @@ static int h264_metadata_update_sps(AVBSFContext *bsf,
const H264LevelDescriptor *desc;
int64_t bit_rate;
int width, height, dpb_frames;
int framerate;
if (sps->vui.nal_hrd_parameters_present_flag) {
bit_rate = (sps->vui.nal_hrd_parameters.bit_rate_value_minus1[0] + 1) *
@ -244,7 +245,12 @@ static int h264_metadata_update_sps(AVBSFContext *bsf,
height = 16 * (sps->pic_height_in_map_units_minus1 + 1) *
(2 - sps->frame_mbs_only_flag);
desc = ff_h264_guess_level(sps->profile_idc, bit_rate,
if (sps->vui.timing_info_present_flag)
framerate = sps->vui.time_scale / sps->vui.num_units_in_tick / 2;
else
framerate = 0;
desc = ff_h264_guess_level(sps->profile_idc, bit_rate, framerate,
width, height, dpb_frames);
if (desc) {
level_idc = desc->level_idc;

58
libavcodec/tests/h264_levels.c
View File

@ -59,6 +59,48 @@ static const struct {
{ 16896, 1, 0 },
};
static const struct {
int width;
int height;
int framerate;
int level_idc;
} test_framerate[] = {
// Some typical sizes and frame rates.
// (From H.264 table A-1 and table A-6)
{ 176, 144, 15, 10 },
{ 176, 144, 16, 11 },
{ 320, 240, 10, 11 },
{ 320, 240, 20, 12 },
{ 320, 240, 40, 21 },
{ 352, 288, 30, 13 },
{ 352, 288, 51, 22 },
{ 352, 576, 25, 21 },
{ 352, 576, 26, 30 },
{ 640, 480, 33, 30 },
{ 640, 480, 34, 31 },
{ 720, 480, 50, 31 },
{ 720, 576, 25, 30 },
{ 800, 600, 55, 31 },
{ 1024, 768, 35, 31 },
{ 1024, 768, 70, 32 },
{ 1280, 720, 30, 31 },
{ 1280, 720, 31, 32 },
{ 1280, 960, 45, 32 },
{ 1280, 960, 46, 40 },
{ 1280, 1024, 42, 32 },
{ 1600, 1200, 32, 40 },
{ 1600, 1200, 33, 42 },
{ 1920, 1088, 30, 40 },
{ 1920, 1088, 55, 42 },
{ 2048, 1024, 30, 40 },
{ 2048, 1024, 62, 42 },
{ 2048, 1088, 60, 42 },
{ 3680, 1536, 26, 50 },
{ 4096, 2048, 30, 51 },
{ 4096, 2048, 59, 52 },
{ 4096, 2160, 60, 52 },
};
static const struct {
int width;
int height;
@ -147,14 +189,23 @@ int main(void)
} while (0)
for (i = 0; i < FF_ARRAY_ELEMS(test_sizes); i++) {
level = ff_h264_guess_level(0, 0, test_sizes[i].width,
level = ff_h264_guess_level(0, 0, 0, test_sizes[i].width,
test_sizes[i].height, 0);
CHECK(test_sizes[i].level_idc, "size %dx%d",
test_sizes[i].width, test_sizes[i].height);
}
for (i = 0; i < FF_ARRAY_ELEMS(test_framerate); i++) {
level = ff_h264_guess_level(0, 0, test_framerate[i].framerate,
test_framerate[i].width,
test_framerate[i].height, 0);
CHECK(test_framerate[i].level_idc, "framerate %d, size %dx%d",
test_framerate[i].framerate, test_framerate[i].width,
test_framerate[i].height);
}
for (i = 0; i < FF_ARRAY_ELEMS(test_dpb); i++) {
level = ff_h264_guess_level(0, 0, test_dpb[i].width,
level = ff_h264_guess_level(0, 0, 0, test_dpb[i].width,
test_dpb[i].height,
test_dpb[i].dpb_size);
CHECK(test_dpb[i].level_idc, "size %dx%d dpb %d",
@ -165,7 +216,7 @@ int main(void)
for (i = 0; i < FF_ARRAY_ELEMS(test_bitrate); i++) {
level = ff_h264_guess_level(test_bitrate[i].profile_idc,
test_bitrate[i].bitrate,
0, 0, 0);
0, 0, 0, 0);
CHECK(test_bitrate[i].level_idc, "bitrate %"PRId64" profile %d",
test_bitrate[i].bitrate, test_bitrate[i].profile_idc);
}
@ -173,6 +224,7 @@ int main(void)
for (i = 0; i < FF_ARRAY_ELEMS(test_all); i++) {
level = ff_h264_guess_level(test_all[i].profile_idc,
test_all[i].bitrate,
0,
test_all[i].width,
test_all[i].height,
test_all[i].dpb_frames);

7
libavcodec/vaapi_encode_h264.c
View File

@ -329,9 +329,16 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx)
sps->level_idc = avctx->level;
} else {
const H264LevelDescriptor *level;
int framerate;
if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
framerate = avctx->framerate.num / avctx->framerate.den;
else
framerate = 0;
level = ff_h264_guess_level(sps->profile_idc,
avctx->bit_rate,
framerate,
priv->mb_width * 16,
priv->mb_height * 16,
priv->dpb_frames);