From patchwork Sat Nov 13 21:09:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3678712iob; Sat, 13 Nov 2021 13:10:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxEvBk6S0f7EEUmYMx6MiHKRRpnajSKX0N9fuNSTxF6L57q+tYBQdu3diYwwcxpiBd6VcSl X-Received: by 2002:a17:907:2d21:: with SMTP id gs33mr32685753ejc.549.1636837857656; Sat, 13 Nov 2021 13:10:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636837857; cv=none; d=google.com; s=arc-20160816; b=ge23m3EcpP1eeAsNnLZQIj/QuGhVBEMGg+kSmpsPdV1odMraWi/2cEdwtyRwUuKHM3 K/kZlQ0K7KiaSh4zRe2pXow3hmO/maKPedFUpWIElPAXM6q3Ce9J9t3jOQhEzwPFPKT3 fbdKuf+lyWXW3aojMrqtopt42QsioI49ag2LEfdqWAzducmbwx0IuRFfXUZ/1cAEMshp rFOc4IPEf2t6mTqqZBWUM8Y12pBnOSf+RFUF87n4e0skPf6tet/IojOpgpWZdanJl3I/ vI2q/u0MyGNg2r0/F1Bvhi04rIBd+qvAhHXQYL03JHxl3vKAIx3YAE8X2B6AV/AwPRnx ToeQ== 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=c3tp46BqLGDLGdnPAQ6kD9M4CvNLCa67y3dKPr/JQi4=; b=M1yrdjWWAf49nXQg/IyjV5+uuG/3DwHR9xA6cK0q7X3qOrwsIJWRyYDK8HXEgG3yAP 0SyNIzOh/hL1pmas7L6Gcm2f3Xcmeka4E4x16/GxO/R3kMTKn7ZnwK26pIMELbhNAo6B RqOWmGTX1vF0vGR8M/mkCuJfuap++Njqk4Vi8Rnf2vmYYIRPI1F/pk8JVx0x6jVUe5jD 28WRaxSRLJgeBYsNCsN9m3YUPgIxaWxd7U5VHjK1onf3r4V94O3vaWohzpmoCwaxUE95 wmSnPUrmX7VKLVHbEEJNUJBnH7a+qpoDe4dPU15USNEvJsZGuY3JYLqmjwHrQenCMCFQ iosw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=feGsRB36; 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 sb34si24247183ejc.150.2021.11.13.13.10.57; Sat, 13 Nov 2021 13:10:57 -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=feGsRB36; 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 417F868AE80; Sat, 13 Nov 2021 23:09:38 +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 2B33868AE47 for ; Sat, 13 Nov 2021 23:09:28 +0200 (EET) Received: by mail-il1-f169.google.com with SMTP id k1so12430944ilo.7 for ; Sat, 13 Nov 2021 13:09:28 -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=K41UXYlil80BEUpAP0/KE7VyM/1DiBkw0aaLeJOm34s=; b=feGsRB36dORV0FS+jcJZtVqIyjqIa9QL0jE1HjQWXEA05mz+iItmkOQRBqAHNHN4UI ZXwZKFphvvopymcLiTraf0/7bwSVNtZBA/Xd83n7IC1xF+Pql5kOoLETiKHkz9u7Czcg IoodjCywZznFcXQ68PNCLpGPl8FqQkIhYAVTR1s8mAajoamQndimKeuXXnvp+rBoC7Sw Elr+vuV4AwZAYIAHwy2DWcFvMLevQ50o1fxKg2N+4rzRhel8eDjQk0ucKpK0kA3HR3a0 qcfIYP3WoKTZ4/glg5SKm10lGkTHELcS7Hj/ciFVa9IUfBMebg//4e9XDrs9z6ckrnBK TblA== 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=K41UXYlil80BEUpAP0/KE7VyM/1DiBkw0aaLeJOm34s=; b=ZQ+QXakHfb6WcCnVEQTBfBBSn2fUAg57wajRIanli8IxZZenuXGGkbJxFG9TR7Zq+8 bsbSmoYU8coPSHNv2/wSaFtD+I/xND2UpWdok0ooiaBITLAwO7HyEqTmq3q6+HyZzcdt 3e94CdIp0nga2vB5PRnl6i/VkA12JtUnT6H1JzUEPlmEK0RaTYTVbyLgWX+hc/hYjlY1 tTMAXeDKaGDY7IUIDYrRVK7nJCtUWrlC2/yorS1jGbn5kCQFflJOZp39ia8AKpoiLARc n3/obMQtjvUNdM293J13QJrwGGSEzM6o7WPBf3S4MmYXv+i+B/97Dyk+6znEdhP2WP1/ aWmQ== X-Gm-Message-State: AOAM533UBDTDb4jL67fZAXHf/GPx/CXPLCnkKSIPc5DJEyErUFJlHy2D AN7H8xnw56gn6g6PQNh+4sn4SmzGJPbTInE= X-Received: by 2002:a05:6e02:12c2:: with SMTP id i2mr14924102ilm.261.1636837766590; Sat, 13 Nov 2021 13:09:26 -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.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Nov 2021 13:09:26 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Nov 2021 15:09:08 -0600 Message-Id: <20211113210916.49167-7-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 07/15] lavc/videotoolbox: select 4:2:2 and 4:4:4 formats when applicable 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: gNMtuyLZ8dmY --- libavcodec/videotoolbox.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index a5b0777c41..764021586b 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1062,9 +1062,35 @@ static enum AVPixelFormat videotoolbox_best_pixel_format(AVCodecContext *avctx) return AV_PIX_FMT_NV12; // same as av_videotoolbox_alloc_context() int depth = descriptor->comp[0].depth; + +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE + if (depth > 10) + return descriptor->log2_chroma_w == 0 ? AV_PIX_FMT_P416 : AV_PIX_FMT_P216; +#endif + +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE + if (descriptor->log2_chroma_w == 0) { +#if HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE + if (depth <= 8) + return AV_PIX_FMT_NV24; +#endif + return AV_PIX_FMT_P410; + } +#endif +#if HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE + if (descriptor->log2_chroma_h == 0) { +#if HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE + if (depth <= 8) + return AV_PIX_FMT_NV16; +#endif + return AV_PIX_FMT_NV20; + } +#endif +#if HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE if (depth > 8) { return AV_PIX_FMT_P010; } +#endif return AV_PIX_FMT_NV12; }