From patchwork Mon Jul 5 02:29:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736783ios; Sun, 4 Jul 2021 19:33:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxM2XUDuZ7jmjMldeSt6u4+n5lt/Xt70TkwyRZI5sjO+QhSzGk8IjdOBM6UrENYMuALa2il X-Received: by 2002:aa7:cb84:: with SMTP id r4mr13175393edt.205.1625452388623; Sun, 04 Jul 2021 19:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452388; cv=none; d=google.com; s=arc-20160816; b=wsxinuMpSaehwSucIUijhw5YWh2fbqCJWTdHFp95NiVdehfuyqC0nJcj1oWu2c4gDX kw56hHO8/emCPkK4D2PC0q3VP9yXteQO4RFystJBbWwRQD3mA0AZfHL9IDEx3j0fJwk/ PAGzIv1X+htxEfM2ax/f6ng1OIb5O0+G0sXCrl0ffyiv/Hv6+j5n5YZC3Iaw2HStqWx2 j91pzFnu0gCsUhsal/6JFzCUCGSprRm9AGXtylcr4Nvg2VsBfboNbT1XGlJY2pFn/tLd isLhikqw8srtpYQC0MjUtTETzoBXmAjdcDV61lEk5DlshaJBJPmm+DsbdetlX/bsom1m SdUg== 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:cc: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:delivered-to; bh=YfVIkzUvXvNk9CIV/t0Htd4miK+F2WonzgeTn6YZSUY=; b=OF1iaNGfRr5yapXfHgRM7wNBiFh3kxhXs8yyjauC4fG+GeUQA47Ysm4pN6inwAkr/c R1lZXJhDpHY8dxdkov02eZYB5FuzZW+OFHbExfCcsCzoUT921BmhYprc9UfFe0Bqu+0G kJD7ynIXkx8SxOj2a1hyFnCsLUxFBxmOs3CzTZ2kVXG+Sihm4+WelZ4u83/kUgnnDwYh A2UNz56fxGsgnszzUzurmTP8d5HY+1zua2fN6K/labe9DkFGFGXhK2hbFt9VgnOW+YqG V6vYtjecFDI7qdNkEO61j71kqPKQCArokw5mpQiubHVhxZWFvzz2C9WgSp/W9qjZ9ZA4 ShDQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ia8si10312582ejc.187.2021.07.04.19.33.08; Sun, 04 Jul 2021 19:33: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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC94D68A613; Mon, 5 Jul 2021 05:31:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D1F968A5B8 for ; Mon, 5 Jul 2021 05:31:52 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869471" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869471" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571473" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:43 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:32 +0800 Message-Id: <20210705022933.29068-8-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 8/9] avcodec/av1_vaapi: enable segmentation features 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: Fei Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: R5j+3qM7MMGN Signed-off-by: Fei Wang --- libavcodec/vaapi_av1.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index 81b13bb1aa..6aaabed2c1 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -63,6 +63,9 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, int err = 0; int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && film_grain->apply_grain; uint8_t remap_lr_type[4] = {AV1_RESTORE_NONE, AV1_RESTORE_SWITCHABLE, AV1_RESTORE_WIENER, AV1_RESTORE_SGRPROJ}; + uint8_t segmentation_feature_signed[AV1_SEG_LVL_MAX] = {1, 1, 1, 1, 1, 0, 0, 0}; + uint8_t segmentation_feature_max[AV1_SEG_LVL_MAX] = {255, AV1_MAX_LOOP_FILTER, + AV1_MAX_LOOP_FILTER, AV1_MAX_LOOP_FILTER, AV1_MAX_LOOP_FILTER, 7 , 0 , 0 }; pic->output_surface = vaapi_av1_surface_id(&s->cur_frame); @@ -218,6 +221,17 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, for (int j = 0; j < 6; j++) pic_param.wm[i - 1].wmmat[j] = s->cur_frame.gm_params[i][j]; } + for (int i = 0; i < AV1_MAX_SEGMENTS; i++) { + for (int j = 0; j < AV1_SEG_LVL_MAX; j++) { + pic_param.seg_info.feature_mask[i] |= (frame_header->feature_enabled[i][j] << j); + if (segmentation_feature_signed[j]) + pic_param.seg_info.feature_data[i][j] = av_clip(frame_header->feature_value[i][j], + -segmentation_feature_max[j], segmentation_feature_max[j]); + else + pic_param.seg_info.feature_data[i][j] = av_clip(frame_header->feature_value[i][j], + 0, segmentation_feature_max[j]); + } + } if (apply_grain) { for (int i = 0; i < film_grain->num_y_points; i++) { pic_param.film_grain_info.point_y_value[i] =