From patchwork Sat Nov 13 21:09:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3678878iob; Sat, 13 Nov 2021 13:11:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJySPe1vGRhI3RcRChN+D0q7hdJuGW6Nb33Ne1GCQeL/nqNizJmeO6vp0B8b7kioPrWknJAM X-Received: by 2002:a17:906:2606:: with SMTP id h6mr33194807ejc.301.1636837867063; Sat, 13 Nov 2021 13:11:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636837867; cv=none; d=google.com; s=arc-20160816; b=JzQJfPRc0nns+nyrJjVsSO5urDyutqaV4nHPBbl74VU8Z1OstPsbIYkavizrgjAJtv UqobuJEOj2S46vq2X++DmWC6oU/0AZ66IA+VVg3ML3G3fZ93+r5lL8POshmYqNHYGnjv yVUEJ6sUnlcYrZBNO4Houl8k4Wv3MsLFf5lh8iNWHB0TQMWYx+Z7Jre49ap6QbhfeoBd FYF3eIWdBWPUt9Z+/kwpspfv//PfV7u2Tka5BoMT5dzbSgy0ID+QytWBfxV8NVOa4g5P 5cixfWQN0e4wu/ZsSDaXcdCu9PhWkzHk6aiPc+IhW3c65YbdxatA0+ChD38KcCOTdfEf lppg== 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=WWF7iR97e+5ccouzi4jvN4YlPXA8jvhRlVWv24psFqs=; b=hGIi7V4FlfEyMz/tHd/5xjDLjKsqSB3/Cfa828xHB1QF6p/OoMSYKkSBKQneG/hofS /pzP4u5UjmgStHmB8ekRmx7VPBdyU5qlUhKGb+XDLWHi7kimhxPRINzvHx41BYxVoeWH HV2mS52rfiRdKuIjsMk2IK/4Hi8wtA24k1z+pVKl8VK0s3oaABWc0pWQXdtQqzd5x97R ediPo0o+eo3iVCed5vR7Qs3wHZnBdQQyhA1WqJ8HtcdqzPuZbQ4JDaQnw9HmlzEgdMYA vuCVY5T59YKkP2/EC1WEWceFyqoNRHX2Ug1eyybl9APS9rRn3omins+DcDnEPKHIkacb SvlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=n1p8H5pN; 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 b7si25801951edd.564.2021.11.13.13.11.06; Sat, 13 Nov 2021 13:11: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=n1p8H5pN; 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 32A8068AE83; Sat, 13 Nov 2021 23:09:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BBB2E68AE52 for ; Sat, 13 Nov 2021 23:09:33 +0200 (EET) Received: by mail-io1-f46.google.com with SMTP id r8so15850783iog.7 for ; Sat, 13 Nov 2021 13:09:33 -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=Y2W6BqC9rCn6ZlzNj2ZNi3Ruc5yRgha0zHmw92lzDM8=; b=n1p8H5pN+3GHmZrw7mpmaMtwiza0r+hyrFyoOXBtDZmmnfD7yfbZ3SAgM+nMc3JcOd YRE9BrKk9759Vi0Vw4T+BsP/Hs9AB3O+xa0kVF+v0lT6BpBCTyzdvKTpUwrqsKYq5mUW CqHJKfH5ruZpr2u1YQlnYF/TNU0xB/X77iHxQtWRGZhti/i114zAvCi+735ho8QZ39Ds KW8tn9VgovJ14c3jtQBGgsMtD+6ruEdMx4uzwE/QP2XraJ3e29Ld3BU6yvfneMdQlea4 3xr4g7N29ZYiPbm+WvWMv7hPoWuiIGYiBNMvQUCP6KAfSNouiWD9O0Y3YcpqNKgzmqLz CM4Q== 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=Y2W6BqC9rCn6ZlzNj2ZNi3Ruc5yRgha0zHmw92lzDM8=; b=u1upuOhQyIGe0z9MM6xNJ6iO8xDw6OB15BKvOMmHnRcrUN/IAefK2GINrU3NtnU/qo pP2cLqtoTtslPwaOlYV6Lo5Cu67gVW+u/uO+YBL3rjNTtY0Jf5n8AWeoPZSgkuUXuu03 mLC4Q+e9sB1/0va+V6sqo0ydIl88OGafMKxqDID0P5sp+o58/m8jgLf6vik5/recNFL/ YT/b7geRtolQy4BCljv0JarVsZ/PqdSRAO8FXf9Wo8d+F8vjP4BJKOf2cgVGbRqdr+lb uuP0Kd2psrMkJRUlHVfYL08nO8Z8a3YRcpjHlzWD/Jds+U3nXDb6Is2l5UFJzb+X5N8d 4Riw== X-Gm-Message-State: AOAM532Aqsd6VFQSLXvFWzmSuQXI4y9DeGLAYr2VcRNXG5FaB9PFstJk oMAFrLXxbwVZ5Xv1JupX12c2g5St+fk9SMs= X-Received: by 2002:a05:6638:2684:: with SMTP id o4mr11269413jat.70.1636837771707; Sat, 13 Nov 2021 13:09:31 -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.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Nov 2021 13:09:31 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Nov 2021 15:09:14 -0600 Message-Id: <20211113210916.49167-13-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 13/15] 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: hiKLEiT4n64B --- fftools/ffmpeg_videotoolbox.c | 1 + libavcodec/videotoolbox.c | 3 +++ libavutil/hwcontext_videotoolbox.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/fftools/ffmpeg_videotoolbox.c b/fftools/ffmpeg_videotoolbox.c index 6c89fb48d1..66eaa572c8 100644 --- a/fftools/ffmpeg_videotoolbox.c +++ b/fftools/ffmpeg_videotoolbox.c @@ -88,6 +88,7 @@ static int videotoolbox_retrieve_data(AVCodecContext *s, AVFrame *frame) #if HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE case kCVPixelFormatType_444YpCbCr16BiPlanarVideoRange: vt->tmp_frame->format = AV_PIX_FMT_P416; break; #endif + case kCVPixelFormatType_4444AYpCbCr16: vt->tmp_frame->format = AV_PIX_FMT_AYUV64; break; default: av_log(NULL, AV_LOG_ERROR, "%s: Unsupported pixel format: %s\n", diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 2e9af2ab93..9ca84e873d 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1072,6 +1072,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 0a6c9ecfb0..7a9dbba7dd 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,