From patchwork Wed Sep 25 02:15:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp185312vqk; Tue, 24 Sep 2024 19:14:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0Ju+ny+zQHsKc35yOgPUWL2FJR9YbUiZKQP17SMA8N9hnj6Ly9nxBzP96rbruVM1AWjw/oHmI5IzY/ffmIUUh@gmail.com X-Google-Smtp-Source: AGHT+IFUo8QpX8N5Qe5vFieCMkcxqlc/xhZnuotOp+wctsj5KRJHiQg3LWzsChSebX4aaxIYFqZK X-Received: by 2002:a2e:bc84:0:b0:2f7:6664:f272 with SMTP id 38308e7fff4ca-2f8d0b67935mr20172051fa.6.1727230485503; Tue, 24 Sep 2024 19:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727230485; cv=none; d=google.com; s=arc-20240605; b=fabdv6+DJCSc79YdyGfcKJQJZ+kGFrK5E9+5QEMjZpf5ukWpLNXgxtD7e6afVZQC78 uyYMR+PlImoVgJbvpGMFCzTJ7Ja2A2jmE3LI0TJzkEgHm+Vhytp+kcb0j7FtpWxG5zHO T1IG3dbk9ibS6mNNuMkL5VxT70LJC2TbCWZfqzPWqNYYxiujljRGSNNtleoZqNsahMLx J+taSoizMJvA9IXr9tWet6CJlVNAtETIi6sqp6urSCdmjQZAmcqzcAUbIq1V2tDeRR6g LJjBlQUL7cb1cgjtaGFiGxPVcd6IAZ5hesGLPCSCFfzpN0JjvFTCvvG41P4EUJFEw08W nZzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:message-id:date:to:from :dkim-signature:delivered-to; bh=AduonBz9D2mMGqM1xUrweKECSs02cEuprE1Bd7VOfhM=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=Tc1vggbSpTWuSBNxhZibH4xwBZ/pDlWHyeoXx5ik+QR0cxo3G4UhKWgLrc3GIvRsaZ L/1CdGMJCg17d+4CYhzdzypC9iDosN0OIUMD+YDKCj4k029PhM4LMEkgGo5l8L4L1TiI suQWUni7Y2toEKoe0gzBdRKb06ecsrTe7RT3HkGWS2d5hPVcPOmQfHkOEahudmoJEpwL Jc3oglB3WhHCu5AVDdjXteyKy+2behjaZOVAyrDdOJrYQMcVdYcW2EF9sPZ53rpfD/nU cT5itMrjjxMtasXLMaRA1clhD8LvLAaN7AHOoTrjZ1MjMMxaApmkMO9Mvea7Io70KL6c pkLA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=IhjRqQrI; 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 38308e7fff4ca-2f8d289f1c7si7791891fa.423.2024.09.24.19.14.44; Tue, 24 Sep 2024 19:14:45 -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=@intel.com header.s=Intel header.b=IhjRqQrI; 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 4083168DB84; Wed, 25 Sep 2024 05:14:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15DE568DAC4 for ; Wed, 25 Sep 2024 05:14:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230474; x=1758766474; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=S3iXMPxZJvszjtcI4nKdHBlk69PK9cGh0jaO0+deqrQ=; b=IhjRqQrIG3V+QGbuHfZ6xYUBEPk4u30DddpfVKaT2ftG1f7tqgeU5Rwe cu186fSC5faAv6u4QWx8WTZgT+FXm0YipN34J327Lo2F9PWZ/HgwsvtjQ TkAc41KfiAXfjErsDfwB6z9J8YjHuOEUQhLD+ElCaXDhe0O7mJdkC5aJ/ k8HisAJDu7BXUlBSOwNcFaFYNz82UCm4jp/XOrXOdQq4g1PGPzKrI3oRk ljA/BYD9MoA+/pUADfTlOyCElMn80BjXVlGW13sQTEoFYz4iXhrPuuiM6 mp3Pqu4H/3WsXvPutFyjEMFmww28/771k3+cV2ELPS6Ohnie0odHU8Epj A==; X-CSE-ConnectionGUID: TeJPW4NIRFKOEe2rMy6RTA== X-CSE-MsgGUID: 3MrgNQfOQ7ydakw50889mQ== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37633933" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37633933" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:14:19 -0700 X-CSE-ConnectionGUID: eEbTQG7lSq+hSOn9CGIbqQ== X-CSE-MsgGUID: 3Gd3nE1iRU+M9a11VDyoFg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246381" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:03 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:26 +0800 Message-Id: <20240925021533.1742735-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/8] lavc/vaapi_dec: Create VA parameters dynamically 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ls7MKytpBHFJ From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 34 +++++++++++++++++++++++++--------- libavcodec/vaapi_decode.h | 7 ++----- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index a59194340f..709699dcaf 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -39,12 +39,24 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx, { VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data; VAStatus vas; - VABufferID buffer; - av_assert0(pic->nb_param_buffers + 1 <= MAX_PARAM_BUFFERS); + av_assert0(pic->nb_param_buffers <= pic->nb_param_buffers_allocated); + if (pic->nb_param_buffers == pic->nb_param_buffers_allocated) { + VABufferID *tmp = + av_realloc_array(pic->param_buffers, + pic->nb_param_buffers_allocated + 16, + sizeof(*pic->param_buffers)); + if (!tmp) + return AVERROR(ENOMEM); + + pic->param_buffers = tmp; + pic->nb_param_buffers_allocated += 16; + } + av_assert0(pic->nb_param_buffers + 1 <= pic->nb_param_buffers_allocated); vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context, - type, size, 1, (void*)data, &buffer); + type, size, 1, (void*)data, + &pic->param_buffers[pic->nb_param_buffers]); if (vas != VA_STATUS_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to create parameter " "buffer (type %d): %d (%s).\n", @@ -52,14 +64,14 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx, return AVERROR(EIO); } - pic->param_buffers[pic->nb_param_buffers++] = buffer; - av_log(avctx, AV_LOG_DEBUG, "Param buffer (type %d, %zu bytes) " - "is %#x.\n", type, size, buffer); + "is %#x.\n", type, size, pic->param_buffers[pic->nb_param_buffers]); + + ++pic->nb_param_buffers; + return 0; } - int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, VAAPIDecodePicture *pic, const void *params_data, @@ -222,7 +234,9 @@ fail: ff_vaapi_decode_destroy_buffers(avctx, pic); fail_at_end: exit: - pic->nb_param_buffers = 0; + pic->nb_param_buffers = 0; + pic->nb_param_buffers_allocated = 0; + av_freep(&pic->param_buffers); pic->nb_slices = 0; pic->slices_allocated = 0; av_freep(&pic->slice_buffers); @@ -235,7 +249,9 @@ int ff_vaapi_decode_cancel(AVCodecContext *avctx, { ff_vaapi_decode_destroy_buffers(avctx, pic); - pic->nb_param_buffers = 0; + pic->nb_param_buffers = 0; + pic->nb_param_buffers_allocated = 0; + av_freep(&pic->param_buffers); pic->nb_slices = 0; pic->slices_allocated = 0; av_freep(&pic->slice_buffers); diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h index 702171e108..a373eb5d6b 100644 --- a/libavcodec/vaapi_decode.h +++ b/libavcodec/vaapi_decode.h @@ -32,15 +32,12 @@ static inline VASurfaceID ff_vaapi_get_surface_id(AVFrame *pic) return (uintptr_t)pic->data[3]; } -enum { - MAX_PARAM_BUFFERS = 16, -}; - typedef struct VAAPIDecodePicture { VASurfaceID output_surface; int nb_param_buffers; - VABufferID param_buffers[MAX_PARAM_BUFFERS]; + VABufferID *param_buffers; + int nb_param_buffers_allocated; int nb_slices; VABufferID *slice_buffers; From patchwork Wed Sep 25 02:15:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51807 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp185262vqk; Tue, 24 Sep 2024 19:14:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXAfl7646FqlFrjFpQJUxag2L6h/GOWb/KZTmWSwg7r+0wu9lbcD79TQSex+NPSYcZsz+WiuIp0u/7T/7jkbBEW@gmail.com X-Google-Smtp-Source: AGHT+IFm8Npds/DQeK1CMUHPpYb1qRvBcFrA2H22DZ0jUiiJAmMdM01YowTJwe0jeCKXQ0JNbsJP X-Received: by 2002:a05:6402:1ecd:b0:5c4:2ad3:b8c2 with SMTP id 4fb4d7f45d1cf-5c7206198d2mr442544a12.3.1727230474867; Tue, 24 Sep 2024 19:14:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727230474; cv=none; d=google.com; s=arc-20240605; b=FS2pujwr6jFGeyt6nZb9S1zuBJJmwW2HzzOQyOgQY71uufdNixp5cKWqzeL1dc5vIY yzD7Ud3kfy27tnYzLWLRW8Gt99EkeW/Q/1QErEhFoLDTvxA/sl97pGNSO+P8LlTAqGEz pyFlK+yP0hq4hMnvZMjnK8eG1DRd/V+/itSWk1BDoQxZF8UBuLiKMq1ax/s2kspQw6NE 5luTp7MlXlGj8bnlDioFH/ds0EXCJ+B2jROzs1QtXS8Bi7x7UKgrpO4SB3hyf1F1lxkI 75pWXYbAVj99FK/GaDHL2ZM6zG6CZ12S9sd+WZdtrqU9BB0DQZUFTrlC1XVpJWBGBgBJ Uwuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=2MNdDttoKr+JgFokbJdhWR/S2I0kXUO3+qz6DqI3YAY=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=C5T1ErmarTVdaq5saIUvyVZhVUSaWkcu6xSGggsrYojt0KP2hh5gJkscOWzuPciW3T vQGN6DUkAuRj4QEVKLS3B6r46K8u6TwlNTpLAXSR4OPM+OfQUTAjKClI9wDfyaSQzhN7 x7n0iTdkQS++4ZBn2t3Oqf+XPtXp0TMRtbR2BrnlW1A7qEn8UcfPVU3DibUmriPl1Trv um2hLB83C1EGF9JY+5Y5lbELGt66wfuhHfX6xcNZUnImo3TzE4AOiryyC9n3tUXBO/0B edRNzojTFs02VFo3fbnoxC5oX+20CGvImoA1v9srHvEwml8KKBRNAP/ZREwlPwcXdQ9v qkRg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=CYRS20AB; 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 4fb4d7f45d1cf-5c5cf4dd0cdsi1751730a12.523.2024.09.24.19.14.34; Tue, 24 Sep 2024 19:14: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=@intel.com header.s=Intel header.b=CYRS20AB; 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 D4E8A68DA4A; Wed, 25 Sep 2024 05:14:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 238F168DA4A for ; Wed, 25 Sep 2024 05:14:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230468; x=1758766468; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IrO3rgiaATFCBMWE8x0XGUgX9cB++vIZ1AeoG4bfn3A=; b=CYRS20ABaHvECuqNl02YCMra/3CGelKbg8aIxBjabPYBm2JYag3OkTgi cNK2uS2Sxey6dxmSZG/IDieZycFCGyz7F3LbTCpnYQ3DMhWS1/dgkJina SI1GfqLN9SzMaBIeNPAWdAeHcFam/HAgN+FeI/FcU4VNQPpLdYLTkqxjX q6/KMdrEF0fgG+ihm6Z2vX98mX9mz48qikqA7drmISjdAo4HIUpWfaxrM m78QYvcF63vFDq9tI9C0G62xZS02OcyxI1b3leL+Q2NrhcfpclQTpU5Eb j4TR8ViR/koV4jaYQIK+A3xU0Fdcd+MKtD5E1u+mpTDtw3CUGWN3Vh6dv A==; X-CSE-ConnectionGUID: PwyX+ro4QberriIdLgQGpQ== X-CSE-MsgGUID: HM2F7PhwRx6tm7HPwSBgrA== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37633940" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37633940" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:14:19 -0700 X-CSE-ConnectionGUID: aWNAWHJRSm6p+sotP2QTqQ== X-CSE-MsgGUID: qSfijCLiSXyS3OSZYWP1Dg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246383" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:06 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:27 +0800 Message-Id: <20240925021533.1742735-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925021533.1742735-1-fei.w.wang@intel.com> References: <20240925021533.1742735-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/8] lavc/vaapi_decode: Use a more meaningful variable name 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5d4fcQ2zU9wr From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 20 ++++++++++---------- libavcodec/vaapi_decode.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 709699dcaf..7753f72106 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -84,19 +84,19 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, VAStatus vas; int index; - av_assert0(pic->nb_slices <= pic->slices_allocated); - if (pic->nb_slices == pic->slices_allocated) { + av_assert0(pic->nb_slices <= pic->nb_slice_buffers_allocated); + if (pic->nb_slices == pic->nb_slice_buffers_allocated) { VABufferID *tmp = av_realloc_array(pic->slice_buffers, - pic->slices_allocated ? pic->slices_allocated * 2 : 64, + pic->nb_slice_buffers_allocated ? pic->nb_slice_buffers_allocated * 2 : 64, 2 * sizeof(*pic->slice_buffers)); if (!tmp) return AVERROR(ENOMEM); - pic->slice_buffers = tmp; - pic->slices_allocated = pic->slices_allocated ? pic->slices_allocated * 2 : 64; + pic->slice_buffers = tmp; + pic->nb_slice_buffers_allocated = pic->nb_slice_buffers_allocated ? pic->nb_slice_buffers_allocated * 2 : 64; } - av_assert0(pic->nb_slices + 1 <= pic->slices_allocated); + av_assert0(pic->nb_slices + 1 <= pic->nb_slice_buffers_allocated); index = 2 * pic->nb_slices; @@ -237,8 +237,8 @@ exit: pic->nb_param_buffers = 0; pic->nb_param_buffers_allocated = 0; av_freep(&pic->param_buffers); - pic->nb_slices = 0; - pic->slices_allocated = 0; + pic->nb_slices = 0; + pic->nb_slice_buffers_allocated = 0; av_freep(&pic->slice_buffers); return err; @@ -252,8 +252,8 @@ int ff_vaapi_decode_cancel(AVCodecContext *avctx, pic->nb_param_buffers = 0; pic->nb_param_buffers_allocated = 0; av_freep(&pic->param_buffers); - pic->nb_slices = 0; - pic->slices_allocated = 0; + pic->nb_slices = 0; + pic->nb_slice_buffers_allocated = 0; av_freep(&pic->slice_buffers); return 0; diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h index a373eb5d6b..7813473c98 100644 --- a/libavcodec/vaapi_decode.h +++ b/libavcodec/vaapi_decode.h @@ -41,7 +41,7 @@ typedef struct VAAPIDecodePicture { int nb_slices; VABufferID *slice_buffers; - int slices_allocated; + int nb_slice_buffers_allocated; } VAAPIDecodePicture; typedef struct VAAPIDecodeContext { From patchwork Wed Sep 25 02:15:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51809 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp185360vqk; Tue, 24 Sep 2024 19:14:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7gWaKXf8P0o638O5xQfbkISA5hMeNAeaLu7tkZUisukkpPOdoIrEcOlvF3UOuzW1KrRz78fnrK0bszbqX9vbd@gmail.com X-Google-Smtp-Source: AGHT+IFqiiBSG4g9GdaZjcnzKvUDwEert400Kppuytrh49OWrk4/GZrirctQxjFX0HzI/8JxtyRJ X-Received: by 2002:a05:6512:3e17:b0:536:9f02:17b4 with SMTP id 2adb3069b0e04-5387755e2damr474793e87.40.1727230495324; Tue, 24 Sep 2024 19:14:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727230495; cv=none; d=google.com; s=arc-20240605; b=N9JKB3TUvjf3LMHYLVo1RVUd2M9eLHBNDdTFltwXftxHPI7RiMmLJ7xXItvuF/Rrw+ YZZPtAwaaGEO1kb2Fg1u7vODwrcZect62DOMLHKcsBhG6OAe89JHo5DEdhjYPnEbSRFr iaJFszu7Ax+e7nxdIrTcxZ1qAjSi25Iwpyvfw6s6o6G0Thd/X44OC53Bz5GZ8D6Kkz3P vwfVXSO+57s2VpS71ym9nVY2BtnYq7qME8zKOVF7UWHTcVX93PDNBMNYUfsgZFI15gYU 9J1IvEiMObkFD6x3YhI5Ox6sDhhyvQaI8k82q8CslpNMBYvdSNdyZRrJHi05whG7cnNy XxHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=148Zisfxy915UeeSmEsmYwjhpbk6oimf2Ke2U3gDy9Q=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=bc2xnouxYTe6L/jOMUxCe1gAmRfIDZZkESSLP1tvWirGOTF7ZrvTgM1yh3Ct+DiByU sH8zwad42cfXyjIoJKc4QpsFuUuRPL/twF7+3OlThhk/ydPT6V1VHaIdidce8CuYMZF/ E4AhSpw342dBx6Bsu/vWp5YEzYmHdpYx2r0FIIYHuC0pIBfPpJHguerF9iTHai6OJwpR synoiiwaFBumZ9gdZVSD/pJO9Ta+/6f3ZTEtzpa4YIlGr4bYLP/Rro5mbtdGlk7cj7rM oIDzLJQIY9zpUztDDelHXDMhjL1lDyF0H+sCjd19+p6/gP5g98ONVEwBmtAmx3iAZEYn UeRA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=OeIaf4pg; 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 2adb3069b0e04-537a863ef4bsi905934e87.322.2024.09.24.19.14.54; Tue, 24 Sep 2024 19:14:55 -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=@intel.com header.s=Intel header.b=OeIaf4pg; 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 BF33D68DBE4; Wed, 25 Sep 2024 05:14:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2406168DAA5 for ; Wed, 25 Sep 2024 05:14:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230475; x=1758766475; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+bVNPoLy0dK5bTfZg/WzbrHHk1A7eIkSdbWuHS4DXj4=; b=OeIaf4pge+tO4LTxBNudGjoVXhbWrOfKmKHAHtwq8UYbycAdiVPjjU9L g3KvHbQx3ndHbTrg3QVd8+ljVpZabc+33c9dcPoRXJ7Kp1dYQ8sqWMBzy Cl3K/aAbBXqMruRhKmzy3+2Qjf8bWBic3q4LFNin9xBuIsqrAPAqb9QK9 x9kQJN6sCAFJ9reTP0AiieVpaCyU79i8Y47sayXFFvdleXI4/Pdm2T06t jzBXIhKNVeprkOfFdanXQeVmhz2XTezdQ+oI20ukFBVxsEEYoFYmq/qWR MPUfJ3QQotIE6Rj//ddnI3kzyfYhYCLq42fDkk1yramdBlIElf6b2Fn5p g==; X-CSE-ConnectionGUID: Y2GVOT3uR0q4NbW7Q+5/PA== X-CSE-MsgGUID: sr158a2SQYCNZH6TWoRLYw== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37633937" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37633937" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:14:19 -0700 X-CSE-ConnectionGUID: b+Jyjs7VT6qF10pkopzcXg== X-CSE-MsgGUID: BgTEgxUBQVGA2x1EAgPN8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246386" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:07 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:28 +0800 Message-Id: <20240925021533.1742735-3-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925021533.1742735-1-fei.w.wang@intel.com> References: <20240925021533.1742735-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/8] lavc/cbs_h266: Add SliceTopLeftTileIdx to H266RawPPS 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CJFBC7lcK2zv From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/cbs_h266.h | 1 + libavcodec/cbs_h266_syntax_template.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index d24a8e9313..7f0e537b31 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -593,6 +593,7 @@ typedef struct H266RawPPS { uint16_t sub_pic_id_val[VVC_MAX_SLICES]; ///< SubpicIdVal uint16_t col_width_val[VVC_MAX_TILE_COLUMNS]; ///< ColWidthVal uint16_t row_height_val[VVC_MAX_TILE_ROWS]; ///< RowHeightVal + uint16_t slice_top_left_tile_idx[VVC_MAX_SLICES]; } H266RawPPS; typedef struct H266RawAPS { diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index b4165b43b3..a826cf8bc9 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1976,6 +1976,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, else infer(pps_tile_idx_delta_present_flag, 0); for (i = 0; i < current->pps_num_slices_in_pic_minus1; i++) { + current->slice_top_left_tile_idx[i] = tile_idx; tile_x = tile_idx % current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns; if (tile_x != current->num_tile_columns - 1) { @@ -2058,6 +2059,8 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, } num_slices_in_tile = j; } + for (int k = 0; k < num_slices_in_tile; k++) + current->slice_top_left_tile_idx[i + k] = tile_idx; i += num_slices_in_tile - 1; } else { uint16_t height = 0; @@ -2101,6 +2104,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, if (i == current->pps_num_slices_in_pic_minus1) { uint16_t height = 0; + current->slice_top_left_tile_idx[i] = tile_idx; tile_x = tile_idx % current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns; if (tile_y >= current->num_tile_rows) From patchwork Wed Sep 25 02:15:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51811 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp190413vqk; Tue, 24 Sep 2024 19:34:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVca1CJUw5iUTBsv9Op/bMmsutTa+dfbUv05wyjam5vQpXabB+tO/h1HaR41zwYwEOq03heD+WMKPJShyZS5yC+@gmail.com X-Google-Smtp-Source: AGHT+IGSywTuRTw3dk7sFURP5rYu73dM0mbwhrODXoUiDwmQC/ktzJ5/NTE/pqKNGVPfVYimKmbM X-Received: by 2002:a05:6402:254a:b0:5c0:ab6f:652a with SMTP id 4fb4d7f45d1cf-5c72060aa47mr940987a12.3.1727231660070; Tue, 24 Sep 2024 19:34:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727231660; cv=none; d=google.com; s=arc-20240605; b=fRy8KZLWgjwrDPrUyefAl1cO8A69NrkkdsNNEmHADg7Ly/lNAlj8x59sB/v43wNIg8 /Lhpl1cwlc0K7blMVZ8Li5j0J1KQFPIrSsL0n0eyTOVKKUGtynury/kEt2nOiPNA8u9W TLOI1lSBw5y+kBkMEc/IgOCmLjokHJFywDqNfFK/uaFn3S0Li8aGHC6+43F9X/HCC6fH 1eBvlBOV7q0VaLKED/PTO2kqyQsnnK5Nzr7HcWmZ+CiB1QK+feY4JCe6+c+6BY9B3K9A xeyrgoETnpow5RJUhN0nlPMywoCTw4fWC/Bj6P+5h7N99/XjSwe13Rlu9+a44/Bcn8c/ Gi/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=0GHl1MvW7fdgLC2yTmrU7Cg41nIezbMbW2wpvVigA80=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=g9EYg2RCOzcdVgfrqCkd3Cs0l95ho7UeNxDNAcxA8HwFP6H2GKOh23WRZHzmrKgx/3 jjGH1r04ElLtwIPOXIYEP4NkzTgmpFER2zyifAsPgZaCvCuQslq10qGIGlpJrCbxv+0J 0LhDQovjAPRfNjRT0Knf/PWShM4SwBh0DfJJfRzG3xPbEkOJ/9uXhNcHjfVXqHQW1jGY 85d/HPrdphcZ6GVfaa2EKOvI6LpcaCxGHKG2VMUoit2HrZb3deFWufXQ77WGrJOfuFIL qsKbzd0XYdI7nmWTipkfhnGaICcuSLWQe46etJwSJk0vbGNE3LqzanWZnBwHjogA4MO4 5RUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="P+afcx/b"; 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 4fb4d7f45d1cf-5c5cf4dd881si1672965a12.540.2024.09.24.19.34.19; Tue, 24 Sep 2024 19:34:20 -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=@intel.com header.s=Intel header.b="P+afcx/b"; 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 4D98D68DC59; Wed, 25 Sep 2024 05:15:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7539868DBE1 for ; Wed, 25 Sep 2024 05:15:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230537; x=1758766537; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eJwiBPfof159QKnbnUTvY5kUx5LaUeFq2TA5FTba2V4=; b=P+afcx/bfJM3CGXfTr6+Wa4CeZQET7hcZtyC6I2rE+14FvZqZVXLrjJ5 QT2nyrj01oF0BoM2Bf3SKHLPosezQVNqAf8uswuvx40FbktLdoFFoATzH m1YkzUJDfaYLDTaI5kZ8bS4CefSx5UH79zPDfyZJ0kpUrKahUUS47id3q 4/jG7AMhtLy756NEg9qvunqucW09Z61yG9lKLL4jd9xV/iqGBgLeU23eI XQ3uMsIvi6MDLLlk2ig+EMX2UPQDqN/qPkeaS0j9xREUU8h0D5fLhQjKh tqCQLkDQZxtBeu29kqeDONE6cP/4XwcM7dde9uFAibtI/EFbyyltNpJRp Q==; X-CSE-ConnectionGUID: 2vTKdmgvRT+UxpWOv8BFfw== X-CSE-MsgGUID: WpNw4/gtTkGZ/bb2awxGUQ== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37634080" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37634080" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:15:24 -0700 X-CSE-ConnectionGUID: bGUgMAU/RpS2IbDSf4Wvjg== X-CSE-MsgGUID: Nu2Ip2ThQJCKEjT74XptAA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246391" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:12 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:29 +0800 Message-Id: <20240925021533.1742735-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925021533.1742735-1-fei.w.wang@intel.com> References: <20240925021533.1742735-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/8] lavc/cbs_h266: Add NumSlicesInTile to H266RawPPS 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EFe2gZIkpjcc From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/cbs_h266.h | 1 + libavcodec/cbs_h266_syntax_template.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 7f0e537b31..67a3ff6151 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -594,6 +594,7 @@ typedef struct H266RawPPS { uint16_t col_width_val[VVC_MAX_TILE_COLUMNS]; ///< ColWidthVal uint16_t row_height_val[VVC_MAX_TILE_ROWS]; ///< RowHeightVal uint16_t slice_top_left_tile_idx[VVC_MAX_SLICES]; + uint16_t num_slices_in_tile[VVC_MAX_SLICES]; } H266RawPPS; typedef struct H266RawAPS { diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index a826cf8bc9..b21d07491b 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2007,14 +2007,13 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, if (current->pps_slice_width_in_tiles_minus1[i] == 0 && current->pps_slice_height_in_tiles_minus1[i] == 0 && current->row_height_val[tile_y] > 1) { - int num_slices_in_tile, - uniform_slice_height, remaining_height_in_ctbs_y; + int uniform_slice_height, remaining_height_in_ctbs_y; remaining_height_in_ctbs_y = current->row_height_val[tile_y]; ues(pps_num_exp_slices_in_tile[i], 0, current->row_height_val[tile_y] - 1, 1, i); if (current->pps_num_exp_slices_in_tile[i] == 0) { - num_slices_in_tile = 1; + current->num_slices_in_tile[i] = 1; current->slice_height_in_ctus[i] = current->row_height_val[tile_y]; slice_top_left_ctu_x[i] = ctu_x; slice_top_left_ctu_y[i] = ctu_y; @@ -2057,14 +2056,18 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, slice_top_left_ctu_y[i + j] = ctu_y; j++; } - num_slices_in_tile = j; + current->num_slices_in_tile[i] = j; } - for (int k = 0; k < num_slices_in_tile; k++) + for (int k = 0; k < current->num_slices_in_tile[i]; k++) current->slice_top_left_tile_idx[i + k] = tile_idx; - i += num_slices_in_tile - 1; + i += current->num_slices_in_tile[i] - 1; } else { uint16_t height = 0; infer(pps_num_exp_slices_in_tile[i], 0); + if (current->pps_slice_width_in_tiles_minus1[i] == 0 && + current->pps_slice_height_in_tiles_minus1[i] == 0) + current->num_slices_in_tile[i] = 1; + for (j = 0; j <= current->pps_slice_height_in_tiles_minus1[i]; j++) { @@ -2105,6 +2108,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, uint16_t height = 0; current->slice_top_left_tile_idx[i] = tile_idx; + current->num_slices_in_tile[i] = 1; tile_x = tile_idx % current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns; if (tile_y >= current->num_tile_rows) From patchwork Wed Sep 25 02:15:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp195356vqk; Tue, 24 Sep 2024 19:54:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7SVbHL+n2Pgmx58jaM6RJqjemvxtmlJEbC5oepcaXB66kvlTYHDSTSeHJi3NdiBJ7NXp3N7NGNt3TZIUagcLC@gmail.com X-Google-Smtp-Source: AGHT+IHp9XEKeKv8ney/vfo2nk7ufsl+mJCu0qoW70yKDIzEyWl74YRI84ra/3zskZ9kclRtgYqC X-Received: by 2002:ac2:4f01:0:b0:535:6cbf:51a3 with SMTP id 2adb3069b0e04-53877532148mr566418e87.25.1727232859952; Tue, 24 Sep 2024 19:54:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727232859; cv=none; d=google.com; s=arc-20240605; b=XH8ag0G3/YqFzdeH8zCPbmZ4RuUMEDUuDmAeaacoTCpTzM+Z47ufm9wUP8Kz5T3VWK Z0w9N8ZHgSSAZvJwdw6SyKKkWXDd9gZ1DgEWrDAxQ729r1Zt63Ew+O8G6l7RhpsHAs4w nQXVvduWF2w/Dnmo+SigDTCCgcDB8rvGLC/FqpsZD/3JNax2/EfsLvJ6YqUFbIqwwflN pvKpmkCqNXdw5EBJtyFmqIMEDFQEuIbu2hRAiqXU6zQo4rGv58NGTKeRdrEgMYYYHBeI HxXnYnrjShSItsAC3VyS1QJEGolB4wccXxl6bVPWqZWw7A0hUgOpcF41C1NR+FNClvsH zgpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=WqaRGxLqXNg9F/UI7dH4TSZJlQjueOlC+Wi5x+D6PLU=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=UNgbGoI4Ukai7rBGLM3K6N1wrDI3CnrkwBaX0w8OSTjYcEsw+zfYXfGYbQsYSzNXKR OOrjWaayv5UFOSYTYJaKlElDxWw/PtVyIkvcC+encwC5lXIkK+EC98TvhUAY7U1yaZ40 Z0SxACtBdk3UfQJjG8/+RF9TPi6m+vHb4nEaDbxsp1iT127jbUNNPq1VseScuhdh1RjH bIEpANXs8yVD0mcmkv7fNgbH/bCDSJ5i8g85Zyxhz2+4kE+2JJhuZXGrggazKAS9OBY9 ZkdVSNYVUOMJ0780rPfqruHEoFrjNNcOwjUSvX09ucnIhc6C0HoBJsh7pMIT+62gtOIO lDjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="M5/RfyCm"; 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 2adb3069b0e04-537a8650fb6si811893e87.625.2024.09.24.19.54.19; Tue, 24 Sep 2024 19:54:19 -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=@intel.com header.s=Intel header.b="M5/RfyCm"; 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 5831A68DC4F; Wed, 25 Sep 2024 05:15:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 795ED68DC2C for ; Wed, 25 Sep 2024 05:15:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230537; x=1758766537; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7yUv7o1etLI4YRu/LmxzRabdjnkNCivbdSG23fVXDxA=; b=M5/RfyCmJQfLQGye5eao5SjjUMsAQfO8KaGCSF1BP6hbJ8oud9ZvVm+l S8zbami2pgG0Mk8EqQ7DQc/tBkBYbFLtfF0Inl8fICkmIENt+q4s3zZaf 3LVDDzNMsO3xMKVB07D/4Da1nGYZtHhMh4R/RuCce+1b36ACMin7stAFb JQ4gWJvJKRoU5y3/h315f2RFPZSSWs8eVocAiqQkDv1ClkJXH5EnhT5zb +GeAprq6bRcEfQZ0GryQqJoT4pHTA0v4zvMX9JJdd/CaUmhge4rdOs54y No9beXFatsOU6qBRms8iYmyzvLgPuFCP1y0cE1smuafI9w2tbXmjzm7F3 w==; X-CSE-ConnectionGUID: Nqp9QEOWR7yEl65MJp3lJA== X-CSE-MsgGUID: nkXypBMOT16caqU5J4i3pw== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37634073" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37634073" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:15:23 -0700 X-CSE-ConnectionGUID: /SPc+5YWSDm/F13XryJJeg== X-CSE-MsgGUID: ZEXpjpXNQcSykqrgh6GHGQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246394" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:13 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:30 +0800 Message-Id: <20240925021533.1742735-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925021533.1742735-1-fei.w.wang@intel.com> References: <20240925021533.1742735-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 5/8] lavc/vvc_refs: Define VVC_FRAME_FLAG* to h header 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: v/EC5hMk8Tm9 From: Fei Wang So that hardware decoder can use the flags too. Signed-off-by: Fei Wang --- libavcodec/vvc/refs.c | 4 ---- libavcodec/vvc/refs.h | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c index 133ff9eaba..3ed9d6768d 100644 --- a/libavcodec/vvc/refs.c +++ b/libavcodec/vvc/refs.c @@ -29,10 +29,6 @@ #include "refs.h" -#define VVC_FRAME_FLAG_OUTPUT (1 << 0) -#define VVC_FRAME_FLAG_SHORT_REF (1 << 1) -#define VVC_FRAME_FLAG_LONG_REF (1 << 2) -#define VVC_FRAME_FLAG_BUMPING (1 << 3) typedef struct FrameProgress { atomic_int progress[VVC_PROGRESS_LAST]; diff --git a/libavcodec/vvc/refs.h b/libavcodec/vvc/refs.h index 8ae33d4a9a..e2271ab381 100644 --- a/libavcodec/vvc/refs.h +++ b/libavcodec/vvc/refs.h @@ -25,6 +25,11 @@ #include "dec.h" +#define VVC_FRAME_FLAG_OUTPUT (1 << 0) +#define VVC_FRAME_FLAG_SHORT_REF (1 << 1) +#define VVC_FRAME_FLAG_LONG_REF (1 << 2) +#define VVC_FRAME_FLAG_BUMPING (1 << 3) + int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, struct AVFrame *out, int no_output_of_prior_pics_flag, int flush); void ff_vvc_bump_frame(VVCContext *s, VVCFrameContext *fc); int ff_vvc_set_new_ref(VVCContext *s, VVCFrameContext *fc, struct AVFrame **frame); From patchwork Wed Sep 25 02:15:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51806 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp185651vqk; Tue, 24 Sep 2024 19:15:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVPRRDogh/oAT3iUWBtG0ytYodGej47Ws63rrPgT/HQ9LoYtPJ9IiVjZEImlKOEgNYWexg813MeSh81uedXJxOt@gmail.com X-Google-Smtp-Source: AGHT+IHmnLDaEJ4rrjftgmZrJKed2bPs6FerWGeu16zZg1omnwqwbeS0Sjhb8hPeOWSgikczmDCr X-Received: by 2002:a05:6512:1104:b0:536:7b74:ef50 with SMTP id 2adb3069b0e04-53870496c40mr488451e87.18.1727230545209; Tue, 24 Sep 2024 19:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727230545; cv=none; d=google.com; s=arc-20240605; b=ketMeyUJd2cQS2YWuSCYQADzh2mL/CNXiy/OeEPf/rfD5hNqwWyQeUhp9iRaEWMYdl j/Wm5omn1ociU9zLCaQ304rt8zhpuHK6V8RB3D9J98JNMvtoKeFFGR1vAZKildBoOc5C YD+/Reoz55dfVKnbEXvx28LypAxRSEU1jF/DjtfOD5YUOowT0QoZuO+RqT2dIvLm66N6 G+vaY66R//HVXssX3r5EGQB8jc2xazdobv0V5GEPvAS2XT64sPWrRjKgfGK70nHz6Adv 70DgisX+HMmQtz/xnMq5UYJdXeYnuTjyeLR4C6eNa1taMmgeT8wwvHDx/13lx+CCMVxz KtvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=y9mrtX53xd7GFYQNIHk5/Yb6TDat2Y+Kqtsq5t9f8Iw=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=V0VL9X/cuVb/Usj7RLCHkGVw4cMJUw36JEc/hcI0rZPyrpJEzNKdXrKJd+8b/+ZcEp SSeOO9bnVUfDogRPk/qnrBcRsseZMtdWcKW8OWT0227yhL/fr6cLd7KFUERPQ0XNsaWC uUgPoW33ezss2QnZVUlEa2NDzEBuNWHECRB72yPnti9GIIZZRY+r1pshduYNTatT/Mj+ Eu2oC69utiCv2GsOPv8BbLW1yMrd9nRAAVczg737+3EC6uOTsMaUFMc377mnqIjGYfL7 KCUBaBXHtwxYHq2USvfHQJYeVS+pyBWZLSWnFgSxwXpsGSV2/o7PXGZI03x2Pbl/zfJs 1y4w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Q0ew39Nn; 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 2adb3069b0e04-537a863eb4esi916775e87.231.2024.09.24.19.15.44; Tue, 24 Sep 2024 19:15:45 -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=@intel.com header.s=Intel header.b=Q0ew39Nn; 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 3D4CF68DC21; Wed, 25 Sep 2024 05:15:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3ACCD68DB1B for ; Wed, 25 Sep 2024 05:15:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230532; x=1758766532; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OpueBZvL9uNLjMhSx9MOQ3o7NNOTIuc4hTlWZeUYt2Q=; b=Q0ew39Nn4u8RtPMmAu+scmmfG3bND8bCJzBrZRg3gZ++bevM0pdsvxxw 4auHqu5qfWrLG/vpZoabaFViu29aSkYbAya9DSZ8tpeGJC9a8DOcyhvyA CS0GogtU5M7tQTTE5boDn0og8gMCmryjxDfMXTm2WYInJIOGBJp5b10e8 IdVpyKSi1emy5K1Yh3WNfxTfUF/QY00MpYYiD9TyLsc0lG8A7oHKTNxj3 +WU2cjRLzitf1j5Or4f6kMAWa4EyGC1XYcHapPzC/WGZZLiYjiqC8FvAT JQ3FdEv1spXczO+EgIrHCCC0wU/IVmoN7gvqobb29tXZlDsSHcCWLx2UB A==; X-CSE-ConnectionGUID: VFH6F+qZRxekvyZ+tOEt4w== X-CSE-MsgGUID: 9CnocqTmTA+0lHMWuUbo8g== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37634070" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37634070" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:15:23 -0700 X-CSE-ConnectionGUID: 4lQ/Ks38Rf6Qe4EhtNkptA== X-CSE-MsgGUID: KauDyo63T7u1lDuXWPf6uA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246397" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:14 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:31 +0800 Message-Id: <20240925021533.1742735-6-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925021533.1742735-1-fei.w.wang@intel.com> References: <20240925021533.1742735-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 6/8] lavc/vvc_ps: Add alf raw syntax into VVCALF 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8JyujMAK/JQf From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vvc/ps.c | 10 +++++++++- libavcodec/vvc/ps.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c index ff9a6c7a15..f32f1cc5a1 100644 --- a/libavcodec/vvc/ps.c +++ b/libavcodec/vvc/ps.c @@ -1043,13 +1043,21 @@ static void alf_derive(VVCALF *alf, const H266RawAPS *aps) alf_cc(alf, aps); } +static void alf_free(FFRefStructOpaque unused, void *obj) +{ + VVCALF *alf = obj; + + ff_refstruct_unref(&alf->r); +} + static int aps_decode_alf(const VVCALF **alf, const H266RawAPS *aps) { - VVCALF *a = ff_refstruct_allocz(sizeof(*a)); + VVCALF *a = ff_refstruct_alloc_ext(sizeof(*a), 0, NULL, alf_free); if (!a) return AVERROR(ENOMEM); alf_derive(a, aps); + ff_refstruct_replace(&a->r, aps); ff_refstruct_replace(alf, a); ff_refstruct_unref(&a); diff --git a/libavcodec/vvc/ps.h b/libavcodec/vvc/ps.h index 9203e2c57f..3ec2238c17 100644 --- a/libavcodec/vvc/ps.h +++ b/libavcodec/vvc/ps.h @@ -169,6 +169,7 @@ typedef struct VVCPH { #define ALF_NUM_COEFF_CC 7 typedef struct VVCALF { + const H266RawAPS *r; int16_t luma_coeff [ALF_NUM_FILTERS_LUMA][ALF_NUM_COEFF_LUMA]; uint8_t luma_clip_idx [ALF_NUM_FILTERS_LUMA][ALF_NUM_COEFF_LUMA]; From patchwork Wed Sep 25 02:15:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp190414vqk; Tue, 24 Sep 2024 19:34:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX4MFYSzcEFimuo+uZEKbg1Y7dRriAHfy8saeIE6heVtZbZpW/wk3fPqnHsmIQnRMSQvmX7SWxyc6vb1/7VpYsl@gmail.com X-Google-Smtp-Source: AGHT+IFChM0p92ahEPqGg4VByyitXH9lc9sMrz6GdOxuJvJuiRJRIlPJf+JSW7vPMeteICH/yRre X-Received: by 2002:a05:6512:39d0:b0:52c:d819:517e with SMTP id 2adb3069b0e04-53877530ba0mr553029e87.30.1727231660160; Tue, 24 Sep 2024 19:34:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727231660; cv=none; d=google.com; s=arc-20240605; b=e4ZM0+u2NSDcnnS2Dbv0MRBDioLCVC6jTsdSVO9jtXdpqpF0tM0X6zm08142HFhMew wnbBkDY2RlPWZ9cFVH5+5I9orTTfNMvpmRBGIauzGN5EXFLhtOA/K4pAWUc4UO71ZaZW 8xEXtGI0bgfNF4Yao6mEBnfvADqWoVx9t9cU6tL9i5miHBI0089gHx2Cke88AhRqVGpL sy9+BMwJf5bkeExOReav27E/wmJmqHJUYQyKiw9FB97KMKyHCkkoDT9ccGtuL9hBlrUO iuCC10ZqmprmbjHiNpaxj8W6wmxAPIKYrZQmwuZXqM6CTV5E8NyPuaRWaY8IicXFvBX4 7lvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=fEk4Bu6WlgtBVQ17HJjWGT4fVjo2vcEUxchcSu9t7qo=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=lCMBLvjDZaveRqI0PG6ZkZvVG2ewQMNZOs0a3/x5h9jLgAs1v+gEyCH/BRwUm1nmcm R1BPhspUNWVdWz89BQbxuelbqRp28ddnyjCERQlFMClCVDI8JDLD4y4og5DM4ypuYcJo UlIjS7S4AJ3QryVsLcU6h0yv96qnEbdoDKo85nacwsiAqAJZ7c8rlTumll7UFH8grEAU rHfz8TA/0YLO+QkPG4nsyaCkFTpbRHqEspHdxBihsTasi0XaSZGLnYnN1LvijIGXwclL UqLNcZb/eAictRjCnIlqeivlXLj5oPXplrpniMtmFFCcwjIhrTrxGtttLazl1vnOuvGo bmNg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=HRv7xTwn; 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 2adb3069b0e04-537a85e1312si826227e87.97.2024.09.24.19.34.19; Tue, 24 Sep 2024 19:34:20 -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=@intel.com header.s=Intel header.b=HRv7xTwn; 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 161DB68DC1A; Wed, 25 Sep 2024 05:15:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74BE768DB18 for ; Wed, 25 Sep 2024 05:15:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230531; x=1758766531; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mwyqbi/9F2ctZVDuWhWfc6/vo3mf3vSRdU+IdE7wT48=; b=HRv7xTwnKCsWFhVynWt0joc1ziNrR7mW/QGDrhd7S9dtw+AOQijeWRnl mG9tBuBVxJV9ByVVoklW4l/ngBqUKAdf7pLeNsj5G0aY63S0JW8WlbHDq Ry8z+fR3+bDUNc3ej6VMReVeWs/k4OUglG5COmzprw7emRp5xJhgv+9Cp qWNM5E8+7Ker5vKffJYS5j+RRf2oUOfC3l9BP7naGASn2dX+EoSZYKo4E tSeX4VwKVcehwDbdcUiQmP3S1oXyylCBJJ433Ub4vhqS96A7AtVB+e5cE qTXNQQ0l5Kia/+qORO4xA0L+CEkgzdpwA1CTjNuR75fO4+lexB3x73Lci Q==; X-CSE-ConnectionGUID: XCPj3xcTSxSmQINRDuuxgw== X-CSE-MsgGUID: OsTk3sq3TRm7s+hU7izklg== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37634068" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37634068" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:15:22 -0700 X-CSE-ConnectionGUID: 3cprAL2UR0+zHsXXRwKoOA== X-CSE-MsgGUID: 6Kl4g9oaTueSmr5XOClflg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246400" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:16 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:32 +0800 Message-Id: <20240925021533.1742735-7-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925021533.1742735-1-fei.w.wang@intel.com> References: <20240925021533.1742735-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 7/8] lavc/vvc_dec: Add hardware decode API 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: S6i10a+hGmXv From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vvc/dec.c | 90 ++++++++++++++++++++++++++++++++++++------- libavcodec/vvc/dec.h | 4 ++ libavcodec/vvc/refs.c | 6 +++ 3 files changed, 87 insertions(+), 13 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index edf2607f50..19770de3fa 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -22,6 +22,8 @@ */ #include "libavcodec/codec_internal.h" #include "libavcodec/decode.h" +#include "libavcodec/hwaccel_internal.h" +#include "libavcodec/hwconfig.h" #include "libavcodec/profiles.h" #include "libavcodec/refstruct.h" #include "libavutil/cpu.h" @@ -610,6 +612,8 @@ static int ref_frame(VVCFrame *dst, const VVCFrame *src) ff_refstruct_replace(&dst->rpl_tab, src->rpl_tab); ff_refstruct_replace(&dst->rpl, src->rpl); + ff_refstruct_replace(&dst->hwaccel_picture_private, + src->hwaccel_picture_private); dst->nb_rpl_elems = src->nb_rpl_elems; dst->poc = src->poc; @@ -770,18 +774,50 @@ static int slice_start(SliceContext *sc, VVCContext *s, VVCFrameContext *fc, return 0; } -static void export_frame_params(VVCContext *s, const VVCFrameContext *fc) +static enum AVPixelFormat get_format(AVCodecContext *avctx, const VVCSPS *sps) +{ +#define HWACCEL_MAX 0 + + enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; + + switch (sps->pix_fmt) { + case AV_PIX_FMT_YUV420P: + break; + case AV_PIX_FMT_YUV420P10: + break; + } + + *fmt++ = sps->pix_fmt; + *fmt = AV_PIX_FMT_NONE; + + return ff_get_format(avctx, pix_fmts); +} + +static int export_frame_params(VVCContext *s, const VVCFrameContext *fc) { AVCodecContext *c = s->avctx; const VVCSPS *sps = fc->ps.sps; const VVCPPS *pps = fc->ps.pps; + int ret; - c->pix_fmt = sps->pix_fmt; - c->coded_width = pps->width; - c->coded_height = pps->height; - c->width = pps->width - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]); - c->height = pps->height - ((pps->r->pps_conf_win_top_offset + pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]); + // Reset HW config if pix_fmt/w/h change. + if (s->pix_fmt != sps->pix_fmt || c->coded_width != pps->width || c->coded_height != pps->height) { + c->coded_width = pps->width; + c->coded_height = pps->height; + c->pix_fmt = get_format(c, sps); + ret = get_format(c, sps); + if (ret < 0) + return ret; + + c->pix_fmt = ret; + s->pix_fmt = sps->pix_fmt; + } + + c->width = pps->width - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]); + c->height = pps->height - ((pps->r->pps_conf_win_top_offset + pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]); c->has_b_frames = sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1]; + + return 0; } static int frame_setup(VVCFrameContext *fc, VVCContext *s) @@ -794,8 +830,11 @@ static int frame_setup(VVCFrameContext *fc, VVCContext *s) if (ret < 0) return ret; - export_frame_params(s, fc); - return ret; + ret = export_frame_params(s, fc); + if (ret < 0) + return ret; + + return 0; } static int decode_slice(VVCContext *s, VVCFrameContext *fc, const H2645NAL *nal, const CodedBitstreamUnit *unit) @@ -824,6 +863,20 @@ static int decode_slice(VVCContext *s, VVCFrameContext *fc, const H2645NAL *nal, ret = slice_init_entry_points(sc, fc, nal, unit); if (ret < 0) return ret; + + if (s->avctx->hwaccel) { + if (is_first_slice) { + ret = FF_HW_CALL(s->avctx, start_frame, NULL, 0); + if (ret < 0) + return ret; + } + + ret = FF_HW_CALL(s->avctx, decode_slice, + nal->raw_data, nal->raw_size); + if (ret < 0) + return ret; + } + fc->nb_slices++; return 0; @@ -939,17 +992,26 @@ static int wait_delayed_frame(VVCContext *s, AVFrame *output, int *got_output) static int submit_frame(VVCContext *s, VVCFrameContext *fc, AVFrame *output, int *got_output) { - int ret = ff_vvc_frame_submit(s, fc); + int ret; - if (ret < 0) { - ff_vvc_report_frame_finished(fc->ref); - return ret; + if (s->avctx->hwaccel) { + if (ret = FF_HW_SIMPLE_CALL(s->avctx, end_frame) < 0) { + av_log(s->avctx, AV_LOG_ERROR, + "Hardware accelerator failed to decode picture\n"); + ff_vvc_unref_frame(fc, fc->ref, ~0); + return ret; + } + } else { + if (ret = ff_vvc_frame_submit(s, fc) < 0) { + ff_vvc_report_frame_finished(fc->ref); + return ret; + } } s->nb_frames++; s->nb_delayed++; - if (s->nb_delayed >= s->nb_fcs) { + if (s->nb_delayed >= s->nb_fcs || s->avctx->hwaccel) { if ((ret = wait_delayed_frame(s, output, got_output)) < 0) return ret; } @@ -1095,6 +1157,8 @@ static av_cold int vvc_decode_init(AVCodecContext *avctx) GDR_SET_RECOVERED(s); ff_thread_once(&init_static_once, init_default_scale_m); + s->pix_fmt = AV_PIX_FMT_NONE; + return 0; } diff --git a/libavcodec/vvc/dec.h b/libavcodec/vvc/dec.h index d27cf52ca2..776b38b20f 100644 --- a/libavcodec/vvc/dec.h +++ b/libavcodec/vvc/dec.h @@ -101,6 +101,8 @@ typedef struct VVCFrame { * A combination of VVC_FRAME_FLAG_* */ uint8_t flags; + + void *hwaccel_picture_private; ///< hardware accelerator private data } VVCFrame; typedef struct SliceContext { @@ -243,6 +245,8 @@ typedef struct VVCContext { uint64_t nb_frames; ///< processed frames int nb_delayed; ///< delayed frames + + enum AVPixelFormat pix_fmt; ///< pix format of current frame } VVCContext ; #endif /* AVCODEC_VVC_DEC_H */ diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c index 3ed9d6768d..281410091e 100644 --- a/libavcodec/vvc/refs.c +++ b/libavcodec/vvc/refs.c @@ -26,6 +26,7 @@ #include "libavutil/thread.h" #include "libavcodec/refstruct.h" #include "libavcodec/thread.h" +#include "libavcodec/decode.h" #include "refs.h" @@ -59,6 +60,7 @@ void ff_vvc_unref_frame(VVCFrameContext *fc, VVCFrame *frame, int flags) ff_refstruct_unref(&frame->rpl_tab); frame->collocated_ref = NULL; + ff_refstruct_unref(&frame->hwaccel_picture_private); } } @@ -153,6 +155,10 @@ static VVCFrame *alloc_frame(VVCContext *s, VVCFrameContext *fc) if (!frame->progress) goto fail; + ret = ff_hwaccel_frame_priv_alloc(s->avctx, &frame->hwaccel_picture_private); + if (ret < 0) + goto fail; + return frame; fail: ff_vvc_unref_frame(fc, frame, ~0); From patchwork Wed Sep 25 02:15:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51810 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp187941vqk; Tue, 24 Sep 2024 19:24:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVHpypER/ZrcaN9RRF87N/9JhB8KVDC4mJjepE75joamSBS7EzsS2P5x3z6DMOVvcECRfDwDu4f46LPSpsMOKmi@gmail.com X-Google-Smtp-Source: AGHT+IEiMR/5eryObJSnXnEE2UqNShOSuXhzJ+M5tRnCNZS8uWRJrA8Q9xPFm1IrnD6ZN7/RUf/u X-Received: by 2002:a17:907:1c88:b0:a91:1787:a955 with SMTP id a640c23a62f3a-a93a03c3285mr73548466b.28.1727231061417; Tue, 24 Sep 2024 19:24:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727231061; cv=none; d=google.com; s=arc-20240605; b=OcIIRr+DHB2zs3uEvTrqfhYcvpkHUD3ouZcv/8eIavKoENOApQ+Kw+5x4o+6HDSuy6 8kZ1BWhts5w69LOzaCS5wg4oPsXWNztmCyFhdXj1YU4xLEZayIyX98d/E/QkBIv26t0l Tju0oYJvZDRbqRJ9GOceeLy2rYCLKn9tT1sK2BvaP1kDjhlHhWBLo+zoLyh/XIsV/4i6 LggeSiIupH5s0JZ9v/LpD2etW/41js8a7snUswo+uZmzTyLbI8kENai08uLk3aGIYEK6 36apRI/EjKPBTcqnkmlE886dFqDePbtAqo4rjVdCZgrG09nlA39Tj+nQHQ4k1JZn4PEp CjeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=w2Q1Xom0BkllBej6XBnWirm9S2kDlUBnYrCj2L5ipxc=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=IAdqvHGgr4hVRDcVVCwDhwu3blRiY/4+cRMrDcnd1qv6dIcDifaI7xVYxKIjY6BGX4 d/AtvOAieHJpfMxNa+UJ4pQnvQwJrNELm9IzgTkfV1nQdbDpQJv93XQW6eIAiXselg1h /OnttMogYn6iCpnJffC9qIB8DX+1x3PH7CyUO9Sw0USlRRSx8v4bQOXHL1C+5zp/uCFe zkDBFrrY8n0moS6RkAacmomUbfdh3VQbrj33CHL43E6obLNWcK/ukxI3x1ilHLp826De uiZ7d8ycNOR6j6lAoD0HtMymGAuKlNcmED1yYP6/SVBImt5uwhGl6a4keKXWniMurYNn gr0Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=b8C9cp90; 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 a640c23a62f3a-a9392f2bac2si171052366b.61.2024.09.24.19.24.20; Tue, 24 Sep 2024 19:24:21 -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=@intel.com header.s=Intel header.b=b8C9cp90; 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 AC1B568DC65; Wed, 25 Sep 2024 05:15:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 757F368DC2A for ; Wed, 25 Sep 2024 05:15:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230537; x=1758766537; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i3R/PdojKbtCsI0zTUIwfiApCeJFDNyI6tCwsmsRdFo=; b=b8C9cp905rB5h6nFMklDlmwrxGpUDpcVwqSZR9jm9Ily4Bip4dAgzWYR NMxmgP7y/UVRSgXb9BgiDhI4aV0vaEtNvQDYt1PfnXhq66gzhobk50eaV QfUatnYo5fRsZ9lidClMO6mpKOXyAt1sTBD6DEDr9cwgVSX/er/Ki3IcY lx1u+FaXTJP60Zmm7pRwD9o54/4qbg3ktfGrH30sKpV++Lr/SlspN1+Su a4rwrsyb9Z6viXiao+hSkEZ3Lo0G5f5g/00q/YqbgSFBRMSi47YmrkQJT AgYKJiA42/SUxbtC/kdRfL7uFFKJjamCJ+ECEl0wMk3rWZvtNZXmQLXsB g==; X-CSE-ConnectionGUID: IxXCggzWRcyP1O6q5Gmm4Q== X-CSE-MsgGUID: LDd2OBWoTFusRKXrHhdH3Q== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37634102" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37634102" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:15:27 -0700 X-CSE-ConnectionGUID: Tn2IOU49Ta+Dm2gS4ZV3Bg== X-CSE-MsgGUID: kX8c5uvATFiULuDTxt64EQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246409" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:17 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:33 +0800 Message-Id: <20240925021533.1742735-8-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925021533.1742735-1-fei.w.wang@intel.com> References: <20240925021533.1742735-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 8/8] lavc/vaapi_dec: Add VVC decoder 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gfFlVSaJGYc9 From: Fei Wang Signed-off-by: Fei Wang --- Changelog | 2 + configure | 3 + libavcodec/Makefile | 1 + libavcodec/hwaccels.h | 1 + libavcodec/vaapi_decode.c | 4 + libavcodec/vaapi_vvc.c | 657 ++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- libavcodec/vvc/dec.c | 15 +- 8 files changed, 683 insertions(+), 2 deletions(-) create mode 100644 libavcodec/vaapi_vvc.c diff --git a/Changelog b/Changelog index b82b948074..5481b5fb53 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,8 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version : +- VVC VAAPI decoder + version 7.1: - Raw Captions with Time (RCWT) closed caption demuxer diff --git a/configure b/configure index d77a55b653..b469164250 100755 --- a/configure +++ b/configure @@ -3278,6 +3278,8 @@ vp9_vdpau_hwaccel_deps="vdpau VdpPictureInfoVP9" vp9_vdpau_hwaccel_select="vp9_decoder" vp9_videotoolbox_hwaccel_deps="videotoolbox" vp9_videotoolbox_hwaccel_select="vp9_decoder" +vvc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferVVC" +vvc_vaapi_hwaccel_select="vvc_decoder" wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel" wmv3_d3d11va2_hwaccel_select="vc1_d3d11va2_hwaccel" wmv3_d3d12va_hwaccel_select="vc1_d3d12va_hwaccel" @@ -7299,6 +7301,7 @@ if enabled vaapi; then check_cpp_condition vaapi_1 "va/va.h" "VA_CHECK_VERSION(1, 0, 0)" check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC" + check_type "va/va.h va/va_dec_vvc.h" "VAPictureParameterBufferVVC" check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth check_struct "va/va.h" "VADecPictureParameterBufferAV1" bit_depth_idx check_type "va/va.h va/va_vpp.h" "VAProcFilterParameterBufferHDRToneMapping" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a4fcce3b42..0c7bba8ec6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1062,6 +1062,7 @@ OBJS-$(CONFIG_VP9_VAAPI_HWACCEL) += vaapi_vp9.o OBJS-$(CONFIG_VP9_VDPAU_HWACCEL) += vdpau_vp9.o OBJS-$(CONFIG_VP9_VIDEOTOOLBOX_HWACCEL) += videotoolbox_vp9.o OBJS-$(CONFIG_VP8_QSV_HWACCEL) += qsvdec.o +OBJS-$(CONFIG_VVC_VAAPI_HWACCEL) += vaapi_vvc.o # Objects duplicated from other libraries for shared builds SHLIBOBJS += log2_tab.o reverse.o diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h index 5171e4c7d7..88d6b9a9b5 100644 --- a/libavcodec/hwaccels.h +++ b/libavcodec/hwaccels.h @@ -82,6 +82,7 @@ extern const struct FFHWAccel ff_vp9_nvdec_hwaccel; extern const struct FFHWAccel ff_vp9_vaapi_hwaccel; extern const struct FFHWAccel ff_vp9_vdpau_hwaccel; extern const struct FFHWAccel ff_vp9_videotoolbox_hwaccel; +extern const struct FFHWAccel ff_vvc_vaapi_hwaccel; extern const struct FFHWAccel ff_wmv3_d3d11va_hwaccel; extern const struct FFHWAccel ff_wmv3_d3d11va2_hwaccel; extern const struct FFHWAccel ff_wmv3_d3d12va_hwaccel; diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 7753f72106..4ac2df5b43 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -464,6 +464,9 @@ static const struct { MAP(AV1, AV1_MAIN, AV1Profile0), MAP(AV1, AV1_HIGH, AV1Profile1), #endif +#if VA_CHECK_VERSION(1, 22, 0) + MAP(H266, VVC_MAIN_10, VVCMain10), +#endif #undef MAP }; @@ -629,6 +632,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, // Add per-codec number of surfaces used for storing reference frames. switch (avctx->codec_id) { case AV_CODEC_ID_H264: + case AV_CODEC_ID_H266: case AV_CODEC_ID_HEVC: case AV_CODEC_ID_AV1: frames->initial_pool_size += 16; diff --git a/libavcodec/vaapi_vvc.c b/libavcodec/vaapi_vvc.c new file mode 100644 index 0000000000..11787122a2 --- /dev/null +++ b/libavcodec/vaapi_vvc.c @@ -0,0 +1,657 @@ +/* + * VVC HW decode acceleration through VA API + * + * Copyright (c) 2024 Intel Corporation + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include "vvc/dec.h" +#include "vvc/refs.h" +#include "hwaccel_internal.h" +#include "vaapi_decode.h" + +typedef struct VAAPIDecodePictureVVC { + VAAPIDecodePicture pic; + VAPictureParameterBufferVVC pic_param; + VASliceParameterBufferVVC slice_param; + int decode_issued; +} VAAPIDecodePictureVVC; + +static void init_vaapi_pic(VAPictureVVC *va_pic) +{ + va_pic->picture_id = VA_INVALID_ID; + va_pic->flags = VA_PICTURE_VVC_INVALID; + va_pic->pic_order_cnt = 0; +} + +static void fill_vaapi_pic(VAPictureVVC *va_pic, const VVCFrame *pic) +{ + va_pic->picture_id = ff_vaapi_get_surface_id(pic->frame); + va_pic->pic_order_cnt = pic->poc; + va_pic->flags = 0; + + if (pic->flags & VVC_FRAME_FLAG_LONG_REF) + va_pic->flags |= VA_PICTURE_VVC_LONG_TERM_REFERENCE; +} + +static void fill_vaapi_reference_frames(const VVCFrameContext *h, VAPictureParameterBufferVVC *pp) +{ + const VVCFrame *current_picture = h->ref; + int i, j; + + for (i = 0, j = 0; i < FF_ARRAY_ELEMS(pp->ReferenceFrames); i++) { + const VVCFrame *frame = NULL; + + while (!frame && j < FF_ARRAY_ELEMS(h->DPB)) { + if ((&h->DPB[j] != current_picture ) && + (h->DPB[j].flags & (VVC_FRAME_FLAG_LONG_REF | VVC_FRAME_FLAG_SHORT_REF))) + frame = &h->DPB[j]; + j++; + } + + init_vaapi_pic(&pp->ReferenceFrames[i]); + + if (frame) { + VAAPIDecodePictureVVC *pic; + fill_vaapi_pic(&pp->ReferenceFrames[i], frame); + pic = frame->hwaccel_picture_private; + if (!pic->decode_issued) + pp->ReferenceFrames[i].flags |= VA_PICTURE_VVC_UNAVAILABLE_REFERENCE; + } + } +} + +static int vaapi_vvc_start_frame(AVCodecContext *avctx, + av_unused const uint8_t *buffer, + av_unused uint32_t size) +{ + const VVCContext *h = avctx->priv_data; + VVCFrameContext *fc = &h->fcs[(h->nb_frames + h->nb_fcs) % h->nb_fcs]; + const H266RawSPS *sps = fc->ps.sps->r; + const H266RawPPS *pps = fc->ps.pps->r; + const H266RawPictureHeader *ph = fc->ps.ph.r; + VAAPIDecodePictureVVC *pic = fc->ref->hwaccel_picture_private; + VAPictureParameterBufferVVC *pic_param = &pic->pic_param; + uint16_t tile_dim, exp_slice_height_in_ctus[VVC_MAX_SLICES] = {0}; + int i, j, k, err; + + pic->pic.output_surface = ff_vaapi_get_surface_id(fc->ref->frame); + + *pic_param = (VAPictureParameterBufferVVC) { + .pps_pic_width_in_luma_samples = pps->pps_pic_width_in_luma_samples, + .pps_pic_height_in_luma_samples = pps->pps_pic_height_in_luma_samples, + .sps_num_subpics_minus1 = sps->sps_num_subpics_minus1, + .sps_chroma_format_idc = sps->sps_chroma_format_idc, + .sps_bitdepth_minus8 = sps->sps_bitdepth_minus8, + .sps_log2_ctu_size_minus5 = sps->sps_log2_ctu_size_minus5, + .sps_log2_min_luma_coding_block_size_minus2 = sps->sps_log2_min_luma_coding_block_size_minus2, + .sps_log2_transform_skip_max_size_minus2 = sps->sps_log2_transform_skip_max_size_minus2, + .sps_six_minus_max_num_merge_cand = sps->sps_six_minus_max_num_merge_cand, + .sps_five_minus_max_num_subblock_merge_cand = sps->sps_five_minus_max_num_subblock_merge_cand, + .sps_max_num_merge_cand_minus_max_num_gpm_cand = sps->sps_max_num_merge_cand_minus_max_num_gpm_cand, + .sps_log2_parallel_merge_level_minus2 = sps->sps_log2_parallel_merge_level_minus2, + .sps_min_qp_prime_ts = sps->sps_min_qp_prime_ts, + .sps_six_minus_max_num_ibc_merge_cand = sps->sps_six_minus_max_num_ibc_merge_cand, + .sps_num_ladf_intervals_minus2 = sps->sps_num_ladf_intervals_minus2, + .sps_ladf_lowest_interval_qp_offset = sps->sps_ladf_lowest_interval_qp_offset, + .sps_flags.bits = { + .sps_subpic_info_present_flag = sps->sps_subpic_info_present_flag, + .sps_independent_subpics_flag = sps->sps_independent_subpics_flag, + .sps_subpic_same_size_flag = sps->sps_subpic_same_size_flag, + .sps_entropy_coding_sync_enabled_flag = sps->sps_entropy_coding_sync_enabled_flag, + .sps_qtbtt_dual_tree_intra_flag = sps->sps_qtbtt_dual_tree_intra_flag, + .sps_max_luma_transform_size_64_flag = sps->sps_max_luma_transform_size_64_flag, + .sps_transform_skip_enabled_flag = sps->sps_transform_skip_enabled_flag, + .sps_bdpcm_enabled_flag = sps->sps_bdpcm_enabled_flag, + .sps_mts_enabled_flag = sps->sps_mts_enabled_flag, + .sps_explicit_mts_intra_enabled_flag = sps->sps_explicit_mts_intra_enabled_flag, + .sps_explicit_mts_inter_enabled_flag = sps->sps_explicit_mts_inter_enabled_flag, + .sps_lfnst_enabled_flag = sps->sps_lfnst_enabled_flag, + .sps_joint_cbcr_enabled_flag = sps->sps_joint_cbcr_enabled_flag, + .sps_same_qp_table_for_chroma_flag = sps->sps_same_qp_table_for_chroma_flag, + .sps_sao_enabled_flag = sps->sps_sao_enabled_flag, + .sps_alf_enabled_flag = sps->sps_alf_enabled_flag, + .sps_ccalf_enabled_flag = sps->sps_alf_enabled_flag, + .sps_lmcs_enabled_flag = sps->sps_lmcs_enabled_flag, + .sps_sbtmvp_enabled_flag = sps->sps_sbtmvp_enabled_flag, + .sps_amvr_enabled_flag = sps->sps_amvr_enabled_flag, + .sps_smvd_enabled_flag = sps->sps_smvd_enabled_flag, + .sps_mmvd_enabled_flag = sps->sps_mmvd_enabled_flag, + .sps_sbt_enabled_flag = sps->sps_sbt_enabled_flag, + .sps_affine_enabled_flag = sps->sps_affine_enabled_flag, + .sps_6param_affine_enabled_flag = sps->sps_6param_affine_enabled_flag, + .sps_affine_amvr_enabled_flag = sps->sps_affine_amvr_enabled_flag, + .sps_affine_prof_enabled_flag = sps->sps_affine_prof_enabled_flag, + .sps_bcw_enabled_flag = sps->sps_bcw_enabled_flag, + .sps_ciip_enabled_flag = sps->sps_ciip_enabled_flag, + .sps_gpm_enabled_flag = sps->sps_gpm_enabled_flag, + .sps_isp_enabled_flag = sps->sps_isp_enabled_flag, + .sps_mrl_enabled_flag = sps->sps_mrl_enabled_flag, + .sps_mip_enabled_flag = sps->sps_mip_enabled_flag, + .sps_cclm_enabled_flag = sps->sps_cclm_enabled_flag, + .sps_chroma_horizontal_collocated_flag = sps->sps_chroma_horizontal_collocated_flag, + .sps_chroma_vertical_collocated_flag = sps->sps_chroma_vertical_collocated_flag, + .sps_palette_enabled_flag = sps->sps_palette_enabled_flag, + .sps_act_enabled_flag = sps->sps_act_enabled_flag, + .sps_ibc_enabled_flag = sps->sps_ibc_enabled_flag, + .sps_ladf_enabled_flag = sps->sps_ladf_enabled_flag, + .sps_explicit_scaling_list_enabled_flag = sps->sps_explicit_scaling_list_enabled_flag, + .sps_scaling_matrix_for_lfnst_disabled_flag = sps->sps_scaling_matrix_for_lfnst_disabled_flag, + .sps_scaling_matrix_for_alternative_colour_space_disabled_flag = sps->sps_scaling_matrix_for_alternative_colour_space_disabled_flag, + .sps_scaling_matrix_designated_colour_space_flag = sps->sps_scaling_matrix_designated_colour_space_flag, + .sps_virtual_boundaries_enabled_flag = sps->sps_virtual_boundaries_enabled_flag, + .sps_virtual_boundaries_present_flag = sps->sps_virtual_boundaries_present_flag, + }, + .NumVerVirtualBoundaries = sps->sps_virtual_boundaries_present_flag ? + sps->sps_num_ver_virtual_boundaries : + ph->ph_num_ver_virtual_boundaries, + .NumHorVirtualBoundaries = sps->sps_virtual_boundaries_present_flag ? + sps->sps_num_hor_virtual_boundaries : + ph->ph_num_hor_virtual_boundaries, + .pps_scaling_win_left_offset = pps->pps_scaling_win_left_offset, + .pps_scaling_win_right_offset = pps->pps_scaling_win_right_offset, + .pps_scaling_win_top_offset = pps->pps_scaling_win_top_offset, + .pps_scaling_win_bottom_offset = pps->pps_scaling_win_bottom_offset, + .pps_num_exp_tile_columns_minus1 = pps->pps_num_exp_tile_columns_minus1, + .pps_num_exp_tile_rows_minus1 = pps->pps_num_exp_tile_rows_minus1, + .pps_num_slices_in_pic_minus1 = pps->pps_num_slices_in_pic_minus1, + .pps_pic_width_minus_wraparound_offset = pps->pps_pic_width_minus_wraparound_offset, + .pps_cb_qp_offset = pps->pps_cb_qp_offset, + .pps_cr_qp_offset = pps->pps_cr_qp_offset, + .pps_joint_cbcr_qp_offset_value = pps->pps_joint_cbcr_qp_offset_value, + .pps_chroma_qp_offset_list_len_minus1 = pps->pps_chroma_qp_offset_list_len_minus1, + .pps_flags.bits = { + .pps_loop_filter_across_tiles_enabled_flag = pps->pps_loop_filter_across_tiles_enabled_flag, + .pps_rect_slice_flag = pps->pps_rect_slice_flag, + .pps_single_slice_per_subpic_flag = pps->pps_single_slice_per_subpic_flag, + .pps_loop_filter_across_slices_enabled_flag = pps->pps_loop_filter_across_slices_enabled_flag, + .pps_weighted_pred_flag = pps->pps_weighted_pred_flag, + .pps_weighted_bipred_flag = pps->pps_weighted_bipred_flag, + .pps_ref_wraparound_enabled_flag = pps->pps_ref_wraparound_enabled_flag, + .pps_cu_qp_delta_enabled_flag = pps->pps_cu_qp_delta_enabled_flag, + .pps_cu_chroma_qp_offset_list_enabled_flag = pps->pps_cu_chroma_qp_offset_list_enabled_flag, + .pps_deblocking_filter_override_enabled_flag = pps->pps_deblocking_filter_override_enabled_flag, + .pps_deblocking_filter_disabled_flag = pps->pps_deblocking_filter_disabled_flag, + .pps_dbf_info_in_ph_flag = pps->pps_dbf_info_in_ph_flag, + .pps_sao_info_in_ph_flag = pps->pps_sao_info_in_ph_flag, + .pps_alf_info_in_ph_flag = pps->pps_alf_info_in_ph_flag, + }, + .ph_lmcs_aps_id = ph->ph_lmcs_aps_id, + .ph_scaling_list_aps_id = ph->ph_scaling_list_aps_id, + .ph_log2_diff_min_qt_min_cb_intra_slice_luma = ph->ph_log2_diff_min_qt_min_cb_intra_slice_luma, + .ph_max_mtt_hierarchy_depth_intra_slice_luma = ph->ph_max_mtt_hierarchy_depth_intra_slice_luma, + .ph_log2_diff_max_bt_min_qt_intra_slice_luma = ph->ph_log2_diff_max_bt_min_qt_intra_slice_luma, + .ph_log2_diff_max_tt_min_qt_intra_slice_luma = ph->ph_log2_diff_max_tt_min_qt_intra_slice_luma, + .ph_log2_diff_min_qt_min_cb_intra_slice_chroma = ph->ph_log2_diff_min_qt_min_cb_intra_slice_chroma, + .ph_max_mtt_hierarchy_depth_intra_slice_chroma = ph->ph_max_mtt_hierarchy_depth_intra_slice_chroma, + .ph_log2_diff_max_bt_min_qt_intra_slice_chroma = ph->ph_log2_diff_max_bt_min_qt_intra_slice_chroma, + .ph_log2_diff_max_tt_min_qt_intra_slice_chroma = ph->ph_log2_diff_max_tt_min_qt_intra_slice_chroma, + .ph_cu_qp_delta_subdiv_intra_slice = ph->ph_cu_qp_delta_subdiv_intra_slice, + .ph_cu_chroma_qp_offset_subdiv_intra_slice = ph->ph_cu_chroma_qp_offset_subdiv_intra_slice, + .ph_log2_diff_min_qt_min_cb_inter_slice = ph->ph_log2_diff_min_qt_min_cb_inter_slice, + .ph_max_mtt_hierarchy_depth_inter_slice = ph->ph_max_mtt_hierarchy_depth_inter_slice, + .ph_log2_diff_max_bt_min_qt_inter_slice = ph->ph_log2_diff_max_bt_min_qt_inter_slice, + .ph_log2_diff_max_tt_min_qt_inter_slice = ph->ph_log2_diff_max_tt_min_qt_inter_slice, + .ph_cu_qp_delta_subdiv_inter_slice = ph->ph_cu_qp_delta_subdiv_inter_slice, + .ph_cu_chroma_qp_offset_subdiv_inter_slice = ph->ph_cu_chroma_qp_offset_subdiv_inter_slice, + .ph_flags.bits= { + .ph_non_ref_pic_flag = ph->ph_non_ref_pic_flag, + .ph_alf_enabled_flag = ph->ph_alf_enabled_flag, + .ph_alf_cb_enabled_flag = ph->ph_alf_cb_enabled_flag, + .ph_alf_cr_enabled_flag = ph->ph_alf_cr_enabled_flag, + .ph_alf_cc_cb_enabled_flag = ph->ph_alf_cc_cb_enabled_flag, + .ph_alf_cc_cr_enabled_flag = ph->ph_alf_cc_cr_enabled_flag, + .ph_lmcs_enabled_flag = ph->ph_lmcs_enabled_flag, + .ph_chroma_residual_scale_flag = ph->ph_chroma_residual_scale_flag, + .ph_explicit_scaling_list_enabled_flag = ph->ph_explicit_scaling_list_enabled_flag, + .ph_virtual_boundaries_present_flag = ph->ph_virtual_boundaries_present_flag, + .ph_temporal_mvp_enabled_flag = ph->ph_temporal_mvp_enabled_flag, + .ph_mmvd_fullpel_only_flag = ph->ph_mmvd_fullpel_only_flag, + .ph_mvd_l1_zero_flag = ph->ph_mvd_l1_zero_flag, + .ph_bdof_disabled_flag = ph->ph_bdof_disabled_flag, + .ph_dmvr_disabled_flag = ph->ph_dmvr_disabled_flag, + .ph_prof_disabled_flag = ph->ph_prof_disabled_flag, + .ph_joint_cbcr_sign_flag = ph->ph_joint_cbcr_sign_flag, + .ph_sao_luma_enabled_flag = ph->ph_sao_luma_enabled_flag, + .ph_sao_chroma_enabled_flag = ph->ph_sao_chroma_enabled_flag, + .ph_deblocking_filter_disabled_flag = ph->ph_deblocking_filter_disabled_flag, + }, + .PicMiscFlags.fields = { + .IntraPicFlag = pps->pps_mixed_nalu_types_in_pic_flag ? 0 : IS_IRAP(h) ? 1 : 0, + } + }; + + fill_vaapi_pic(&pic_param->CurrPic, fc->ref); + fill_vaapi_reference_frames(fc, pic_param); + + for (i = 0; i < VVC_MAX_SAMPLE_ARRAYS; i++) + for (j = 0; j < VVC_MAX_POINTS_IN_QP_TABLE; j++) + pic_param->ChromaQpTable[i][j] = fc->ps.sps->chroma_qp_table[i][j]; + for (i = 0; i < 4; i++) { + pic_param->sps_ladf_qp_offset[i] = sps->sps_ladf_qp_offset[i]; + pic_param->sps_ladf_delta_threshold_minus1[i] = sps->sps_ladf_delta_threshold_minus1[i]; + } + + for (i = 0; i < (sps->sps_virtual_boundaries_present_flag ? sps->sps_num_ver_virtual_boundaries : ph->ph_num_ver_virtual_boundaries); i++) { + pic_param->VirtualBoundaryPosX[i] = (sps->sps_virtual_boundaries_present_flag ? + (sps->sps_virtual_boundary_pos_x_minus1[ i ] + 1) : + (ph->ph_virtual_boundary_pos_x_minus1[i] + 1)) * 8; + } + + for (i = 0; i < (sps->sps_virtual_boundaries_present_flag ? sps->sps_num_hor_virtual_boundaries : ph->ph_num_hor_virtual_boundaries); i++) { + pic_param->VirtualBoundaryPosY[i] = (sps->sps_virtual_boundaries_present_flag ? + (sps->sps_virtual_boundary_pos_y_minus1[ i ] + 1) : + (ph->ph_virtual_boundary_pos_y_minus1[i] + 1)) * 8; + } + + for (i = 0; i < 6; i++) { + pic_param->pps_cb_qp_offset_list[i] = pps->pps_cb_qp_offset_list[i]; + pic_param->pps_cr_qp_offset_list[i] = pps->pps_cr_qp_offset_list[i]; + pic_param->pps_joint_cbcr_qp_offset_list[i] = pps->pps_joint_cbcr_qp_offset_list[i]; + } + + err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic, + VAPictureParameterBufferType, + &pic->pic_param, sizeof(VAPictureParameterBufferVVC)); + if (err < 0) + goto fail; + + for (i = 0; i <= sps->sps_num_subpics_minus1 && sps->sps_subpic_info_present_flag; i++) { + VASubPicVVC subpic_param = { + .sps_subpic_ctu_top_left_x = sps->sps_subpic_ctu_top_left_x[i], + .sps_subpic_ctu_top_left_y = sps->sps_subpic_ctu_top_left_y[i], + .sps_subpic_width_minus1 = sps->sps_subpic_width_minus1[i], + .sps_subpic_height_minus1 = sps->sps_subpic_height_minus1[i], + .SubpicIdVal = pps->sub_pic_id_val[i], + .subpic_flags.bits = { + .sps_subpic_treated_as_pic_flag = sps->sps_subpic_treated_as_pic_flag[i], + .sps_loop_filter_across_subpic_enabled_flag = sps->sps_loop_filter_across_subpic_enabled_flag[i], + } + }; + err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic, + VASubPicBufferType, + &subpic_param, sizeof(VASubPicVVC)); + if (err < 0) + goto fail; + } + + for (i = 0; i < VVC_MAX_ALF_COUNT; i++) { + const VVCALF *alf_list = h->ps.alf_list[i]; + if (alf_list) { + const H266RawAPS *alf = alf_list->r; + VAAlfDataVVC alf_param = { + .aps_adaptation_parameter_set_id = i, + .alf_luma_num_filters_signalled_minus1 = alf->alf_luma_num_filters_signalled_minus1, + .alf_chroma_num_alt_filters_minus1 = alf->alf_chroma_num_alt_filters_minus1, + .alf_cc_cb_filters_signalled_minus1 = alf->alf_cc_cb_filters_signalled_minus1, + .alf_cc_cr_filters_signalled_minus1 = alf->alf_cc_cr_filters_signalled_minus1, + .alf_flags.bits = { + .alf_luma_filter_signal_flag = alf->alf_luma_filter_signal_flag, + .alf_chroma_filter_signal_flag = alf->alf_chroma_filter_signal_flag, + .alf_cc_cb_filter_signal_flag = alf->alf_cc_cb_filter_signal_flag, + .alf_cc_cr_filter_signal_flag = alf->alf_cc_cr_filter_signal_flag, + .alf_luma_clip_flag = alf->alf_luma_clip_flag, + .alf_chroma_clip_flag = alf->alf_chroma_clip_flag, + } + }; + + for (j = 0; j < 25; j++) + alf_param.alf_luma_coeff_delta_idx[j] = alf->alf_luma_coeff_delta_idx[j]; + + for (j = 0; j < 25; j++) { + for (k = 0; k < 12; k++) { + alf_param.filtCoeff[j][k] = alf->alf_luma_coeff_abs[j][k] * (1 - 2 * alf->alf_luma_coeff_sign[j][k]); + alf_param.alf_luma_clip_idx[j][k] = alf->alf_luma_clip_idx[j][k]; + } + } + + for (j = 0; j < 8; j++) { + for (k = 0; k < 6; k++) { + alf_param.AlfCoeffC[j][k] = alf->alf_chroma_coeff_abs[j][k] * (1 - 2 * alf->alf_chroma_coeff_sign[j][k]); + alf_param.alf_chroma_clip_idx[j][k] = alf->alf_chroma_clip_idx[j][k]; + } + } + + for (j = 0; j < 4; j++) { + for (k = 0; k < 7; k++) { + if (alf->alf_cc_cb_mapped_coeff_abs[j][k]) + alf_param.CcAlfApsCoeffCb[j][k] = (1 - 2 * alf->alf_cc_cb_coeff_sign[j][k]) * (1 << (alf->alf_cc_cb_mapped_coeff_abs[j][k] - 1)); + if (alf->alf_cc_cr_mapped_coeff_abs[j][k]) + alf_param.CcAlfApsCoeffCr[j][k] = (1 - 2 * alf->alf_cc_cr_coeff_sign[j][k]) * (1 << (alf->alf_cc_cr_mapped_coeff_abs[j][k] - 1)); + } + } + + err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic, + VAAlfBufferType, + &alf_param, sizeof(VAAlfDataVVC)); + if (err < 0) + goto fail; + } + } + + for (i = 0; i < VVC_MAX_LMCS_COUNT; i++) { + const H266RawAPS *lmcs = h->ps.lmcs_list[i]; + if (lmcs) { + VALmcsDataVVC lmcs_param = { + .aps_adaptation_parameter_set_id = i, + .lmcs_min_bin_idx = lmcs->lmcs_min_bin_idx, + .lmcs_delta_max_bin_idx = lmcs->lmcs_delta_max_bin_idx, + .lmcsDeltaCrs = (1 - 2 * lmcs->lmcs_delta_sign_crs_flag) * lmcs->lmcs_delta_abs_crs, + }; + + for (j = lmcs->lmcs_min_bin_idx; j <= 15 - lmcs->lmcs_delta_max_bin_idx; j++) + lmcs_param.lmcsDeltaCW[j] = (1 - 2 * lmcs->lmcs_delta_sign_cw_flag[j]) * lmcs->lmcs_delta_abs_cw[j]; + + err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic, + VALmcsBufferType, + &lmcs_param, sizeof(VALmcsDataVVC)); + if (err < 0) + goto fail; + } + } + + for (i = 0; i < VVC_MAX_SL_COUNT; i++) { + const VVCScalingList *sl = h->ps.scaling_list[i]; + if (sl) { + int l; + + VAScalingListVVC sl_param = { + .aps_adaptation_parameter_set_id = i, + }; + + for (j = 0; j < 14; j++) + sl_param.ScalingMatrixDCRec[j] = sl->scaling_matrix_dc_rec[j]; + + for (j = 0; j < 2; j++) + for (k = 0; k < 2; k++) + for (l = 0; l < 2; l++) + sl_param.ScalingMatrixRec2x2[j][k][l] = sl->scaling_matrix_rec[j][l * 2 + k]; + + for (j = 2; j < 8; j++) + for (k = 0; k < 4; k++) + for (l = 0; l < 4; l++) + sl_param.ScalingMatrixRec4x4[j - 2][k][l] = sl->scaling_matrix_rec[j][l * 4 + k]; + + for (j = 8; j < 28; j++) + for (k = 0; k < 8; k++) + for (l = 0; l < 8; l++) + sl_param.ScalingMatrixRec8x8[j - 8][k][l] = sl->scaling_matrix_rec[j][l * 8 + k]; + + err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic, + VAIQMatrixBufferType, + &sl_param, sizeof(VAScalingListVVC)); + if (err < 0) + goto fail; + } + } + + for (i = 0; i <= pps->pps_num_exp_tile_columns_minus1; i++) { + tile_dim = pps->pps_tile_column_width_minus1[i]; + err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic, + VATileBufferType, + &tile_dim, sizeof(tile_dim)); + if (err < 0) + goto fail; + } + + for (i = 0; i <= pps->pps_num_exp_tile_rows_minus1; i++) { + tile_dim = pps->pps_tile_row_height_minus1[i]; + err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic, + VATileBufferType, + &tile_dim, sizeof(tile_dim)); + if (err < 0) + goto fail; + } + + if (!pps->pps_no_pic_partition_flag && pps->pps_rect_slice_flag && !pps->pps_single_slice_per_subpic_flag) { + for (i = 0; i <= pps->pps_num_slices_in_pic_minus1; i++) { + for (j = 0; j < pps->pps_num_exp_slices_in_tile[i]; j++) { + exp_slice_height_in_ctus[i + j] = pps->pps_exp_slice_height_in_ctus_minus1[i][j] + 1; + } + } + for (i = 0; i <= pps->pps_num_slices_in_pic_minus1; i++) { + VASliceStructVVC ss_param = { + .SliceTopLeftTileIdx = pps->slice_top_left_tile_idx[i], + .pps_slice_width_in_tiles_minus1 = pps->pps_slice_width_in_tiles_minus1[i], + .pps_slice_height_in_tiles_minus1 = pps->pps_slice_height_in_tiles_minus1[i], + }; + + if (pps->pps_slice_width_in_tiles_minus1[i] > 0 || pps->pps_slice_height_in_tiles_minus1[i] > 0) + ss_param.pps_exp_slice_height_in_ctus_minus1 = 0; + else { + if (pps->num_slices_in_tile[i] == 1) + ss_param.pps_exp_slice_height_in_ctus_minus1 = pps->row_height_val[pps->slice_top_left_tile_idx[i] / pps->num_tile_columns] - 1; + else if (exp_slice_height_in_ctus[i]) + ss_param.pps_exp_slice_height_in_ctus_minus1 = exp_slice_height_in_ctus[i] - 1; + else + continue; + } + + err = ff_vaapi_decode_make_param_buffer(avctx, &pic->pic, + VASliceStructBufferType, + &ss_param, sizeof(VASliceStructVVC)); + if (err < 0) + goto fail; + } + } + + return 0; + +fail: + ff_vaapi_decode_cancel(avctx, &pic->pic); + return err; +} + +static uint8_t get_ref_pic_index(const VVCContext *h, const VVCFrame *frame) +{ + VVCFrameContext *fc = &h->fcs[(h->nb_frames + h->nb_fcs) % h->nb_fcs]; + VAAPIDecodePictureVVC *pic = fc->ref->hwaccel_picture_private; + VAPictureParameterBufferVVC *pp = (VAPictureParameterBufferVVC *)&pic->pic_param; + uint8_t i; + + if (!frame) + return 0xFF; + + for (i = 0; i < FF_ARRAY_ELEMS(pp->ReferenceFrames); i++) { + VASurfaceID pid = pp->ReferenceFrames[i].picture_id; + int poc = pp->ReferenceFrames[i].pic_order_cnt; + if (pid != VA_INVALID_ID && pid == ff_vaapi_get_surface_id(frame->frame) && poc == frame->poc) + return i; + } + + return 0xFF; +} + +static int get_slice_data_offset(const uint8_t *buffer, uint32_t size, const SliceContext* sc) +{ + const H266RawSlice *slice = sc->ref; + int num_identical_bytes = slice->data_size < 32 ? slice->data_size : 32; + + for (int i = 0; i < size; i++) { + int skip_bytes = 0; + if (i >=2 && buffer[i] == 0x03 && !buffer[i - 1] && !buffer[i - 2]) + continue; + + for (int j = 0; j < num_identical_bytes; j++) { + if (i >= 2 && buffer[i + j + skip_bytes] == 0x03 && !buffer[i + j + skip_bytes - 1] && !buffer[i + j + skip_bytes - 2]) + skip_bytes++; + + if (buffer[i + j + skip_bytes] != slice->data[j]) + break; + + if (j + 1 == num_identical_bytes) + return i; + } + } + + return 0; +} + +static int vaapi_vvc_decode_slice(AVCodecContext *avctx, + const uint8_t *buffer, + uint32_t size) +{ + const VVCContext *h = avctx->priv_data; + VVCFrameContext *fc = &h->fcs[(h->nb_frames + h->nb_fcs) % h->nb_fcs]; + const SliceContext *sc = fc->slices[fc->nb_slices]; + const H266RawPPS *pps = fc->ps.pps->r; + const H266RawPictureHeader *ph = fc->ps.ph.r; + const H266RawSliceHeader *sh = sc->sh.r; + VAAPIDecodePictureVVC *pic = fc->ref->hwaccel_picture_private; + VASliceParameterBufferVVC *slice_param = &pic->slice_param; + int nb_list, i, err; + + *slice_param = (VASliceParameterBufferVVC) { + .slice_data_size = size, + .slice_data_offset = 0, + .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, + .slice_data_byte_offset = get_slice_data_offset(buffer, size, sc), + .sh_subpic_id = sh->sh_subpic_id, + .sh_slice_address = sh->sh_slice_address, + .sh_num_tiles_in_slice_minus1 = sh->sh_num_tiles_in_slice_minus1, + .sh_slice_type = sh->sh_slice_type, + .sh_num_alf_aps_ids_luma = sh->sh_num_alf_aps_ids_luma, + .sh_alf_aps_id_chroma = sh->sh_alf_aps_id_chroma, + .sh_alf_cc_cb_aps_id = sh->sh_alf_cc_cb_aps_id, + .sh_alf_cc_cr_aps_id = sh->sh_alf_cc_cr_aps_id, + .NumRefIdxActive[0] = sh->num_ref_idx_active[0], + .NumRefIdxActive[1] = sh->num_ref_idx_active[1], + .sh_collocated_ref_idx = sh->sh_collocated_ref_idx, + .SliceQpY = pps->pps_qp_delta_info_in_ph_flag ? + 26 + pps->pps_init_qp_minus26 + ph->ph_qp_delta : + 26 + pps->pps_init_qp_minus26 + sh->sh_qp_delta, + .sh_cb_qp_offset = sh->sh_cb_qp_offset, + .sh_cr_qp_offset = sh->sh_cr_qp_offset, + .sh_joint_cbcr_qp_offset = sh->sh_joint_cbcr_qp_offset, + .sh_luma_beta_offset_div2 = sh->sh_luma_beta_offset_div2, + .sh_luma_tc_offset_div2 = sh->sh_luma_tc_offset_div2, + .sh_cb_beta_offset_div2 = sh->sh_cb_beta_offset_div2, + .sh_cb_tc_offset_div2 = sh->sh_cb_tc_offset_div2, + .sh_cr_beta_offset_div2 = sh->sh_cr_beta_offset_div2, + .sh_cr_tc_offset_div2 = sh->sh_cr_tc_offset_div2, + .WPInfo = { + .luma_log2_weight_denom = sh->sh_pred_weight_table.luma_log2_weight_denom, + .delta_chroma_log2_weight_denom = sh->sh_pred_weight_table.delta_chroma_log2_weight_denom, + .num_l0_weights = sh->sh_pred_weight_table.num_l0_weights, + .num_l1_weights = sh->sh_pred_weight_table.num_l1_weights, + }, + .sh_flags.bits = { + .sh_alf_enabled_flag = sh->sh_alf_enabled_flag, + .sh_alf_cb_enabled_flag = sh->sh_alf_cb_enabled_flag, + .sh_alf_cr_enabled_flag = sh->sh_alf_cr_enabled_flag, + .sh_alf_cc_cb_enabled_flag = sh->sh_alf_cc_cb_enabled_flag, + .sh_alf_cc_cr_enabled_flag = sh->sh_alf_cc_cr_enabled_flag, + .sh_lmcs_used_flag = sh->sh_lmcs_used_flag, + .sh_explicit_scaling_list_used_flag = sh->sh_explicit_scaling_list_used_flag, + .sh_cabac_init_flag = sh->sh_cabac_init_flag, + .sh_collocated_from_l0_flag = sh->sh_collocated_from_l0_flag, + .sh_cu_chroma_qp_offset_enabled_flag = sh->sh_cu_chroma_qp_offset_enabled_flag, + .sh_sao_luma_used_flag = sh->sh_sao_luma_used_flag, + .sh_sao_chroma_used_flag = sh->sh_sao_chroma_used_flag, + .sh_deblocking_filter_disabled_flag = sh->sh_deblocking_filter_disabled_flag, + .sh_dep_quant_used_flag = sh->sh_dep_quant_used_flag, + .sh_sign_data_hiding_used_flag = sh->sh_sign_data_hiding_used_flag, + .sh_ts_residual_coding_disabled_flag = sh->sh_ts_residual_coding_disabled_flag, + }, + }; + + memset(&slice_param->RefPicList, 0xFF, sizeof(slice_param->RefPicList)); + + nb_list = (sh->sh_slice_type == VVC_SLICE_TYPE_B) ? + 2 : (sh->sh_slice_type == VVC_SLICE_TYPE_I ? 0 : 1); + for (int list_idx = 0; list_idx < nb_list; list_idx++) { + RefPicList *rpl = &sc->rpl[list_idx]; + + for (i = 0; i < rpl->nb_refs; i++) + slice_param->RefPicList[list_idx][i] = get_ref_pic_index(h, rpl->refs[i].ref); + } + + for (i = 0; i < 7; i++) + slice_param->sh_alf_aps_id_luma[i] = sh->sh_alf_aps_id_luma[i]; + + for (i = 0; i < 15; i++) { + slice_param->WPInfo.luma_weight_l0_flag[i] = sh->sh_pred_weight_table.luma_weight_l0_flag[i]; + slice_param->WPInfo.chroma_weight_l0_flag[i] = sh->sh_pred_weight_table.chroma_weight_l0_flag[i]; + slice_param->WPInfo.delta_luma_weight_l0[i] = sh->sh_pred_weight_table.delta_luma_weight_l0[i]; + slice_param->WPInfo.luma_offset_l0[i] = sh->sh_pred_weight_table.luma_offset_l0[i]; + slice_param->WPInfo.luma_weight_l1_flag[i] = sh->sh_pred_weight_table.luma_weight_l1_flag[i]; + slice_param->WPInfo.chroma_weight_l1_flag[i] = sh->sh_pred_weight_table.chroma_weight_l1_flag[i]; + slice_param->WPInfo.delta_luma_weight_l1[i] = sh->sh_pred_weight_table.delta_luma_weight_l1[i]; + slice_param->WPInfo.luma_offset_l1[i] = sh->sh_pred_weight_table.luma_offset_l1[i]; + } + + for (i = 0; i < 15; i++) { + for (int j = 0; j < 2; j++) { + slice_param->WPInfo.delta_chroma_weight_l0[i][j] = sh->sh_pred_weight_table.delta_chroma_weight_l0[i][j]; + slice_param->WPInfo.delta_chroma_offset_l0[i][j] = sh->sh_pred_weight_table.delta_chroma_offset_l0[i][j]; + slice_param->WPInfo.delta_chroma_weight_l1[i][j] = sh->sh_pred_weight_table.delta_chroma_weight_l1[i][j]; + slice_param->WPInfo.delta_chroma_offset_l1[i][j] = sh->sh_pred_weight_table.delta_chroma_offset_l1[i][j]; + } + } + + err = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic, + &pic->slice_param, 1, + sizeof(VASliceParameterBufferVVC), + buffer, size); + if (err) { + ff_vaapi_decode_cancel(avctx, &pic->pic); + return err; + } + + return 0; +} + +static int vaapi_vvc_end_frame(AVCodecContext *avctx) +{ + + const VVCContext *h = avctx->priv_data; + VVCFrameContext *fc = &h->fcs[(h->nb_frames + h->nb_fcs) % h->nb_fcs]; + VAAPIDecodePictureVVC *pic = fc->ref->hwaccel_picture_private; + int ret; + + ret = ff_vaapi_decode_issue(avctx, &pic->pic); + if (ret < 0) + goto fail; + + pic->decode_issued = 1; + + return 0; + +fail: + ff_vaapi_decode_cancel(avctx, &pic->pic); + return ret; +} + +const FFHWAccel ff_vvc_vaapi_hwaccel = { + .p.name = "vvc_vaapi", + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_VVC, + .p.pix_fmt = AV_PIX_FMT_VAAPI, + .start_frame = &vaapi_vvc_start_frame, + .end_frame = &vaapi_vvc_end_frame, + .decode_slice = &vaapi_vvc_decode_slice, + .frame_priv_data_size = sizeof(VAAPIDecodePictureVVC), + .init = &ff_vaapi_decode_init, + .uninit = &ff_vaapi_decode_uninit, + .frame_params = &ff_vaapi_common_frame_params, + .priv_data_size = sizeof(VAAPIDecodeContext), + .caps_internal = HWACCEL_CAP_ASYNC_SAFE, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index d0980e28de..da6f3a84ac 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 20 +#define LIBAVCODEC_VERSION_MINOR 21 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index 19770de3fa..5c2cd176cb 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -35,6 +35,7 @@ #include "data.h" #include "refs.h" #include "thread.h" +#include "config_components.h" #define TAB_MAX 32 @@ -776,14 +777,20 @@ static int slice_start(SliceContext *sc, VVCContext *s, VVCFrameContext *fc, static enum AVPixelFormat get_format(AVCodecContext *avctx, const VVCSPS *sps) { -#define HWACCEL_MAX 0 +#define HWACCEL_MAX CONFIG_VVC_VAAPI_HWACCEL enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; switch (sps->pix_fmt) { case AV_PIX_FMT_YUV420P: +#if CONFIG_VVC_VAAPI_HWACCEL + *fmt++ = AV_PIX_FMT_VAAPI; +#endif break; case AV_PIX_FMT_YUV420P10: +#if CONFIG_VVC_VAAPI_HWACCEL + *fmt++ = AV_PIX_FMT_VAAPI; +#endif break; } @@ -1176,4 +1183,10 @@ const FFCodec ff_vvc_decoder = { .caps_internal = FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, .p.profiles = NULL_IF_CONFIG_SMALL(ff_vvc_profiles), + .hw_configs = (const AVCodecHWConfigInternal *const []) { +#if CONFIG_VVC_VAAPI_HWACCEL + HWACCEL_VAAPI(vvc), +#endif + NULL + }, };