From patchwork Wed Aug 22 23:45:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10086 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1442721jap; Wed, 22 Aug 2018 16:48:49 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbqpw4IbRBZOnYcfqGqOFblDeW2bW5Z6sffwYnliIy+AGSDSCNy+yLW/5pwnpMQlhXoJCnz X-Received: by 2002:a1c:c7c1:: with SMTP id x184-v6mr3560114wmf.134.1534981729276; Wed, 22 Aug 2018 16:48:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534981729; cv=none; d=google.com; s=arc-20160816; b=LkOIkwm+F2J9EDCeRaqTnpEF+hGe1W0iNxbCE9xpadhwlcYEeC5GiKQ5lloqazke7A ihvOTjtDwPm6hv5TK7K1VPBsxgBDImj1YN4GB4rTRueoS4oV+0cu4AsxMZ+vUOQsaPyj +CwMHhq/M0vfj4ZKsS+NO+0qihrHJohZoyP1qwANXGlGzWg7AJoUzTXuMwLzY93S8qoU iB4sxV1bGATNRTkaIgPlYqxniW+SG6F1OV3Ee4W5Da5dCcshiQT1QiuIkFNX5v9Qwpy8 XcAuWtl8CdLZMkLedjdT1R29lCtLxRH5IU/2Ccs9TRNr6UAKqS0HeZ1DiK4Bwktx079r 7Eeg== 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=16YhBDTyit2UnGhKzTpc9J6a6mI/sN2KSYWfyq6eMt8=; b=ClZsLJI1u0/mIThDWbfmXxe9ozm98E8Aj+He1t2k+9lghEkpqwVp4jxiAhelFvA9+7 naVhPW69dzHMvHDrcYTshD0Ew7dj71XZtBmwi6Oh19gvrQ8JyMFok2iAQPhhefrrUmQO L3K/j0m3G2bjmDEZb6L9PsUxZUyw5XWkAtWbhL8UW5tac5iTJ83jatkFa8eyzRXmcNKr Q2gQLn5KRH80tLgpxVcC9FK8jWeUtX0bQuLTqj6HVWslRcKh4pvWWF/NVN1gvofHlXVk AW0Yrg4sCZ4oSspuMAdoICVF4wj3w2U5NMt2kVnajiOwWqEzyRnlIdLTmvS7ky7iz6Ml KQQQ== 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=xVz8tfLg; 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 y4-v6si2771389wrg.73.2018.08.22.16.48.48; Wed, 22 Aug 2018 16:48:49 -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=xVz8tfLg; 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 73C95689EEA; Thu, 23 Aug 2018 02:45:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EA92689EE6 for ; Thu, 23 Aug 2018 02:45:52 +0300 (EEST) Received: by mail-wm0-f45.google.com with SMTP id y2-v6so3478929wma.1 for ; Wed, 22 Aug 2018 16:45:54 -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=+E0hA7bSlHdG78qFWjX1Zh/9nIb+IXMYwnhCjYMyR+I=; b=xVz8tfLgVtxRX3PhA3tSGUGy8u8/nI2n8grVDT4foKUgvbYpjcwKpCyXqbtV58pCsK SIRcVmsl37Y4Oxte+ML28/W1ZhMfFv4wkyX+EQL2o0JFN7x73VfqDNDLc3FyH+wiY3Ez 3VvjI5TFZJrb/95ljZpzqxsj7ZNRf43rCQdTdfdzBEZcBUDKIqxBvNZv2T1AFKP1663W 4h34Zn8cvYcPT3WwVYST0a6Q2LZonSIlP/0KdqbKn/S5hNLmjCcTB+sc2OqPx0ZjT6ws 2eXC6ZL5kl4ZcFYk0DBvyoVhA6tZS5kIaomKPLdik36Cy7nJW96JbOxqYCR+Yf5x3biO EAUg== 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=+E0hA7bSlHdG78qFWjX1Zh/9nIb+IXMYwnhCjYMyR+I=; b=mCFIpnD9XieK3Kc8QgP8Ywl6p/8I/sBAP1kgaCpC6cMQWDTkMl3JBA4AlmBi9HDrtJ CtZHcJ2avDloelM1Kab2ykU5dRbw51g+S7Muoj21QIUfnQ5bFxeG6s814D2nNc3nX97l tjpApqiSASRzoycdu6+Tj0DkZxABwTiZESPWPTPhwPv/AFFetXH7zgqSD2VWLOefMKTb QLOrLwIka248i7WHa49zzQ548CAA6/54pLUdbKQ3bmrvhHIrCliJ0p5VxTUCJ6iDyk3S oOzsz0ZhP/qRZXWegy81UaeWK25TspD1wbP8z/2x7566yG+1/6BdCO9oXnWp9KQ2Dqy3 vGpQ== X-Gm-Message-State: APzg51DkOG3iz7Y/4SBBYeXLd7BGww7LwtcRtVDCzsrBlkTViDf3+yzx G/9nf/l4AganQFrlgiIJqfh9eLifm9M= X-Received: by 2002:a1c:adcc:: with SMTP id w195-v6mr2916047wme.41.1534981553589; Wed, 22 Aug 2018 16:45:53 -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.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 16:45:52 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 00:45:05 +0100 Message-Id: <20180822234514.10571-33-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 32/41] vaapi_encode_h265: Improve profile support 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" Set profile compatibility/constraint flags properly (including the constraint flags used for RExt profiles, as all streams we can currently generate are RExt-compatible), and use that to add support for the "Main Intra" and "Main 10 Intra" RExt subprofiles (for which we can re-use the existing Main and Main10 VAAPI profiles). --- libavcodec/Makefile | 2 +- libavcodec/vaapi_encode_h265.c | 70 ++++++++++++++++++++++++++-------- 2 files changed, 56 insertions(+), 16 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d07a9073af..756779ec16 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -373,7 +373,7 @@ OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec_h2645.o OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \ hevc_data.o OBJS-$(CONFIG_HEVC_RKMPP_DECODER) += rkmppdec.o -OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o +OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += h265_profile_level.o vaapi_encode_h265.o OBJS-$(CONFIG_HEVC_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_HEVC_V4L2M2M_ENCODER) += v4l2_m2m_enc.o OBJS-$(CONFIG_HNM4_VIDEO_DECODER) += hnm4video.o diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 6940a59240..45576868df 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -23,6 +23,7 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" +#include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "libavutil/mastering_display_metadata.h" @@ -260,9 +261,12 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) H265RawVPS *vps = &priv->raw_vps; H265RawSPS *sps = &priv->raw_sps; H265RawPPS *pps = &priv->raw_pps; + H265RawProfileTierLevel *ptl = &vps->profile_tier_level; H265RawVUI *vui = &sps->vui; VAEncSequenceParameterBufferHEVC *vseq = ctx->codec_sequence_params; VAEncPictureParameterBufferHEVC *vpic = ctx->codec_picture_params; + const AVPixFmtDescriptor *desc; + int chroma_format, bit_depth; int i; memset(&priv->current_access_unit, 0, @@ -273,6 +277,25 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) memset(pps, 0, sizeof(*pps)); + desc = av_pix_fmt_desc_get(priv->common.input_frames->sw_format); + av_assert0(desc); + if (desc->nb_components == 1) { + chroma_format = 0; + } else { + if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 1) { + chroma_format = 1; + } else if (desc->log2_chroma_w == 1 && desc->log2_chroma_h == 0) { + chroma_format = 2; + } else if (desc->log2_chroma_w == 0 && desc->log2_chroma_h == 0) { + chroma_format = 3; + } else { + av_log(avctx, AV_LOG_ERROR, "Chroma format of input pixel format " + "%s is not supported.\n", desc->name); + } + } + bit_depth = desc->comp[0].depth; + + // VPS vps->nal_unit_header = (H265RawNALUnitHeader) { @@ -289,19 +312,34 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) vps->vps_max_sub_layers_minus1 = 0; vps->vps_temporal_id_nesting_flag = 1; - vps->profile_tier_level = (H265RawProfileTierLevel) { - .general_profile_space = 0, - .general_profile_idc = avctx->profile, - .general_tier_flag = 0, + ptl->general_profile_space = 0; + ptl->general_profile_idc = avctx->profile; + ptl->general_tier_flag = 0; - .general_progressive_source_flag = 1, - .general_interlaced_source_flag = 0, - .general_non_packed_constraint_flag = 1, - .general_frame_only_constraint_flag = 1, + 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[4] = 1; - .general_level_idc = avctx->level, - }; - vps->profile_tier_level.general_profile_compatibility_flag[avctx->profile & 31] = 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_12bit_constraint_flag = bit_depth <= 12; + ptl->general_max_10bit_constraint_flag = bit_depth <= 10; + ptl->general_max_8bit_constraint_flag = bit_depth == 8; + + ptl->general_max_422chroma_constraint_flag = chroma_format <= 2; + ptl->general_max_420chroma_constraint_flag = chroma_format <= 1; + ptl->general_max_monochrome_constraint_flag = chroma_format == 0; + + ptl->general_intra_constraint_flag = ctx->gop_size == 1; + + ptl->general_lower_bit_rate_constraint_flag = 1; + + ptl->general_level_idc = avctx->level; vps->vps_sub_layer_ordering_info_present_flag = 0; vps->vps_max_dec_pic_buffering_minus1[0] = (ctx->b_per_p > 0) + 1; @@ -343,7 +381,7 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) sps->sps_seq_parameter_set_id = 0; - sps->chroma_format_idc = 1; // YUV 4:2:0. + sps->chroma_format_idc = chroma_format; sps->separate_colour_plane_flag = 0; sps->pic_width_in_luma_samples = ctx->surface_width; @@ -362,9 +400,8 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) sps->conformance_window_flag = 0; } - sps->bit_depth_luma_minus8 = - avctx->profile == FF_PROFILE_HEVC_MAIN_10 ? 2 : 0; - sps->bit_depth_chroma_minus8 = sps->bit_depth_luma_minus8; + sps->bit_depth_luma_minus8 = bit_depth - 8; + sps->bit_depth_chroma_minus8 = bit_depth - 8; sps->log2_max_pic_order_cnt_lsb_minus4 = 8; @@ -1023,8 +1060,10 @@ static av_cold int vaapi_encode_h265_configure(AVCodecContext *avctx) static const VAAPIEncodeProfile vaapi_encode_h265_profiles[] = { { FF_PROFILE_HEVC_MAIN, 8, 3, 1, 1, VAProfileHEVCMain }, + { FF_PROFILE_HEVC_REXT, 8, 3, 1, 1, VAProfileHEVCMain }, #if VA_CHECK_VERSION(0, 37, 0) { FF_PROFILE_HEVC_MAIN_10, 10, 3, 1, 1, VAProfileHEVCMain10 }, + { FF_PROFILE_HEVC_REXT, 10, 3, 1, 1, VAProfileHEVCMain10 }, #endif { FF_PROFILE_UNKNOWN } }; @@ -1103,6 +1142,7 @@ static const AVOption vaapi_encode_h265_options[] = { { .i64 = value }, 0, 0, FLAGS, "profile" { PROFILE("main", FF_PROFILE_HEVC_MAIN) }, { PROFILE("main10", FF_PROFILE_HEVC_MAIN_10) }, + { PROFILE("rext", FF_PROFILE_HEVC_REXT) }, #undef PROFILE { "level", "Set level (general_level_idc)",