From patchwork Fri Feb 18 01:43:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 34373 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp515059nkx; Thu, 17 Feb 2022 17:48:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1YhdMLDqd5KsLssHczgvMNTG73ZbOIWhEZI1O4bfnLMkkt7qanajTpg15mmlOX6MsmYqp X-Received: by 2002:a17:906:3a4f:b0:6cf:86e0:586c with SMTP id a15-20020a1709063a4f00b006cf86e0586cmr4575210ejf.626.1645148922063; Thu, 17 Feb 2022 17:48:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645148922; cv=none; d=google.com; s=arc-20160816; b=LM9rb3b9ix8DHZC0TOcBr1Qdquie6+M6ZiS3St84Z1UCsGEcFjSKIV3MGtv1XuEB6e BtA7OAgn4xLNZs9Gs616Xx/brObJkujwspOuQWwei94G8SBHg6jpwIoJmi+jgSKgwjI/ KOdL8550Cg78OyrstIZg95GXO6qsZ3VdkbKarq1xt/mfZwOUr7lwBSD8SUyl6v4zR8KI VPTCBSfQZtuIWxDvVzWpp0RXYdm4VmllB63x7y5iZeWt/7l4LQFXmFJBOxmF53ExG63z ln1L/1wb9uSvTyhpzAK/KrUzfPdQTkKFgi4CBTJFUAlqQgSuLQXVYdpcz5g9ymAhDyIJ iCYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Hp7xAWEEQfszMlmQPeafb7GZPOHI8e5na0/YCq2LRKc=; b=YJGpagPckYAYvLNeWxzNd8rsXb72bqnfg2m1LWgJpSbuRkeKCyE6iR/T5bBHH7LvXS /7b89YOh3radFTQ6eLzoePKEkDGe8OnXF4GDSCkD4NxqAZQ8VoRLf4YZ091bUvTB3gs9 8ES75DVsSfZUZQFsixh+jTwFgW9QeoGNf80ln/blkJgfpEX5kqlkSi7b6HHQWJSmpm5k PWYwZ8qOZ6J9len4ujidyBFG/vx89r4cRDBJ/B2fS6cj55wzq66pP7S51GYWULWwq1C2 QpoRsYAye6DrLG872Y9U1ycZu/D0L1xEaMSJkjAJvkfkGglTayEEZTHj2mGsdDmR/PZm u0HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Te555Zqw; 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 ox29si2824950ejb.433.2022.02.17.17.48.41; Thu, 17 Feb 2022 17:48:42 -0800 (PST) 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=@intel.com header.s=Intel header.b=Te555Zqw; 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 C965F68B370; Fri, 18 Feb 2022 03:48:26 +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 BA65A68B332 for ; Fri, 18 Feb 2022 03:48:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645148904; x=1676684904; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yf2UOafZYgaGBlQApk7GLFnJk2zJh+xgqBSoqNkEBLY=; b=Te555ZqwEd+7jaaRewluxXdPdWK2rq7KhM5nrQFH1sFR5uwBUZAmp4IB ACVsH+aWmRrYxrNXjE9sfNDGBroX6KshB7c3rj0+ko0cqnjOn/YYFdwo0 alib3pmKQhXbPS4sWuPwq8u+CUUEoriwZ0tONIFAqbzagV24gbPy5MkYF BT35KCuxjSRDPwh2DKX6XdEN3ezcWQ5sExC2kXC8T+5gAkzcQmcm8d2ZL ABGkv0fLw94wZbLgNsKkgaB6EFgHXVT92GLuiTTNOUDpXUMtCt4Ye4zQ/ QlxiZIYNvj33XjUQ+uBULE1rivl6/bqUNGsKD4waSdObFMpXjjBYsWM1w Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231010265" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231010265" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 17:48:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="777781353" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga005.fm.intel.com with ESMTP; 17 Feb 2022 17:48:16 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 09:43:00 +0800 Message-Id: <20220218014301.1830754-3-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220218014301.1830754-1-fei.w.wang@intel.com> References: <20220218014301.1830754-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 3/4] vaapi_encode_h265: Explicitly set and correct some flags X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Mark Thompson , Fei Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vEfcGp5LpaGe From: Mark Thompson max_14bit_constraint_flag should be set if the bit depth is not greater than 14 (currently always true). one_picture_only_flag should not be set because we don't support the still picture profiles. general_profile_compatibility_flag should be set according to general_profile_idc instead of bit depth. Signed-off-by: Fei Wang --- libavcodec/vaapi_encode_h265.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 5b8dbe841d..8319848e4a 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -303,17 +303,21 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) ptl->general_profile_idc = avctx->profile; ptl->general_tier_flag = priv->tier; - if (chroma_format == 1) { - ptl->general_profile_compatibility_flag[1] = bit_depth == 8; - ptl->general_profile_compatibility_flag[2] = bit_depth <= 10; + ptl->general_profile_compatibility_flag[ptl->general_profile_idc] = 1; + + if (ptl->general_profile_compatibility_flag[1]) + ptl->general_profile_compatibility_flag[2] = 1; + if (ptl->general_profile_compatibility_flag[3]) { + ptl->general_profile_compatibility_flag[1] = 1; + ptl->general_profile_compatibility_flag[2] = 1; } - ptl->general_profile_compatibility_flag[4] = 1; ptl->general_progressive_source_flag = 1; ptl->general_interlaced_source_flag = 0; ptl->general_non_packed_constraint_flag = 1; ptl->general_frame_only_constraint_flag = 1; + ptl->general_max_14bit_constraint_flag = bit_depth <= 14; ptl->general_max_12bit_constraint_flag = bit_depth <= 12; ptl->general_max_10bit_constraint_flag = bit_depth <= 10; ptl->general_max_8bit_constraint_flag = bit_depth == 8; @@ -323,6 +327,7 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) ptl->general_max_monochrome_constraint_flag = chroma_format == 0; ptl->general_intra_constraint_flag = ctx->gop_size == 1; + ptl->general_one_picture_only_constraint_flag = 0; ptl->general_lower_bit_rate_constraint_flag = 1;