From patchwork Wed Aug 22 23:45:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10081 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1442289jap; Wed, 22 Aug 2018 16:48:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaoUgju/czDFy5AHsPo0S97bBO+PCdDuReQuGx8SEH2Yx8bJ5Rjzm6RkcNi7KAbfVUsenvW X-Received: by 2002:a1c:ea91:: with SMTP id g17-v6mr3618750wmi.65.1534981688567; Wed, 22 Aug 2018 16:48:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534981688; cv=none; d=google.com; s=arc-20160816; b=PYdtw9rtllJW2Ui/SBmktyM/sY/TcePKhs1ZzrtTYkvMuq1nm1EGwUH1Y6ug/wWhpn qpo6zNMnVijbqDnYNTCSN5KOnklJBV5HKV5FPsEt4+w2UUuhUA45t+vgd/AdhjiHnxzT qLToXMTL1rx/OL7pCN4/VlqqLK5FbONNfPqSiDlLwG7kmQ3ivWejAjxEW6dc3WR1wiPe g1aJZBue3dOgN0svaA+U0cn8EU6A5Lc4Cv8S32BlpUETjYuaAlzfIlxyOmhUdVAtgB4E a/kRO2lK5IQF6kGHtErRy7OCDZif/6Chol5ucDQi3nravuDU20J8jye7FroEbuaBUfMD NRLg== 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:arc-authentication-results; bh=UfR4FZ2wCx5wiMBrdvMS23xZlDjp++OulkMKvIUQQ1c=; b=Dm/5P/oK8dq124r8klDK81i0zD+gZs8iNn8dECENTY9fCEIcKiaWQD0WwpycYECm+D tyqVHFCuyVXhw2c3hHvapTv08wZZ/dTRwByc1u8OfN+jmg53cwzUSqsCe2Tu9zVa7s8c 7Dr76IMThV9WUa5BNSKrdztsXc4HOtd7m6E27XZFR5hkvZVb7vKVa5qKlpy5FeJGcZOg ZbVROUC5ubNfG1kKr/PFWN1PhEe9SkJ9su2+bBetfzuTDJzu7yeVRbsY2Olxe7QvHU8k mEZuD9cDYpxq8R2Ck8GzO/waOKvmMsIoFi2oO3hvbwvKQ67c3hVkLoaMwa76Tjbb8rDG T/5A== 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=teLSCcH2; 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 l6-v6si1761050wrr.340.2018.08.22.16.48.08; Wed, 22 Aug 2018 16:48:08 -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=teLSCcH2; 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 902DB689EC0; Thu, 23 Aug 2018 02:45:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12FA8689D62 for ; Thu, 23 Aug 2018 02:45:47 +0300 (EEST) Received: by mail-wm0-f43.google.com with SMTP id f21-v6so3441307wmc.5 for ; Wed, 22 Aug 2018 16:45:49 -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=bHjvV9cGeSo/+YZ4Dg8E5v24HgAFAnGxDNTifOeJXp8=; b=teLSCcH2AkSrNUfn+37BrDYkcpejRjq+912O87fn5RiaYBSMbXgeWFiO9QhZ1XnnT2 SYyzHCuEzAN/x/W4V/358ObPx9bODIzWySM6kLFMIRWn/z/4QudL1+tmHHvLZpJhNEVH tKBZfkXhjj1cTky0b260MmY23qq3EZMvGRpN48MXlQFpaIRiEcX8BnMib5ZC71oZafR4 7kYU5mUuvBu8SauKRfhGVcghtf1uwR/J15dL4LBcevkJ3LbvdsvumUpMwsPxxszdCc7t pC1kRZDlYaw9MWJAJ2mKxaeUhK/rSUBdL8Ng1xUes1z3kSm7x7+yxTwHT+NNj5NrIEf9 iTgg== 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=bHjvV9cGeSo/+YZ4Dg8E5v24HgAFAnGxDNTifOeJXp8=; b=kH4ye94j6R0bzm6A3ELT03Xymv9WiFHEi8+0Kg3whm8R1oFW9tNP0GMIC0fNv0RVel oIRi496NESBCF6XMfPKecqgiiI6ZjWQ1/W1ijxgMSYk2UPRhi+TxHywkcGfjtGLyIMjo UAhCFCOFZAA28gpBKYSD7wmPJ4NBYNQMTt8oucbv9U4tvU1euPugEvK8EtQeDPRoaFmq SyYfl+Gk3Onsv4A/4DPg4gRnnMC9HP0n7rmNwlES9u5HfsYhxooLVlw63ymqTH+JS/TA biEBGQx6XYKELfkxpT5arq2qk5ZLX4eNkiqDySeryf9OwYkAGjZvsQ0uEjZHiVdinUOR kr5g== X-Gm-Message-State: APzg51CKxiVM/1oMD0Qc7NBC0XUw7m+HvXMx9Hc29KuehHpZqj+W8/b+ eXqbWlRttXhLhh4US4o02BQVbT3XvpE= X-Received: by 2002:a1c:752:: with SMTP id 79-v6mr3833890wmh.59.1534981548485; Wed, 22 Aug 2018 16:45:48 -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 x82-v6sm8184537wmd.11.2018.08.22.16.45.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 16:45:47 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 00:45:00 +0100 Message-Id: <20180822234514.10571-28-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180822234514.10571-1-sw@jkqxz.net> References: <20180822234514.10571-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v3 27/41] 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/vaapi_encode_h264.c | 40 ++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) 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"