From patchwork Sat Jul 23 18:53:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 36928 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1157160pzb; Sat, 23 Jul 2022 11:54:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sUBNcVkEd16LhT+lSP4qPCV+qzBdzPQiWT+t6fw7G6n7iRuzeDUJPO699WoGaaT57Q+9Xb X-Received: by 2002:a17:907:1b03:b0:6ff:78d4:c140 with SMTP id mp3-20020a1709071b0300b006ff78d4c140mr4370697ejc.554.1658602442869; Sat, 23 Jul 2022 11:54:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658602442; cv=none; d=google.com; s=arc-20160816; b=ncu6QOWgPFoU1jXDin2hldqpFMsaaTKw9ptSQgesHOl13ibl3HZnyMaN+uyzNJJToA Rv3cH4+lmw5xP15dAJQsor8HsKYD1Xn0CodT/zPdiSs0MYG0N9V6yQUUmpQHKKn3lrON yCsAQsTTJAROcDo0U3ptfqhorgVJX8OhKGul5cJWo+W+2fgT7x6NEDM79afmmc6gDv4J XBeyC7n+zXJrmIaE+bbrYjo/qVzY3waCK9MDTHvmPQVba4gl2kBOlbh4lrmNo1ibRPFz E3xJAImEIdGg1x5W9H9UlMjzYfhIY6sVy/QMfCKsrURZ1X3FOhbZD1JQZabYvCxVsz0U TQSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=IYyHor9qJWsm4TB947ZuEbqijB1WgVbRAl3i1ILt6KQ=; b=Qdj4ZqDzSPTDJdVgNBwc2on25qGsaA38DlfNzEH5pXh503/qelDX9THw7Nj57dQTY/ BKzCsIArB+SvLYK/zsCD5bJ8L6htKs/hYpKyhDhbPTkXVxdzDG3s9SDgFzTOp1nhK+GV xLuiAf2tDBMwTyxZEvB/JBSYrZ4+apcUMNOJxGUhi+vvsDut36lvmCqtghoy9YS3CDXb Jkj7/RYZslSM1F7p9VKqjYisTDSA/VGVOaGoBTLevefe40oGLZ3n8XAb4z5VU0qRYiK5 ahRbtxzkD9aBBNVJqSuTob0KgaYe56R8RcPSLQiYbSHHepotd5tKVhC3K3wKyJbLGPj9 geiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@overt.org header.s=mail header.b=jZQVFocn; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=overt.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q11-20020a170906144b00b0072b68e9bf3csi8197504ejc.972.2022.07.23.11.54.02; Sat, 23 Jul 2022 11:54:02 -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=@overt.org header.s=mail header.b=jZQVFocn; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=overt.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC62F68B7C9; Sat, 23 Jul 2022 21:53:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.overt.org (mail.overt.org [157.230.92.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 411E468B704 for ; Sat, 23 Jul 2022 21:53:33 +0300 (EEST) Received: from authenticated-user (mail.overt.org [157.230.92.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 389F93F6B5; Sat, 23 Jul 2022 13:53:31 -0500 (CDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1658602411; bh=MIJAnhXZdGi7if7q0k6FeRm/uqvmg2zJXjTKUEfqJTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZQVFocngad2DO/I/che7N2APjz2te+TFPI5PdKiW/st8uMez8ydvrqa7Ffhxas5j Y20urvrkACzb6YOcNxBnElQhIPhF5njEK9LIhLX+dKYwLAcQuOXsqFcrWGyfilk19Z s9xyljKXQvJG6df4vaSerR8rn1X38wSifPkO8NH1xaa62pDVNou4YD3b98gycOs57U hDgu63XoZ5KeF7G3z/Nt/t2Mkb0Edld9HAlzH8sJr+lCi3ybemFXDnsdzC+2WLZ7yP zczk+SOYvO+96Qfh0bGoIr+DAQW35kli0ghklVv5Bc9HiMnwxSTIRSzKzb9n0cy7OJ Qfs8JkbZi6Jog== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jul 2022 11:53:13 -0700 Message-Id: <20220723185315.207081-2-philipl@overt.org> In-Reply-To: <20220723185315.207081-1-philipl@overt.org> References: <20220723185315.207081-1-philipl@overt.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavu/pixfmt: Add packed 4:4:4 format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Mark Thompson , Philip Langdale Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eWZGzLUp/+Z+ The "AYUV" format is defined by Microsoft as their preferred format for 4:4:4 content, and so it is the format used by Intel VAAPI and QSV. As Microsoft like to define their byte ordering in little-endian fashion, the memory order is reversed, and so our pix_fmt, which follows memory order, has a reversed name (VUYA). --- doc/APIchanges | 3 +++ libavutil/pixdesc.c | 13 +++++++++++++ libavutil/pixfmt.h | 2 ++ libavutil/version.h | 2 +- tests/ref/fate/imgutils | 1 + tests/ref/fate/sws-pixdesc-query | 4 ++++ 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index b3563cd528..35e6fda6bc 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-11-22 - xxxxxxxxxx - lavu 57.31.100 - pixfmt.h + Add AV_PIX_FMT_VUYA. + 2022-07-xx - xxxxxxxxxx - lavu 57.30.100 - frame.h Add AVFrame.duration, deprecate AVFrame.pkt_duration. diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 6e57a82cb6..e078fd5320 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2491,6 +2491,19 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, + [AV_PIX_FMT_VUYA] = { + .name = "vuya", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 4, 2, 0, 8 }, /* Y */ + { 0, 4, 1, 0, 8 }, /* U */ + { 0, 4, 0, 0, 8 }, /* V */ + { 0, 4, 3, 0, 8 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_ALPHA, + }, }; static const char * const color_range_names[] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 2d3927cc3f..9d1fdaf82d 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -367,6 +367,8 @@ enum AVPixelFormat { AV_PIX_FMT_P416BE, ///< interleaved chroma YUV 4:4:4, 48bpp, big-endian AV_PIX_FMT_P416LE, ///< interleaved chroma YUV 4:4:4, 48bpp, little-endian + AV_PIX_FMT_VUYA, ///< packed VUYA 4:4:4, 32bpp, VUYAVUYA... + AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; diff --git a/libavutil/version.h b/libavutil/version.h index ee4c531b80..e9eefcdb2c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 30 +#define LIBAVUTIL_VERSION_MINOR 31 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index b23d1b4c39..4ec66febb8 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -246,3 +246,4 @@ p216be planes: 2, linesizes: 128 128 0 0, plane_sizes: 6144 6144 p216le planes: 2, linesizes: 128 128 0 0, plane_sizes: 6144 6144 0 0, plane_offsets: 6144 0 0, total_size: 12288 p416be planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 0 0, plane_offsets: 6144 0 0, total_size: 18432 p416le planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 0 0, plane_offsets: 6144 0 0, total_size: 18432 +vuya planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index 76104bc5a6..bd0f1fcb82 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -215,6 +215,7 @@ isYUV: p416le uyvy422 uyyvyy411 + vuya xyz12be xyz12le y210be @@ -654,6 +655,7 @@ ALPHA: rgb32_1 rgba64be rgba64le + vuya ya16be ya16le ya8 @@ -739,6 +741,7 @@ Packed: rgba64le uyvy422 uyyvyy411 + vuya x2bgr10be x2bgr10le x2rgb10be @@ -967,5 +970,6 @@ DataInHighBits: SwappedChroma: nv21 nv42 + vuya yvyu422 From patchwork Sat Jul 23 18:53:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 36927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1157084pzb; Sat, 23 Jul 2022 11:53:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vgzSkltjGANscN3JU4xVxHbG1TGPcsxUECkf9Jrxh/dAiTwu8+LJEqKb3Ut1mXRh6GvOFU X-Received: by 2002:a05:6402:1e8c:b0:43a:c57f:2cbb with SMTP id f12-20020a0564021e8c00b0043ac57f2cbbmr5523608edf.97.1658602425773; Sat, 23 Jul 2022 11:53:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658602425; cv=none; d=google.com; s=arc-20160816; b=gLyB971PNp2W4/2fXYwA1XM27Jzfn8IlayKFXjOSdwndJRhQlLE+EWU0FqMavtflQk Oj8bcOIgQuzh4TLQDwPx6eZoe5AFhc9BR4wFKBlS0tddGBZm5NLNzBArn6UFzSiQrts2 rUQceV+JDaJku4nQLW5625n7YHUYkqngbcrUrjN9Vaq2YIcEp/rphPfkft6QmqxVTjvD leZMQE5tPIrc8yvKREJD5CP1MUTcC0wusGoSqL4oZYLeCeU7hfdy+OHHfLsmTW8d9R/5 0so2PHSq/wTdxa5PkWZ8/J7oBPKt0JJICnVcYGhN9nUn5zfxl5VPfyLfC0kd2g2uVj9Y iM4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=3vbbUj/G4yuHu8h2r8ZkYvcV8TmQBIVvp4ZJlhE93To=; b=T9BdzCfJIxQOGseWw5qvcPhdyS+KDpMpTduS8+k0mTSKmXkVch6DUB0t1MLzOfN5AG cukXIhHE+gO1jzNas7m5q3sZQoEQvWc06etqBfac9w+4F2f27DiLGVqYDvhNPhTf3UIH Tk5nm/WfvC6U1TSJ7rxvr6KclVq5DWwzMf/r3jM9wwVajvTBh+KynPz/AAqmeMNPbZpC WgGsk4v99CE9o1kW/AnyTjTwbfl5Q4GD5fN9VwjrGRjpGWt5CMOI7n8RiFDuxqQgHGWU wDq6vpk234/UQhNZCt/FHjZuVfXZ+lf42UgfVqR6Mo0cLA3P5050PMq55sMWDEcQpROy bnjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@overt.org header.s=mail header.b=FqeGOtUB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=overt.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qk16-20020a1709077f9000b0072f24977c82si9586391ejc.841.2022.07.23.11.53.45; Sat, 23 Jul 2022 11:53: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=@overt.org header.s=mail header.b=FqeGOtUB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=overt.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7514F68B6AC; Sat, 23 Jul 2022 21:53:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.overt.org (mail.overt.org [157.230.92.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B67068B4DC for ; Sat, 23 Jul 2022 21:53:33 +0300 (EEST) Received: from authenticated-user (mail.overt.org [157.230.92.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id C85413F6BA; Sat, 23 Jul 2022 13:53:31 -0500 (CDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1658602412; bh=MnIIbktkd56AdYNlwQJDksFpz82KONlRJY+3PtKKuKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FqeGOtUBnu9j0OX+3v1YsYQS2fTJA2LprVILLaY9naF586x+o4J5hwfDQ5KFz0rqU 1CuhfcJ7LPD/nk7/pzKHUOBObxdLcLQVnP7uHUTpDTBN60R047v/0NvbO/lMHhdyRG tFX2EpetHa8NDInvk6u7A9om9kwuhUjNRnz4Wompbr4ns/LmINF0SzSWgkHVLEVdGy CNoIlyks04rPFnxmP5BZs8YnHYvowbtC+Jc98jhRN8SSDWhlY9QjhfNQIYR6+8vxvV f1E5IKRjGZ/XMU0mK47zOZkOrA8RNdEHTgULvHDC3mJkkkzr4SlcQJNF/GDN9DTkHW 410gVSOwyYknQ== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jul 2022 11:53:14 -0700 Message-Id: <20220723185315.207081-3-philipl@overt.org> In-Reply-To: <20220723185315.207081-1-philipl@overt.org> References: <20220723185315.207081-1-philipl@overt.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavu/hwcontext_vaapi: Map the AYUV format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Mark Thompson , Philip Langdale Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TRXzFw91rUfG This is the format used by Intel VAAPI for 8bit 4:4:4 content. --- libavutil/hwcontext_vaapi.c | 1 + libavutil/version.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index c3a98bc4b1..2ee5145727 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -125,6 +125,7 @@ static const VAAPIFormatDescriptor vaapi_format_map[] = { MAP(411P, YUV411, YUV411P, 0), MAP(422V, YUV422, YUV440P, 0), MAP(444P, YUV444, YUV444P, 0), + MAP(AYUV, YUV444, VUYA, 0), MAP(Y800, YUV400, GRAY8, 0), #ifdef VA_FOURCC_P010 MAP(P010, YUV420_10BPP, P010, 0), diff --git a/libavutil/version.h b/libavutil/version.h index e9eefcdb2c..21f11f3d6b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 57 #define LIBAVUTIL_VERSION_MINOR 31 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ From patchwork Sat Jul 23 18:53:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 36929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1157199pzb; Sat, 23 Jul 2022 11:54:11 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vt5cHnSDvCzS9S5VIGCy73/BrQDB3jdefGaJT9dKRyld4ItI8AA8oRg1zdBsJ0IEQqmeLg X-Received: by 2002:a05:6402:5489:b0:43b:b935:db37 with SMTP id fg9-20020a056402548900b0043bb935db37mr5525889edb.347.1658602451634; Sat, 23 Jul 2022 11:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658602451; cv=none; d=google.com; s=arc-20160816; b=1Drd6Q67PQZDYtV8j+5dvkioXdkj5QFKc7gNshme5TANQASN39SCA1d6KczM1qOpvY 4hpUJrKv3wfQdsqHqpMa7AF5T7APVEKD5CKd1c5cI0Kc3Jl2aMWZwOzG52yE478/WaYM OJPB3q3P4+P/nTQlAoNkRdTzkVxERXb3DvKXpv8N7hZltwXe2k3w5gCXrj+0cccGU91t 5LqqGfbiNB7+Z65tp73LIQOOsW9Zp5dTpCifzEMLrDPvdzvgL0M19LrbKmoh2OH5lyuN etMfXNmIiIIkE6NFQz8mHbmh2bqXw41Fnf5ZtQc/G7GNylm8r1Aaa0ymCiRv5hEPCocv uXfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=0i+cqY0p4s3etfk8Qm86pW0C+sw6HDUvCd10K3DsGLY=; b=NqlHrKINq6IrrCJvvwzdvuNiyZANgay71jkRxeVX7HPM4VSnTRfO0wFL4GA3KIVEoJ SEFPOg1VV12p/Ii8SceN1lpW9DTvxc7U+Q/XYfM7n64vQpUrP2SIp/DhTyvS7M53qasO G1RL7xgXzT1dSmheluDEuHXo3yu/A4HQEEAtgtJkJjLnxAW2RpYIKPeE+igi1/useHi5 jg/Zt2YYAeNiJx696ukUNgIl3JjwthzAsgABsfmi8/7WwkCu1C4S3NrAqeo2aFePITaw J+0nBPV8GOFojL3aWXc/xU0q1jvFpJLE9iXBnChaAMPeH9IkKPizFMvNcC9wb+HrPBEl mtjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@overt.org header.s=mail header.b=k53G+wNe; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=overt.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id su7-20020a17090703c700b007156fc5217bsi2598367ejb.899.2022.07.23.11.54.11; Sat, 23 Jul 2022 11:54:11 -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=@overt.org header.s=mail header.b=k53G+wNe; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=overt.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFBA168B7D4; Sat, 23 Jul 2022 21:53:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.overt.org (mail.overt.org [157.230.92.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B707768B6AC for ; Sat, 23 Jul 2022 21:53:33 +0300 (EEST) Received: from authenticated-user (mail.overt.org [157.230.92.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 632D53F6BC; Sat, 23 Jul 2022 13:53:32 -0500 (CDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1658602412; bh=+yeTzvq5x4FCCYXXaOlWeHJ9uyiGANV7uZ+TnIBnzPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k53G+wNe3Q+zxyO/2ynkglx1Jpwxm0H+Cxr4+u5Uh+x68TW9mfRGRvmGhx09P07pS uVnJCfIbpDtj1rfnikY+K/5u7vKM9fDOsINshixv+u+tE45qt4dgj9vVseghwfJskQ OQ9TmoQJZfHKGK45Warv1odtBq4KIyAh9GCsMPDrhFNfHJRKqEE7VOmb2xGtuMdq5b QP+BPwDcPHftrInFseROdxR+iz70MA5lQh9ogc0JmkMkSQW/0VfGRgDCGu2RtRfcoh eSoZh22vs0laygG+JFkNVyHzoqNcL+CFZMv0KWkDyiyTyvfG8bkoTI6h38JqATydKW X+j1LqLTXgRLA== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jul 2022 11:53:15 -0700 Message-Id: <20220723185315.207081-4-philipl@overt.org> In-Reply-To: <20220723185315.207081-1-philipl@overt.org> References: <20220723185315.207081-1-philipl@overt.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/vaapi: Declare support for decoding 8bit 4:4:4 content X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Mark Thompson , Philip Langdale Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UDGXFDzUILai Now that we have a combination of capable hardware (new enough Intel) and a mutually understood format ("AYUV"), we can declare support for decoding 8bit 4:4:4 content via VAAPI. This requires listing AYUV as a supported format, and then adding VAAPI as a supported hwaccel for the relevant codecs (HEVC and VP9). I also had to add VP9Profile1 to the set of supported profiles for VAAPI as it was never relevant before. --- Changelog | 1 + libavcodec/hevcdec.c | 3 +++ libavcodec/vaapi_decode.c | 2 ++ libavcodec/version.h | 2 +- libavcodec/vp9.c | 5 +++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 92780c9953..a5539d5ec3 100644 --- a/Changelog +++ b/Changelog @@ -7,6 +7,7 @@ version : - ffmpeg -shortest_buf_duration option - ffmpeg now requires threading to be built - ffmpeg now runs every muxer in a separate thread +- VAAPI hwaccel for 8bit 444 HEVC and VP9 version 5.1: diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 2d06d09b75..7070ed3f02 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -452,6 +452,9 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) #endif break; case AV_PIX_FMT_YUV444P: +#if CONFIG_HEVC_VAAPI_HWACCEL + *fmt++ = AV_PIX_FMT_VAAPI; +#endif #if CONFIG_HEVC_VDPAU_HWACCEL *fmt++ = AV_PIX_FMT_VDPAU; #endif diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index a7abddb06b..db48efc3ed 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -267,6 +267,7 @@ static const struct { MAP(422V, YUV440P), // 4:4:4 MAP(444P, YUV444P), + MAP(AYUV, VUYA), // 4:2:0 10-bit #ifdef VA_FOURCC_P010 MAP(P010, P010), @@ -410,6 +411,7 @@ static const struct { MAP(VP9, VP9_0, VP9Profile0 ), #endif #if VA_CHECK_VERSION(0, 39, 0) + MAP(VP9, VP9_1, VP9Profile1 ), MAP(VP9, VP9_2, VP9Profile2 ), #endif #if VA_CHECK_VERSION(1, 8, 0) diff --git a/libavcodec/version.h b/libavcodec/version.h index f2f14eaed1..ecdbc51c74 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 39 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 12ec87992c..834fbebb01 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -231,6 +231,11 @@ static int update_size(AVCodecContext *avctx, int w, int h) #endif #if CONFIG_VP9_VDPAU_HWACCEL *fmtp++ = AV_PIX_FMT_VDPAU; +#endif + break; + case AV_PIX_FMT_YUV444P: +#if CONFIG_VP9_VAAPI_HWACCEL + *fmtp++ = AV_PIX_FMT_VAAPI; #endif break; }