From patchwork Sun Apr 22 15:29:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8578 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2855134jad; Sun, 22 Apr 2018 08:32:34 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+sfjz+voEjUM8mL/AvM7Cgd3dqltP5EDWGlm1ZCHCCyoewEz9qCiylxJXb8HikQikfI8SN X-Received: by 2002:adf:ea4f:: with SMTP id j15-v6mr12090777wrn.4.1524411154608; Sun, 22 Apr 2018 08:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524411154; cv=none; d=google.com; s=arc-20160816; b=QRgsE3wzUPOgroOMVGwD2wyJKeYNzDYy2gGmhlfNEN2Ok8stCRC6ybhs0bvt/unm6Q fOaMz/Wd7LM6cwOXgTUvJl1u5fWy3aimzHFBEhvZGcJGhhJPsL34TWUiToQhtZFWmVrI oDpgmYFz4W8sZA6w0vEeZRjR5OrIc8rVDqymb0tcbKWoA5M2Cbk9aXHYwkXnGxrLIeWD G6PQbJd6lO/R4gx6L/YilQl2vBcb3zH8MGHcssDUELVau5cDnPkwcg320ywOOaTxeDhK R+aWoxVwBq9ZngnqfngPbobgWOt3JxEni4JgG5zii7+XPPYHb64dAnCO4ti4IepO10ld 9a1A== 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=jOpJUtgIvstaY5irmwKw0ehnX1g1Yjk7GGMbpUldcwA=; b=PTnIV6GoweTruxnToaVCUy7q+PoKntaledzk0QaHjvX4Lg3c35ECb4F6Bv/lSwsYdd eKcEPMdiSCBc+fmrEXK6Ui46BJwlhavVBHViStm2olayGt7KXTCGIh7+O8gQGbunu6Ut A56BwYfWV2y7buQV6+J6nBtNSsTHLE67yQODuU77bPRDpR2Otr5PMgoC74RBGH/+PDf0 dOOMcwZ6RYje1jbiui4yJo4CtW7i7iQdoyZPJqFb8enMgl5rPg1XJzwZ0tAYGYmDT3rc ga10cX5m8J+I0g1b1TSsVVtAEjJ1gEDX2kgLgedSJ3wXiNO3d8t0ufBJS7aY/zk/P8rh ZqyQ== 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=udPC5fwT; 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 c2-v6si7941786wre.238.2018.04.22.08.32.34; Sun, 22 Apr 2018 08:32:34 -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=udPC5fwT; 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 1760A68A399; Sun, 22 Apr 2018 18:29:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99DB968A30E for ; Sun, 22 Apr 2018 18:29:19 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id d1-v6so34560057wrj.13 for ; Sun, 22 Apr 2018 08:29:48 -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=OxN+NQhSObIOKNlXlUAQIrq1pz+/nYjpidvwXBzVNTY=; b=udPC5fwTkXo6D3bTYZy+RcDHcTnc6RUURtuwZy2dNntjxKSi2+dEQUcdFddX8P8IuU ZB4RQ2mvFrYDBNU8gPHogzrpWuuwYzGAHaDswVdiKXqI9T5MIf2CEjO1Z//eS5QLnlvC ZJtsTJcjrtujafJ0MC3kgAGWWzbdOdHpXhkG8CDB7o56LDHHS5CLzILao40J2eXhBgzv qdlGoue9qjLJjcKWh/mtpz32lUVI6vSJFE9JCNUbc4YunEaT+HkEmgEsMJPSJza9gGB+ r4+p0prWo4Ktb5xNuOvBga5s4n1CYvSveq/rx0NeS0qzzdUm4GtxOLz2651HXC0mxTXa Q4Aw== 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=OxN+NQhSObIOKNlXlUAQIrq1pz+/nYjpidvwXBzVNTY=; b=NLTedttc+JTV0VB3HSO+oeW6aeIhC1ZfjqU2Q5QIDKrIoZRKL33p3LhBSWwGiGAO/F ACkARAJpF+n6XlkbK/QFebVxu5LnpJzjADMQfDcbGSg7XrZfkkwbmUXahnZg3cuNLipC YxA+nSSF+eQ4jDBqF+X18zfS6drGBHxosLhpOQFBq6qsNm5gFkmv8UGnIXidYpKvTFgh no3CLKzH7wSacBDe6/BD+TV4SQVTo+KV4CnXX1mU66KM9/lBJVDbTDj6P/zNPal36Z0/ 9FKMsYU1gFAG4UKiCgrx+rdEYDCvtsQj5mtzCQi8L3gyDEyD/OaQ0UAlQmb3H/OGArQz UbmA== X-Gm-Message-State: ALQs6tAbGa6Jg2dY6NROJ9T/ey7q1GVmz1Sch+RcGE0+Fwc0pHwcB9JP o9npERT1CF+5ID+6mhYel3+MgSYD X-Received: by 2002:adf:9d15:: with SMTP id k21-v6mr12929005wre.213.1524410987868; Sun, 22 Apr 2018 08:29:47 -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 32-v6sm7021498wrf.79.2018.04.22.08.29.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 08:29:47 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 16:29:14 +0100 Message-Id: <20180422152921.32510-20-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180422152921.32510-1-sw@jkqxz.net> References: <20180422152921.32510-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 19/26] vaapi_encode_h264: Properly set constraint flags 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" constraint_set1_flag should be set for constrained baseline and main profiles, because the stream conforms to main profile. constraint_set3_flag should be set for high profile when the stream is intra-only. constraint_set4_flag should always be set for main and high profiles because interlaced encoding is not supported. constraint_set5_flag should be set for main and high profiles when B-frames are not used. Also fix the setting of max_num_ref_frames - use the gop_size value to check for intra-only rather than the constraint flag (which is not necessarily set). --- libavcodec/vaapi_encode_h264.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 9943baaa76..018a843932 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -303,10 +303,19 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->nal_unit_header.nal_unit_type = H264_NAL_SPS; sps->profile_idc = avctx->profile & 0xff; - sps->constraint_set1_flag = - !!(avctx->profile & FF_PROFILE_H264_CONSTRAINED); - sps->constraint_set3_flag = - !!(avctx->profile & FF_PROFILE_H264_INTRA); + + if (avctx->profile == FF_PROFILE_H264_CONSTRAINED_BASELINE || + avctx->profile == FF_PROFILE_H264_MAIN) + sps->constraint_set1_flag = 1; + + if (avctx->profile == FF_PROFILE_H264_HIGH) + sps->constraint_set3_flag = ctx->gop_size == 1; + + if (avctx->profile == FF_PROFILE_H264_MAIN || + avctx->profile == FF_PROFILE_H264_HIGH) { + sps->constraint_set4_flag = 1; + sps->constraint_set5_flag = ctx->b_per_p == 0; + } sps->level_idc = avctx->level; @@ -319,8 +328,7 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) av_clip(av_log2(ctx->b_per_p + 1) - 2, 0, 12); sps->max_num_ref_frames = - (avctx->profile & FF_PROFILE_H264_INTRA) ? 0 : - 1 + (ctx->b_per_p > 0); + ctx->gop_size == 1 ? 0 : 1 + (ctx->b_per_p > 0); sps->pic_width_in_mbs_minus1 = priv->mb_width - 1; sps->pic_height_in_map_units_minus1 = priv->mb_height - 1;