From patchwork Sat Nov 13 21:09:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31401 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3677619iob; Sat, 13 Nov 2021 13:09:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0vSYpYMMUpKN8/DjxgHcim6v9/ciNqvwwSW4755P/8jdul24tDJYXoZD2Vcx0Cictwd0V X-Received: by 2002:a17:906:fb17:: with SMTP id lz23mr33029432ejb.149.1636837784501; Sat, 13 Nov 2021 13:09:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636837784; cv=none; d=google.com; s=arc-20160816; b=B5B6DLLp7cVALmjLHmELJzMb4Eu/xaNKZSooaVWj0UMOaaq7IUapXWcclV1Zb0Rak+ Gkj2egqdm6/ZqJjsJi+/sXQNGpKf3yr0ys0qdZ3RKNbuXtlj7FF7C0TiCE1RG5wublCs 5lUcf2jzg9//LPZNCyx+UlLyAJLKElJ4q/66JVjwybsxluGtBFyezBMHsmn/SieusOaL 0O5fKw7ZbKv0gRpe0x8ujgQuIoo9pKNntBUaIjQDrxt7CbdngcOx8CSKx2MPeRf9DOO9 MaRLW39np7VwJKhLXc0TS1IWsY0Dp1mXnACp3ZbN0cog85195KyPXps111EQFDXqFgZ3 FIjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=xZa3QzwCjXcSWthgFl39D94Q+pxHAszJ//Izu23AJkU=; b=LGGD8sYW6B4qQHbpzS+NxLVBMpOeGjdV4ktIX/EEj0HoiGvoWCALSJ/7SJ03e5kXbo zhViGLoM9pSmHz37CfdZfAkKsee0Jxsdzsq/IOySL2Zl2Ly3GRJmEDQGF/2FATGUBMnU AVSzOTUinpD8Ny/kVSSnkkBBMvsHxEB/S6yHt1hDCcMbN4Q40hyim5rOje5pW77EgiAe PnofR059x/Ca9u4n+DhAiMvuHqV9ce5Iy72C7MOC3HgkrVIVjdXPmuZUX/SvFSJop7K6 5ehUqz1lgQ0tV/0Vu1uIciejOnAA+498Czi7jr/L42aeq0wGtuALPwuBrKz7wyqfGZBf ELdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=No+dKLax; 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=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b15si24145814ede.50.2021.11.13.13.09.44; Sat, 13 Nov 2021 13:09:44 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=No+dKLax; 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=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 626AB68AE25; Sat, 13 Nov 2021 23:09:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D686C687F4C for ; Sat, 13 Nov 2021 23:09:23 +0200 (EET) Received: by mail-io1-f43.google.com with SMTP id v23so15795831iom.12 for ; Sat, 13 Nov 2021 13:09:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=x1Q6RUH14bCozInp9ljld6zufrJAwIAgDYcyRG3noOA=; b=No+dKLaxr72zQSl2fiZPZQd80AVlo9+ygzNMjCNreDZrQocfPY3xynD87TJjNBeW6d bt4Io5r80xSuJ1H3SoR+lwhCNc8a2lSVH+s+M42JVv9GX9ja+dfcz4IEXqj+ZPmx8Yf9 8onmJCgxBt5HVBWX2e2doZkEYXGZdgHtcnjC7HM6gp1Pkp5a57yHizBHv1Jr8rjC9A1F qiOkCescCEsLBqrN8ix7sdOaLZ9TjEiWsosDATpzEIxmmtmKY24c/8xrAr30eVugJLl5 9YNa1ULM49Bf5h6FRZVj85BXQGKeeE22Q/2YBqsnXPJ9zigSBZ3qqunI4FlZOXBaQ2B/ I3MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=x1Q6RUH14bCozInp9ljld6zufrJAwIAgDYcyRG3noOA=; b=JBBEZNyNqtIkMaMAA4JNC2iRMOL1H7PEYMjpSRAtWTE4FBISxBF4YYRawZ6V752H25 neJLVNQANUWhjMx2qDjvBusEegwypSB+Aqw1zrt/J3l+XEqdUZOLdhLvKwTcCg/moLaT uvsACTC8b0vIhgtZIK5U+0z/YfFFdKtHKrW4NHkZYLsCmS61L9GmFSts4/T6ijM7DnqB x+rUzL6XgesV4K/4CxcgmLAYvul1fioDE8vwO0mreYCdOSAp59P27AitUmJSnuH3AQwe Bnc81hV7nezropAgUa487WQW4p1cyFjHr9edeDV2k+ndJl/SKogeypciZXhRWwy/gUol uxYA== X-Gm-Message-State: AOAM531ebx1NqM2V9HIrSiQvI5XIXk4cjHIFfcR/3uZOw6OTbW43IUj9 trhhJuV9pBJqx6qzysw+ovbdhbfmXJQYH6A= X-Received: by 2002:a5d:8903:: with SMTP id b3mr18062583ion.44.1636837761543; Sat, 13 Nov 2021 13:09:21 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:516:f322:7db9:ae0a]) by smtp.gmail.com with ESMTPSA id j23sm5243896iog.53.2021.11.13.13.09.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Nov 2021 13:09:21 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Nov 2021 15:09:02 -0600 Message-Id: <20211113210916.49167-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/15] lavu/pixfmt: add high-bit-depth semi-planar 4:2:2/4:4:4 formats 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: R435mUTImtcm These are used by VideoToolbox hardware decoders. --- libavutil/pixdesc.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ libavutil/pixfmt.h | 14 +++++++++ 2 files changed, 86 insertions(+) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 69cb198646..7bfd0612a5 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2393,6 +2393,78 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "vulkan", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_P410BE] = { + .name = "p410be", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 6, 10 }, /* Y */ + { 1, 4, 0, 6, 10 }, /* U */ + { 1, 4, 2, 6, 10 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, + }, + [AV_PIX_FMT_P410LE] = { + .name = "p410le", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 6, 10 }, /* Y */ + { 1, 4, 0, 6, 10 }, /* U */ + { 1, 4, 2, 6, 10 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR, + }, + [AV_PIX_FMT_P216BE] = { + .name = "p216be", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 4, 0, 0, 16 }, /* U */ + { 1, 4, 2, 0, 16 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, + }, + [AV_PIX_FMT_P216LE] = { + .name = "p216le", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 4, 0, 0, 16 }, /* U */ + { 1, 4, 2, 0, 16 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR, + }, + [AV_PIX_FMT_P416BE] = { + .name = "p416be", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 4, 0, 0, 16 }, /* U */ + { 1, 4, 2, 0, 16 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, + }, + [AV_PIX_FMT_P416LE] = { + .name = "p416le", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 4, 0, 0, 16 }, /* U */ + { 1, 4, 2, 0, 16 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR, + }, }; static const char * const color_range_names[] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 53bdecfcb7..30d35fc921 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -352,6 +352,16 @@ enum AVPixelFormat { AV_PIX_FMT_X2RGB10BE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), big-endian, X=unused/undefined AV_PIX_FMT_X2BGR10LE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), little-endian, X=unused/undefined AV_PIX_FMT_X2BGR10BE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), big-endian, X=unused/undefined + + AV_PIX_FMT_P410BE, ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high bits, big-endian + AV_PIX_FMT_P410LE, ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high bits, little-endian + + AV_PIX_FMT_P216BE, ///< interleaved chroma YUV 4:2:2, 32bpp, big-endian + AV_PIX_FMT_P216LE, ///< interleaved chroma YUV 4:2:2, 32bpp, liddle-endian + + 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_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 }; @@ -444,6 +454,10 @@ enum AVPixelFormat { #define AV_PIX_FMT_X2RGB10 AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE) #define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE) +#define AV_PIX_FMT_P410 AV_PIX_FMT_NE(P410BE, P410LE) +#define AV_PIX_FMT_P216 AV_PIX_FMT_NE(P216BE, P216LE) +#define AV_PIX_FMT_P416 AV_PIX_FMT_NE(P416BE, P416LE) + /** * Chromaticity coordinates of the source primaries. * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.1 and ITU-T H.273.