From patchwork Sat Nov 13 21:09:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31409 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3677793iob; Sat, 13 Nov 2021 13:09:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyX8Xe0sMb7oru4vWbYvD0lj23sH/y9ojmKjmj0Wc4jGLqkqqvoHpfKymy/E8d2AqyiHfwu X-Received: by 2002:a17:907:2ce1:: with SMTP id hz1mr33575009ejc.96.1636837795400; Sat, 13 Nov 2021 13:09:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636837795; cv=none; d=google.com; s=arc-20160816; b=MUZpWsfywraeRdlhjuOKK/ABA55qrbQK7iJzLkgL6B++17WVs6+iiM8/Ucz3UzwFUg Tv38It6PzVlhP/b4rQXhjS95QL0buLDPj3KAdew5a0jUyNMDgeeDcUGyW7+L3PFKXSRI YWSdeQYGo8RssipoCbzVSLO/q2cnQYVfXxRW5HZ0YPfh5fSw59I0ALCmCbUICReyMQ/t epChpCRX8fQf9tbakCP/h8BHbL9hQ4mBzyz9/iClHqfS/3gYC+jVIJprTjpqjGV/PQAT B7iZI3J75MTCOIaMfjDrKho+Nyo24Qx6ZdI1wXgeh9+ssn4c7t+QmAZrw9/jlrZ86xB3 FalQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gwxWV46PDmBYztneYODmpchAtYilLhfmm8zF+TkFZ8E=; b=M+7lwBOwZPgcCa9MlJlDB7L9ad7xhknz8X+z+ZhJz9IuIwSUGZ0OXhy2YDFwp5q+Y0 ASPAYY8l8uHZ3j1/Urez5wGNRY07lYb+CqQ5aXAvVT7nWtQ1S7kH/dBGAeTg4w64O9k1 JSPnpbaLlbeSYMAf6ORMAMXeZcjmgtTJycSq2NDQEkF4DgIEg3IBrHtrht6YwOjJsWnl a1L8juV+VWRWf/pyeLXnyrgdm5NzhijvSC8D0d71nH6G5h6i+pPkJvbdewBmVQw/vQyJ UWuImW1Fgby2NGWnTi0JhkSVu59KptSJKYnZBAcxb6+JHmsT6rSQgE1xB1sI/6Vxw32s AiGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=EW5HXY6N; 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 oz38si21555462ejc.147.2021.11.13.13.09.54; Sat, 13 Nov 2021 13:09:55 -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=EW5HXY6N; 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 5C43268AE21; Sat, 13 Nov 2021 23:09:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A51FE68ACAB for ; Sat, 13 Nov 2021 23:09:24 +0200 (EET) Received: by mail-io1-f42.google.com with SMTP id m9so15931105iop.0 for ; Sat, 13 Nov 2021 13:09:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yA2lXhNnd49GUXvkt9yATZankRG3NGhJrDHyLORIvx0=; b=EW5HXY6N4psNUY2aO/O9ffSSumfhE25j0npGmbaWct9wlFEcTAPQyOCSThTck0uYh+ fFNOVIdo/aO14DcNWoi4YBtwNprkUfm+8GYPenRxBAxtqfg0V6TQdNuVZzFk4wX5Er4a 4HIpVl2fiNGdtYBgkzfNUNalH/rNDQcvcCMf2LIydNmQCC9uFBNqm1Vw+DjLVkU3FWvg qN5cnN/qReYwmkEPznXFEf2yfzUQRsE3d5n4TZOb1bbH+/cKp5BQqwhy22idmSZf+ZFL NCD/lXRRS1R6/PoaqI6kaPkK1HTR3dHjRGPXoK0HaYqJwkZHubhbkcXjpRcqqhjTCsq/ YNsg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=yA2lXhNnd49GUXvkt9yATZankRG3NGhJrDHyLORIvx0=; b=VR6adz7g/G3qYA/3/AjiJhudemiQlBV6ikijn1AoGM4GhB5415sIWHlWsc/ZXWG8fW PMqdEKgW/+lVUm0wgvNtoZGKDoPp4oY/Ss2Ya8HPob0XuZkgX/Lo5NHjDEo6nLIpKtx4 xuoorM6BDDxTm3T39d9a+EP/37tWU4nu/+BxLPojKb6kG+urs9RKYX69PdxUKef4L4XX JFIcyOW2F3eOo35DBE9iOETGT9d/JEjitkzmNdTxvpwnxNYUaFFkghdgYur/NOlZdIv2 jehCQbujT3caOGlS7PaJTKrpdoQbFtqBRcURncLHq3ZTzi6c3Q2GWZX2oLqv+MWyLEaS 6IJQ== X-Gm-Message-State: AOAM530F5aoaNUUMd7w7zg9NdyuhzEExTJllmSU4bBE1Tp1sYXKHBRxO /9GtQff9QwlGYaGoBfvamiBYtOKWX10BCVE= X-Received: by 2002:a5d:9ecc:: with SMTP id a12mr16842985ioe.102.1636837763061; Sat, 13 Nov 2021 13:09:23 -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.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Nov 2021 13:09:22 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Nov 2021 15:09:04 -0600 Message-Id: <20211113210916.49167-3-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211113210916.49167-1-rcombs@rcombs.me> References: <20211113210916.49167-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/15] lavu/videotoolbox: add 422 and 444 pixel format mappings 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: LIxBfAPMbfVQ --- configure | 12 ++++++++ libavutil/hwcontext_videotoolbox.c | 44 ++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/configure b/configure index 891824757b..97c0133f8c 100755 --- a/configure +++ b/configure @@ -2327,6 +2327,12 @@ TYPES_LIST=" kCMVideoCodecType_HEVC kCMVideoCodecType_HEVCWithAlpha kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange + kCVPixelFormatType_422YpCbCr8BiPlanarVideoRange + kCVPixelFormatType_422YpCbCr10BiPlanarVideoRange + kCVPixelFormatType_422YpCbCr16BiPlanarVideoRange + kCVPixelFormatType_444YpCbCr8BiPlanarVideoRange + kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange + kCVPixelFormatType_444YpCbCr16BiPlanarVideoRange kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ kCVImageBufferTransferFunction_ITU_R_2100_HLG kCVImageBufferTransferFunction_Linear @@ -6277,6 +6283,12 @@ enabled videotoolbox && { check_func_headers CoreMedia/CMFormatDescription.h kCMVideoCodecType_HEVC "-framework CoreMedia" check_func_headers CoreMedia/CMFormatDescription.h kCMVideoCodecType_HEVCWithAlpha "-framework CoreMedia" check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange "-framework CoreVideo" + check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_422YpCbCr8BiPlanarVideoRange "-framework CoreVideo" + check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_422YpCbCr10BiPlanarVideoRange "-framework CoreVideo" + check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_422YpCbCr16BiPlanarVideoRange "-framework CoreVideo" + check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_444YpCbCr8BiPlanarVideoRange "-framework CoreVideo" + check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange "-framework CoreVideo" + check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_444YpCbCr16BiPlanarVideoRange "-framework CoreVideo" check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ "-framework CoreVideo" check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferTransferFunction_ITU_R_2100_HLG "-framework CoreVideo" check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferTransferFunction_Linear "-framework CoreVideo" diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index 25f4e17715..0a6c9ecfb0 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -53,13 +53,57 @@ static const struct { { kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange, false, AV_PIX_FMT_P010 }, { kCVPixelFormatType_420YpCbCr10BiPlanarFullRange, true, AV_PIX_FMT_P010 }, #endif +#if HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE + { kCVPixelFormatType_422YpCbCr8BiPlanarVideoRange, false, AV_PIX_FMT_NV16 }, + { kCVPixelFormatType_422YpCbCr8BiPlanarFullRange, true, AV_PIX_FMT_NV16 }, +#endif +#if HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE + { kCVPixelFormatType_422YpCbCr10BiPlanarVideoRange, false, AV_PIX_FMT_NV20 }, + { kCVPixelFormatType_422YpCbCr10BiPlanarFullRange, true, AV_PIX_FMT_NV20 }, +#endif +#if HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE + { kCVPixelFormatType_422YpCbCr16BiPlanarVideoRange, false, AV_PIX_FMT_P216 }, +#endif +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE + { kCVPixelFormatType_444YpCbCr8BiPlanarVideoRange, false, AV_PIX_FMT_NV24 }, + { kCVPixelFormatType_444YpCbCr8BiPlanarFullRange, true, AV_PIX_FMT_NV24 }, +#endif +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE + { kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange, false, AV_PIX_FMT_P410 }, + { kCVPixelFormatType_444YpCbCr10BiPlanarFullRange, true, AV_PIX_FMT_P410 }, +#endif +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE + { kCVPixelFormatType_444YpCbCr16BiPlanarVideoRange, false, AV_PIX_FMT_P416 }, +#endif }; static const enum AVPixelFormat supported_formats[] = { +#ifdef kCFCoreFoundationVersionNumber10_7 AV_PIX_FMT_NV12, +#endif AV_PIX_FMT_YUV420P, AV_PIX_FMT_UYVY422, +#if HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE AV_PIX_FMT_P010, +#endif +#if HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE + AV_PIX_FMT_NV16, +#endif +#if HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE + AV_PIX_FMT_NV20, +#endif +#if HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE + AV_PIX_FMT_P216, +#endif +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE + AV_PIX_FMT_NV24, +#endif +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE + AV_PIX_FMT_P410, +#endif +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE + AV_PIX_FMT_P416, +#endif AV_PIX_FMT_BGRA, };