From patchwork Mon Nov 22 20:53:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31536 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7584432iob; Mon, 22 Nov 2021 12:55:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwl9r3sgj5Zl7inVNo/x8//N/InFfqjgjpotl71HoAt24+g528vANdYReIO8FyfaU/LayKp X-Received: by 2002:a17:906:974a:: with SMTP id o10mr177299ejy.226.1637614542179; Mon, 22 Nov 2021 12:55:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637614542; cv=none; d=google.com; s=arc-20160816; b=LB01Di5HWMGNG3ETEGw5iFigAAo5/IcC/SXxp0RpO1LkZWYK6moJde1Pd9aCESA8if rwM+do7v68+UFQiURMx7Ek3Ua3K55o7ABz3pCyN6I0wiALOqhDbEQW8HcsfimO+fwxBV gLtSHBiBDsS0Epg8QlJiCQBUV5zGcnvz7slwQnBfQFkfJL5y/CcC9ELvXJpJUldkGvg2 FMneRGnZNCs8BCkrGiS+OuNbmI6LlxAr7MdLzDzJmdIIdr9naOIihSr3QrShbY7/MFMY nhP8kJENVZ+UeXVDvGiHYvgm39kcTNwmUMm/eAk/PhLplraphxRnJYbt7Rpp16PX1Pfh JIrg== 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=2+twiCVMWYgcSbbAmDEG8r+j7vJXBzCfhxn8BLkWxqY=; b=y6IpYZ6tm34BvZc5WPUsQO1f2b72s99UN6Y2ULuKtSvwVRUWMqUNX0nsbMI3p4p7qw wHl+56JZQruvjSEyZr0N+AYnHCnIz+bWWiXarmHZ3LfVhkiX09Pvs7wrIbrAt7xjyGGs g89AqECOeUpfEfMgHOKSvRWmyUk1wwMn2OOslgxq0mi5eTcf9MGhweMvGuKB6rm02qNI KVdT/6CKEodLGy8w8rbapt26g2QI8YPV+qVtJKAqe/2hTGJTWDK3fDpTyuw0aGqVUG1E 0nUgWPmYpLpPETdBhdLeiEhwzCCRqzuy9Bk80T+F4kF7h8vzs68sRkrwyBn7hQMGQ+3J usAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=Ejrc1aW2; 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 gs42si29122137ejc.704.2021.11.22.12.55.41; Mon, 22 Nov 2021 12:55:42 -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=Ejrc1aW2; 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 1A08768ADBD; Mon, 22 Nov 2021 22:53:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEB5D68A958 for ; Mon, 22 Nov 2021 22:53:46 +0200 (EET) Received: by mail-il1-f177.google.com with SMTP id h23so19469374ila.4 for ; Mon, 22 Nov 2021 12:53:46 -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=E25XfZk/aICizzjL0V5qNgzhaRSzJjV1KMphiW2eKVE=; b=Ejrc1aW2pmeTYC07hzMohaX9lHDvcHqPtj80MZmywjgNl9YxmiEPKxDvbR1oaEo4pm H+4u+DNs7nc6I1ShSPoSW3rpbhinubcy6ddFmQn4RNK6/CMmKZg2f3dFuloTknSUIkDH wmEQRpvVgLd/DCsn/gAjzn6Dj4RZTJijz+mEF0rBW87AfddA8VmffIP6thyqNmKb3173 EgUDylJTB0tO92BlBRWgGPgPXvtbtfHEDg9ZakySq40aLtUuzuoskWs2HyDnhRQp3eCw rZpsvIXNPYNeBpsIcr2/91C12f/l8StwxDRDtJL8ff70M+k6POXQ9hqR6+m2+Mssupwp K+Qg== 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=E25XfZk/aICizzjL0V5qNgzhaRSzJjV1KMphiW2eKVE=; b=nII6RcdC0pyMY/IvWxk+AUeO6gNN0Sv+ErBIlfMNTOhjive+BgoIQEjhLoMCrw6Bfq 9FR1iv00NuWh7Nq0CzFK4oKUvAszL+nBct2SsntbVAOPcZevDvbsPApbaCzx04PMnTXI wOKTCIK7zmxPuESxXHHS6ai1rBkEICsx+jTcC61ZTgNKPOlr+TIvvvQv6IMhnP/apN8H KW3Wq+lWK51VxpnmJa1Lx0tEZhDsIo/F5M/KEXTUb4s1MaLxzvyKp59prMHpH8KMMFcn Fv9vpBYPz/mwK0w9CZ/nqCr9c9i3JENoaARqB6DiNoal4skFVcdXKmrr/xvaxevifH6o nEHQ== X-Gm-Message-State: AOAM530K3RQdGwzixTrIVgdm5d75A0DVcscqYO86y/1ca5dFI5UFMuHg qrzQkUtlgtfKUs6vOj/fKt0Oql/llhWK10I= X-Received: by 2002:a05:6e02:1a2c:: with SMTP id g12mr14801962ile.22.1637614424861; Mon, 22 Nov 2021 12:53:44 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:edf5:499:2479:42a8]) by smtp.gmail.com with ESMTPSA id b3sm3571580ile.26.2021.11.22.12.53.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 12:53:44 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 14:53:27 -0600 Message-Id: <20211122205330.43546-13-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211122205330.43546-1-rcombs@rcombs.me> References: <20211122205330.43546-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/16] videotoolbox: add alpha support 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: 9mpmMnzDf0QG --- libavcodec/videotoolbox.c | 3 +++ libavutil/hwcontext_videotoolbox.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 5f08488a6b..542fe9316a 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1075,6 +1075,9 @@ static enum AVPixelFormat videotoolbox_best_pixel_format(AVCodecContext *avctx) int depth = descriptor->comp[0].depth; + if (descriptor->flags & AV_PIX_FMT_FLAG_ALPHA) + return AV_PIX_FMT_AYUV64; + #if HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE if (depth > 10) return descriptor->log2_chroma_w == 0 ? AV_PIX_FMT_P416 : AV_PIX_FMT_P216; diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index f7a1299cc3..e9567bbf44 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -48,6 +48,7 @@ static const struct { #ifdef kCFCoreFoundationVersionNumber10_7 { kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange, false, AV_PIX_FMT_NV12 }, { kCVPixelFormatType_420YpCbCr8BiPlanarFullRange, true, AV_PIX_FMT_NV12 }, + { kCVPixelFormatType_4444AYpCbCr16, false, AV_PIX_FMT_AYUV64 }, #endif #if HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE { kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange, false, AV_PIX_FMT_P010 }, @@ -80,6 +81,7 @@ static const struct { static const enum AVPixelFormat supported_formats[] = { #ifdef kCFCoreFoundationVersionNumber10_7 AV_PIX_FMT_NV12, + AV_PIX_FMT_AYUV64, #endif AV_PIX_FMT_YUV420P, AV_PIX_FMT_UYVY422,