From patchwork Wed Mar 6 08:21:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Decai Lin X-Patchwork-Id: 12214 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7344944777C for ; Wed, 6 Mar 2019 10:22:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52361689FA6; Wed, 6 Mar 2019 10:22:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74E706805D8 for ; Wed, 6 Mar 2019 10:22:41 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Mar 2019 00:22:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,447,1544515200"; d="scan'208";a="120012929" Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([172.16.181.59]) by orsmga007.jf.intel.com with ESMTP; 06 Mar 2019 00:22:37 -0800 From: Decai Lin To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2019 16:21:15 +0800 Message-Id: <1551860475-25819-1-git-send-email-decai.lin@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] lavc/h264_levels: add MaxMBPS checking and update fate test. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Decai Lin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- libavcodec/h264_levels.c | 5 +++++ libavcodec/h264_levels.h | 1 + libavcodec/h264_metadata_bsf.c | 14 +++++++++++++- libavcodec/tests/h264_levels.c | 41 ++++++++++++++++++++++++++++++++++++++--- libavcodec/vaapi_encode_h264.c | 13 +++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_levels.c b/libavcodec/h264_levels.c index 7a55116..e457dbe 100644 --- a/libavcodec/h264_levels.c +++ b/libavcodec/h264_levels.c @@ -89,11 +89,13 @@ 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) { int width_mbs = (width + 15) / 16; int height_mbs = (height + 15) / 16; + int64_t mb_processing_rate = (int64_t) (width_mbs * height_mbs * framerate); int no_cs3f = !(profile_idc == 66 || profile_idc == 77 || profile_idc == 88); @@ -108,6 +110,9 @@ const H264LevelDescriptor *ff_h264_guess_level(int profile_idc, if (bitrate > (int64_t)level->max_br * h264_get_br_factor(profile_idc)) continue; + if (mb_processing_rate > (int64_t)level->max_mbps) + continue; + if (width_mbs * height_mbs > level->max_fs) continue; if (width_mbs * width_mbs > 8 * level->max_fs) diff --git a/libavcodec/h264_levels.h b/libavcodec/h264_levels.h index 4189fc6..0a0f410 100644 --- a/libavcodec/h264_levels.h +++ b/libavcodec/h264_levels.h @@ -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); diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index a17987a..61c2711 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -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, fr_num, fr_den; if (sps->vui.nal_hrd_parameters_present_flag) { bit_rate = (sps->vui.nal_hrd_parameters.bit_rate_value_minus1[0] + 1) * @@ -244,7 +245,18 @@ 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 (ctx->tick_rate.num > 0 && ctx->tick_rate.den > 0) + av_reduce(&fr_num, &fr_den, + ctx->tick_rate.num, ctx->tick_rate.den, 65535); + else + av_reduce(&fr_num, &fr_den, + ctx->tick_rate.den, ctx->tick_rate.num, 65535); + if (fr_den > 0) + framerate = fr_num / fr_den; + else + framerate = fr_num; + + desc = ff_h264_guess_level(sps->profile_idc, bit_rate, framerate, width, height, dpb_frames); if (desc) { level_idc = desc->level_idc; diff --git a/libavcodec/tests/h264_levels.c b/libavcodec/tests/h264_levels.c index 0e00f05..6176c0b 100644 --- a/libavcodec/tests/h264_levels.c +++ b/libavcodec/tests/h264_levels.c @@ -62,6 +62,31 @@ static const struct { 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 }, + { 320, 240, 10, 11 }, + { 352, 288, 30, 13 }, + { 352, 576, 25, 21 }, + { 640, 480, 33, 30 }, + { 720, 576, 25, 30 }, + { 1024, 768, 35, 31 }, + { 1280, 720, 30, 31 }, + { 1280, 1024, 42, 32 }, + { 1920, 1088, 30, 40 }, + { 2048, 1024, 30, 40 }, + { 2048, 1088, 60, 42 }, + { 3680, 1536, 26, 50 }, + { 4096, 2048, 30, 51 }, + { 4096, 2160, 60, 52 }, +}; + +static const struct { + int width; + int height; int dpb_size; int level_idc; } test_dpb[] = { @@ -147,14 +172,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", @@ -164,7 +198,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, + test_bitrate[i].bitrate, 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 +207,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); diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 91be33f..7e7fd6a 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -329,9 +329,22 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->level_idc = avctx->level; } else { const H264LevelDescriptor *level; + int framerate, fr_num, fr_den; + + if (avctx->framerate.num > 0 && avctx->framerate.den > 0) + av_reduce(&fr_num, &fr_den, + avctx->framerate.num, avctx->framerate.den, 65535); + else + av_reduce(&fr_num, &fr_den, + avctx->time_base.den, avctx->time_base.num, 65535); + if (fr_den > 0) + framerate = fr_num / fr_den; + else + framerate = fr_num; level = ff_h264_guess_level(sps->profile_idc, avctx->bit_rate, + framerate, priv->mb_width * 16, priv->mb_height * 16, priv->dpb_frames);