From patchwork Mon Nov 22 21:58:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31550 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7668786iob; Mon, 22 Nov 2021 14:01:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvSluAnUh7hykNUKH3NxbswFDaZiC6spIjUy5YtwwRAO1jXAXXTr9cw3b/3mKXuRwovNpS X-Received: by 2002:a17:907:7f25:: with SMTP id qf37mr710633ejc.147.1637618481926; Mon, 22 Nov 2021 14:01:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637618481; cv=none; d=google.com; s=arc-20160816; b=rqMPEZB6Of6eXlKm1oD+DfqLmwFqvASNlrTzUVK/Ksgljtaifzjx2tAQViON/qh6Tr ymKWPNd723CZ1TOSUaU33XgX1s09LvDHimFHf7360kusdxBb056hwDaNG8tm/hzoYU1W qMBObp7y0eZnvmnJzaEzL5Tmccj01+LxdMKcJc+Wwh657BVC9Dkfa1wTr8Yp67G3vAD/ zMKhuDCH0uqgobnC0CV1KtWRug3A2q1BZXIges7lPPAEWakJrsD3H7InnR3gzwGwMExH +uBIXLcUnW8hw85dvAlISZdBMS82K0cTaf6cS+4GWoGKgGlY0FDXyU4rks/7wKMHkGoy ArFQ== 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=BGQKr/eljpoQyRrxiE3KpxKqEb0CbqtTYVWsx9bM6xQ=; b=DLQDpWJdK/zr+bTe9Ucsp+7i+vh3zQ6/ZMAnCZqUksGsnoENGGAh+8RM4yvnfjQbrB x0iAkDLeOlrKzy28sJYG40Lu7ua1TtfN2fJQGBq/g1bPLux1oOxSstU737F+yFl6cMfp yh/C+09O18Y/3HPGoiX4rwN9YDLwrah9VUiaReciJSkjLrvUg8+oI2i8ARxTdLIHu2d8 5vNp3oaCfrWPqX2QX5hcCi8wnDyNUnoSToZ0DUANAOq54Iky3IzzTqgTsfzPKWrbN78p 4kUYXKgtQvnYo9iKauLHkg5urh+fjqsCizhaZ2eefmu2q0oGcXXPIsJXpaDFbxQgk0vY YzSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=mSUP+td6; 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 j19si28196912edj.137.2021.11.22.14.01.21; Mon, 22 Nov 2021 14:01:21 -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=mSUP+td6; 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 99FB468AEC4; Mon, 22 Nov 2021 23:58:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C3CE68ADE7 for ; Mon, 22 Nov 2021 23:58:41 +0200 (EET) Received: by mail-io1-f43.google.com with SMTP id v23so25325433iom.12 for ; Mon, 22 Nov 2021 13:58:41 -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=xN60GqDTodIomXLEr+wKZl0AiCIavHsu5iL1Gt5PXSM=; b=mSUP+td6rp91BTtWRQrVoHR8C/0KhqM1ESP2bo76Hi5t/HNF18zXY49y6rQuFYZrld XAnmOa4SA1jpmygnjsyH3VNqVXvsqlNwTDBiMPUBmSUC/YQ33RQF1i8LYWBF9wNh3fNa rrR+VLO7VK46XtKr5Qpmo7YS+Egi17p2erFI7iEKVMg9fw8G4TzzUiHt1OOpV6+fUztL zrO36bQ+OJ9+6XnlgcfhTi69TcmpM7dFxrH3IxZM26PKfk7QIPgEPdqZsA4yMwTQV1qZ DUCxKwdKolfr3ZmDzH6d960nv3rLQpkN9o0+v5nGbQWfmHs/OPiukyT6jrh4LI08S8Xa 45VA== 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=xN60GqDTodIomXLEr+wKZl0AiCIavHsu5iL1Gt5PXSM=; b=7OIgzpSlGx1Zg8xU8zidGVt9k+C/zMN0/3iBLzriev1JPHKkz66Rv5XiBiaUHcPBXT rLZWozCEaKO6Ulw1SBCOZuH/NneFUdDeoWkIaagBEbwmTEqCnIXH6Q5OGOXgw7N8oKTg lrVowhYxDWibclExbsQEYeJd5L+Bsm3bZC0QzrTVr3ZG6S1A3rO1QRg0JZsObc/Q9gfW gYFNg8TJ2mZlPMdiBgNIKGjfAstPaSm8lNa6VPsqTTynhjFXb9BsWJqq/1dQ67zBW6vm +59Y+FV1YqfvOeIiyecwZosSt8eMpJ4IISauEY+NWoeYGhjWZfQVjXJOf81enJR2Gp1K /vPQ== X-Gm-Message-State: AOAM530oMNKIv5Z5dKDtSOFrJr5SC/co/x4MOrnntKG2S0QOS20YDTas nCy122EfOB5MyHUeYtAx0l91sov4zCEyuIU= X-Received: by 2002:a05:6638:2689:: with SMTP id o9mr259239jat.83.1637618319887; Mon, 22 Nov 2021 13:58:39 -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.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 13:58:39 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 15:58:16 -0600 Message-Id: <20211122215821.9849-11-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 11/16] lavc/videotoolbox: call VTRegisterSupplementalVideoDecoderIfAvailable 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: XYBjaDqa5XFr This is required for VP9 to work. --- libavcodec/videotoolbox.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 3022cd1cbf..a11d494915 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -32,6 +32,7 @@ #include "h264dec.h" #include "hevcdec.h" #include "mpegvideo.h" +#include #include #ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder @@ -866,6 +867,12 @@ static int videotoolbox_start(AVCodecContext *avctx) break; } +#ifdef __MAC_10_11 + if (__builtin_available(macOS 10.11, *)) { + VTRegisterSupplementalVideoDecoderIfAvailable(videotoolbox->cm_codec_type); + } +#endif + decoder_spec = videotoolbox_decoder_config_create(videotoolbox->cm_codec_type, avctx); if (!decoder_spec) {