From patchwork Mon Nov 22 21:58:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7667091iob; Mon, 22 Nov 2021 14:00:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIZEmseGST+9inI6HZRPdcBt8dIJ080I1jL4Nxh+KtHGcR934oXno8sicwTkxtgLIqirFj X-Received: by 2002:a17:907:8a13:: with SMTP id sc19mr790569ejc.130.1637618407120; Mon, 22 Nov 2021 14:00:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637618407; cv=none; d=google.com; s=arc-20160816; b=mG4HFobvlxkD7yRghWgh1lE8pFSzuOV07U0SOlDriAhpZRKcN3w+0NW+WCjBt7waAH JoNGkiRLp2OrC3jKffiUoSu154Mr7ZbV1jy2bkXAGWSSBpLqJmucoay9R6V0I8rUa+fV 1nX0wI5PMlEOcZibRb4J3dzQ5aZwbZWnkniLYPv0wsB7be23YR9ZkJyh1zeaBEWpd/3O qRUi+L0sbu0+XdEsq8r3xwdtyzPSYMvoJOJi2Lm8e44S/FfbDYVlRLIa2UhLXXafXF7s x6Co2PvVPmKTvE2tO3mxsVTx/S/3nwkF0zL99jx+wX6XErN8SlyzmEpzqSu261CO3Ced zZRQ== 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=QR9sCIIe4pEFXiAIyi0kjUEUXIwaq07jxWmpPiQ9kL8xF30mqp24KrNwJJwSIVyx4t dwNbQDYg8HW1ktnwj7FAD7u9j1fM5WDrDL0Nhfy4AY/BoHw8p00zQVQR9Q6Ys03KgB6z 5J39h4qHKbDbUQ6Ts39Vg4zZ2OulDOj1pNayXcpesJlGqd6UoIqfwiZdTeDdcqoVUrnm fIyQ0PPmPf9Q890thN3mDFEawyoAP2tFjSX/stv+DHPHHaUJcRh48rxxjIDi9NyWtS6l XItZjunJKyz1vNGzLOPq2+WuDXyttxf1QLELxz64ZhsVCttbhLTxdnH+EI1Iq4Old4Ja Aggw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=BjOFRkZS; 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 z6si34515413edd.85.2021.11.22.14.00.06; Mon, 22 Nov 2021 14:00:07 -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=BjOFRkZS; 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 97C1068AA83; Mon, 22 Nov 2021 23:58:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F15FE68ADEE for ; Mon, 22 Nov 2021 23:58:43 +0200 (EET) Received: by mail-il1-f169.google.com with SMTP id w15so19645630ill.2 for ; Mon, 22 Nov 2021 13:58:43 -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=BjOFRkZSs2NQ7TZgEWN8IHN96BmEz1uUS5dR94yoOPZJHPeFeTr25uosJG5ozbvMfN Zsq7EJqcf1KLD8ae1p8dRPWvW4QULtSNaaIgP5ZJXqeZPxQ0fcfnOiM8VSd/ub+oSSwV 7hNteCNbk9ZAkh7UB3Q84qkP8jmZFHqnOy5eNWozlmJ7k3upVk5WHc6Upvk7ndYp1wmv UFLUXJLGIadQeSDN2lITu57mRRUmCrxmdPqTj3o0jbrt9gyxYymS/0iUtcGhgcvbTlYD FrRMRL8DST2ZvyIaUDfmLdH9tQWupxz5/N+YqPC3GcGAf4y/oCf8PjOuYKJeHeW26m/0 +xNQ== 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=k2v0gWn+R2B9HH8eVPqndlffYfTM/vWnJJWge932p6J/SxewLH8DhxhFKW/Kkv+9oh FwGUL47ScyE/L72yKgyj38xr74LojSk7TSqwKAp81XCxmvuA2L4UnJdfnsodj1y+OJaX MRI4VvDsy0JR32R5iUD/DBkZQGaRfxtIuiJGYHmfTOQ1ghfOMwi1ZwAOEcgRqrJH4Bk8 nuJuVl9WWQxmaxiFg3ZfJ/ZgV0m3EvAI+tMEmJwM329T1bB+TP63DC8AzAorqV6Vwqp7 7iIjHVhWVRQ+AGj4OErkQeIDmSEypj9/TAE8b3a0Al9MoTvEH4FVbvCAZVbqOZqMR+SB b6ew== X-Gm-Message-State: AOAM533jIUPa0mA8Le4m9koh4yWHtEF/ZjqySi98n/JVmUD5wB5k7JCB HbTSMpd3kLNXFcAZ4Amx9KoqK3hiPsacehM= X-Received: by 2002:a05:6e02:1bc3:: with SMTP id x3mr193149ilv.39.1637618322090; Mon, 22 Nov 2021 13:58:42 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:edf5:499:2479:42a8]) by smtp.gmail.com with ESMTPSA id o1sm5668802ilj.41.2021.11.22.13.58.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 13:58:41 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 15:58:18 -0600 Message-Id: <20211122215821.9849-13-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211122215821.9849-1-rcombs@rcombs.me> References: <20211122215821.9849-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: B3ikB/HOeCbB --- 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,