From patchwork Tue Sep 18 22:30:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10378 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp13128jap; Tue, 18 Sep 2018 15:34:30 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda6gq7bq1DIENSenumhkWOnXED/zRgt/XPDn4BhLRbduBy0pBOcAs3edHB9qH8YIKxN+dq4 X-Received: by 2002:a1c:ed4:: with SMTP id 203-v6mr16469635wmo.96.1537310070413; Tue, 18 Sep 2018 15:34:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537310070; cv=none; d=google.com; s=arc-20160816; b=GfOjD+GgLQUlLl8L/CWEnY3vkL6AhdZMNGyRZWrXdXrcTk1ljdHZXrGdDQ5/vg/xO7 c8jfeNvnP7CFx65IgmuZbSOuFStSp/mjI+tTbuPToO+L3OhOp6RZYyN08IuLqhMwuv8o sfuPLZN8he/ziHYnRHikBR8zlHCKfqqLTvBaCzkySaQs7bSc+xG4APh3oIazfKOTgQjt Ad9uJNBkXg5Yu1MsC1axRUpP/D77eVI32Af4zK0VPptYW1nqttEXz2/S4mNFgcw0kW6L 0PRuf3IJvMpehSOQTfeYzu2KzGs8DXfDF9HM4kVmpuv7sfJzdP52IwA2ejqvd5P2uaOO Y6RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Au9xh+rzfPbGgPopos+vGGT+FvvxEP0XgkbYHQQEyes=; b=nYX1d2WgBLvyuM1SzTFBNiF61mD3/iVFai8Q/OoQqvNYVKc7blE11w1/Zhs70shfX2 YB4cS1P+7y/kQ6J3SxrV1N4cLSvZlcMdg+v3kcIAKcPXDixWOHuIz1JyC3Mo2Ve/+NIe +Ck+14VnYyE1bbu42n/iXpDlj8x9Rt61tabd2sTcsv2T9Wd/Q7pxMAi3hce/JJH9hrMz /G+CXwEcFVYwJvZVvHAroV1oXaq4H1uLoKPJ2x/DA5OLUgmP/t93u+ursCBI4WagnwbI KrIeCs9LnqL4vAJMfSpGuO3yOSSo7BcmG5qLRFL17qT7/Nk+3JUBcfb/AXGZ5ujvMgt4 kaaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=ilo0RN7F; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d7-v6si3758154wrv.239.2018.09.18.15.34.28; Tue, 18 Sep 2018 15:34:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=ilo0RN7F; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D31068A5F3; Wed, 19 Sep 2018 01:31:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1217668A564 for ; Wed, 19 Sep 2018 01:31:29 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id s14-v6so3728013wrw.6 for ; Tue, 18 Sep 2018 15:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=pPIr4Hr76fNqtpgge/hGBtGzaK7/VPWcC0EewRYg6Zg=; b=ilo0RN7FxDGOjFjdNH5nK8l1PtC2FHdHWcR+xojya5pGz5iH074Z8oVNtdVp3IA6Vu bCnRtQLxkOxyRAbv0qmPCffhqNr2cXQM7Rsk8rE+XRuzeYMhtQIxdF8ErVFEXO3kv3kW OUFSn5OmLbZxwvn1ifMIkBoSnvsI/lwWn8E/U6CJhuBJ/sbKk6YZ6R4tZ0kXxC//wuvt MEwt4hAcGYsaWDkSvk4VDq4LaxBSZSWFD9Bxg9InrCFOTb0+DcYLGzpiaR7BjuPTA5jM nYMCg50POGmr8NPWXjJJjbuGWGQ47C2vaXt6/KJbiCoHrV/ICzMqgUYRrCnyf3ByHW6K 5HaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pPIr4Hr76fNqtpgge/hGBtGzaK7/VPWcC0EewRYg6Zg=; b=PfpSpD8wVYbJXdNtDWeZS7FGTbXnilGc2Pjjke0qDAzVQrJP1cy1Ob4sFRoAA3zcJP CdFNHQ3zYdnt9zFc0lOEGiW+fBW8TJt2ct1nVkao95djZV+cgbi/fnhq0bHOUr0L0nll yfkXLTDH4ciQu32RdjgHLQgU+yeNm2QZNrqvMNJyF7zME1oeUwZ6XYhJJnj5Bgrb7ojB XqFB5rZ7G39khuN5fPMVQ9FNvSArWgC/TGb9MZBg/hGEObbertP2Dl6sxA8tpsa49Na4 EuJOUfgQ6dGG5msIWcRKjNOWmpRFBiTB+4FeAU8ksEXcAe1RQ9oeZiUrztsRm0/U1MgB bnxg== X-Gm-Message-State: APzg51CKpjmbfZgns0S09oT5hA6i7Bq5vXgX9PivswkT1E4Lrp4BbeeQ +wSXh964R5I2MF7qK4wfQgysVd5u8IA= X-Received: by 2002:adf:ac38:: with SMTP id v53-v6mr25204424wrc.135.1537309902290; Tue, 18 Sep 2018 15:31:42 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id e141-v6sm4863826wmd.32.2018.09.18.15.31.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:41 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:30:58 +0100 Message-Id: <20180918223116.14322-21-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 20/38] vaapi_encode_h264: Set level based on stream if not set by user 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/Makefile | 2 +- libavcodec/vaapi_encode_h264.c | 40 ++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a5a110c7b6..5e6f044ce0 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -355,7 +355,7 @@ OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec_h2645.o OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o OBJS-$(CONFIG_H264_RKMPP_DECODER) += rkmppdec.o -OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o +OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o h264_levels.o OBJS-$(CONFIG_H264_VIDEOTOOLBOX_ENCODER) += videotoolboxenc.o OBJS-$(CONFIG_H264_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_H264_V4L2M2M_ENCODER) += v4l2_m2m_enc.o diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 0774ec25f9..e55ed0f59c 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -30,6 +30,7 @@ #include "cbs.h" #include "cbs_h264.h" #include "h264.h" +#include "h264_levels.h" #include "h264_sei.h" #include "internal.h" #include "vaapi_encode.h" @@ -294,6 +295,7 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) H264RawPPS *pps = &priv->raw_pps; VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params; VAEncPictureParameterBufferH264 *vpic = ctx->codec_picture_params; + int dpb_frames; memset(&priv->current_access_unit, 0, sizeof(priv->current_access_unit)); @@ -319,7 +321,32 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->constraint_set5_flag = ctx->b_per_p == 0; } - sps->level_idc = avctx->level; + if (ctx->gop_size == 1) + dpb_frames = 0; + else + dpb_frames = 1 + (ctx->b_per_p > 0); + + if (avctx->level != FF_LEVEL_UNKNOWN) { + sps->level_idc = avctx->level; + } else { + const H264LevelDescriptor *level; + + level = ff_h264_guess_level(sps->profile_idc, + avctx->bit_rate, + priv->mb_width * 16, + priv->mb_height * 16, + dpb_frames); + if (level) { + av_log(avctx, AV_LOG_VERBOSE, "Using level %s.\n", level->name); + if (level->constraint_set3_flag) + sps->constraint_set3_flag = 1; + sps->level_idc = level->level_idc; + } else { + av_log(avctx, AV_LOG_WARNING, "Stream will not conform " + "to any level: using level 6.2.\n"); + sps->level_idc = 62; + } + } sps->seq_parameter_set_id = 0; sps->chroma_format_idc = 1; @@ -329,8 +356,7 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->log2_max_pic_order_cnt_lsb_minus4 = av_clip(av_log2(ctx->b_per_p + 1) - 2, 0, 12); - sps->max_num_ref_frames = - ctx->gop_size == 1 ? 0 : 1 + (ctx->b_per_p > 0); + sps->max_num_ref_frames = dpb_frames; sps->pic_width_in_mbs_minus1 = priv->mb_width - 1; sps->pic_height_in_map_units_minus1 = priv->mb_height - 1; @@ -938,6 +964,12 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) return AVERROR_PATCHWELCOME; } + if (avctx->level != FF_LEVEL_UNKNOWN && avctx->level & ~0xff) { + av_log(avctx, AV_LOG_ERROR, "Invalid level %d: must fit " + "in 8-bit unsigned integer.\n", avctx->level); + return AVERROR(EINVAL); + } + ctx->desired_packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE | // SPS and PPS. VA_ENC_PACKED_HEADER_SLICE | // Slice headers. @@ -1005,7 +1037,7 @@ static const AVOption vaapi_encode_h264_options[] = { { "level", "Set level (level_idc)", OFFSET(level), AV_OPT_TYPE_INT, - { .i64 = 51 }, 0x00, 0xff, FLAGS, "level" }, + { .i64 = FF_LEVEL_UNKNOWN }, FF_LEVEL_UNKNOWN, 0xff, FLAGS, "level" }, #define LEVEL(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \ { .i64 = value }, 0, 0, FLAGS, "level"