From patchwork Sat Nov 13 21:09:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31406 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3678233iob; Sat, 13 Nov 2021 13:10:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyVTPWTFgWHYDW/CqRcFTx8ZUucU94LncLoP553NR0QsrG0X/xfObfgViaXFVT9LN2G2T2j X-Received: by 2002:a17:906:f95:: with SMTP id q21mr9814175ejj.399.1636837827377; Sat, 13 Nov 2021 13:10:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636837827; cv=none; d=google.com; s=arc-20160816; b=n4EIBFVhx9trAraBeVzympUrkuHNsLlQciGeGBOCQ+Wl1PS67BM4jwX65zOb+A+xei wMNV4yQ2N1fAZ7DQKp6Krpcb/ULgkIbj1nCy1Vfh3k63V1S299pLs1JNigTEVq/OtcJi JfyQrbK1Hh23CQN6o419/oyrARGAd4KMVsuZiGBX9MeULwsKptAJVawPUkgcw0fFg03a epvpULA/uap/RrFApT3gBGHuF/E8EnusILs1LwPd8h3L6lo/CBcBcPp5B8H0/O1OVHCt RcjrBWXHnPy/wcYoQajv6ee93mtUWiznZ+rOUmoGNXEDuT/eghy9vbHXevlo0N6awwf6 HUAQ== 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=A246xF37iN0ZsQZ4jPTO5wVoGRxLYf+z8g2zsDRbcow=; b=BlRYcRuLLEFH+2jb3uqrYVqEl5XCVVcZEkXh1cFSsj+ce4KtuabtYljEG3KHmPlace KlBio6WvASByGyqE4vnY9ApkJBfUYcM2M4eIxz20FjvADOiV25vu5wPFcQBu7W+okaqu A1E0LJzyLeczEGfk0+0HQLD07HH+6l9E07FImoXvNCxR2Qc+mSsIqFe8866Jta5BdPPj c0qbaEc1tli9/P2E9jaazWBKflVvMhhG7ViHNP+wJCtgmuQFymH7GeRF9bG31J1sWJ+X KBXT4csQIfDosDXUssQevy887TBhWxApOdM2pGUNCIyrD9K7xYqZz95KJ1t8f0HggoSD pFYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=ZQc2zcsd; 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 z22si28519902edd.633.2021.11.13.13.10.27; Sat, 13 Nov 2021 13:10:27 -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=ZQc2zcsd; 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 57D7968AE76; Sat, 13 Nov 2021 23:09:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0E6668AE34 for ; Sat, 13 Nov 2021 23:09:31 +0200 (EET) Received: by mail-il1-f182.google.com with SMTP id i12so12398459ila.12 for ; Sat, 13 Nov 2021 13:09:31 -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=eIvpV06Iad4dw8ii0vycps8ppScAwtJ4B5JNdSRegJM=; b=ZQc2zcsdaXXJWx56+Ra5z2cMHd3pkYTFCLjPW0iWHwuG2MG0i6K6OLCZ9XJykB7dlH 2PvygI0bmMDeUhiUjm/eryj0D4OgJAojfdyqtNOVZcqpUQ+04L5KpbXhFB6LGIqoU8+d 4Kay5D975/aJLL+gSj+Kt/VZBpYObhPN/+SyVfiFoVLr9Z9lk/RgyuMupHdS7GxIFOXs S51ZAaQThJ/8P6sI7fIcDTc9wprhhSn7D4875EtYJ4lYGdQXhObDPRBJ+B6VdsvVRYbi h7pm05oua5rEZxJQtnQ0jsX6sLHYkV4Q8dQ6WV7GezTl7Pje96c2+/hZuw81kqY6ieor jVAA== 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=eIvpV06Iad4dw8ii0vycps8ppScAwtJ4B5JNdSRegJM=; b=Vj2XeaIYz/dzvAnC8pbWnvsW2JErR1+ja0bU1iCSgS4p1avUYhV/Dbxfds+xvG3z3y 6hgvkh1sqljWjofZCDnWQkIMi+39gUK6dZk0ZU7r+KWhCI/g4+1cxpY2SFzlER5lAfIz MKoa+hMaycPZyb+Piew2LoPKVLz1cJ4yrt6jnfbSazHYpdhexpsr9y+v9V3N7V+RnQo6 TgVFE4FzJAPPr1NQkpgXUXkzaL1CMShVkDjXLrIIn9wNv3BE0a2S6ynbeDGBPVXHTqov wQYEQPyuD6qC6gBHR4OrlEYf7QSULEX/cMM1M/WW+dHPAsXLqBqpiaMJPuvVPloJzW02 sM2Q== X-Gm-Message-State: AOAM5334uUSWWcl5uXg6Ob7B1tbQDkOAY3bbhThW8WtagGfx1x55TkJC vmecWeAGDaB+HEMF6qmwTcJTQjDCzx/gyKw= X-Received: by 2002:a92:d408:: with SMTP id q8mr15587058ilm.158.1636837769884; Sat, 13 Nov 2021 13:09:29 -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.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Nov 2021 13:09:29 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Nov 2021 15:09:12 -0600 Message-Id: <20211113210916.49167-11-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 11/15] 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: 1DoH4oSLdS2G 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 18cc589d2a..0666446dbd 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 @@ -864,6 +865,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) {