From patchwork Mon Jan 9 12:50:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39940 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3065648pzb; Mon, 9 Jan 2023 04:50:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXsAFcuceiM2jEMwgLdBRRlRVGm3w9oaBoDDRoW3KtKzV+ki2Ra1FTYnM3xSpC8IcGPRephQ X-Received: by 2002:a05:6402:5408:b0:482:f518:792d with SMTP id ev8-20020a056402540800b00482f518792dmr49524194edb.28.1673268627245; Mon, 09 Jan 2023 04:50:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673268627; cv=none; d=google.com; s=arc-20160816; b=n3NvDFYUTngtk6XBn9EUOVyI5fQ/kU9yU2qtEAjMmZIP0VMPG3lf1tylFu50vdodUZ 11nBxduie+fhXTNklAQBMDyGe0lihMQp688A4vCppDEfvARVHObyTgBhEWzZHcmh5coB mPUY1cxkTgTMKOIurK8VMIFQQWqtxf4KQ9SCp9ElsAJANPfDTLNVOLKNeVGzhF2a+pDR /uZkwF9JacDpWeKvCsUHDv44zVqQVF/gMTkBMpBzemDRAwH5aN+7DT8GzvWLeFN3ed64 Rv2Qpdx5y1jprnIICDBkOqP0HuIr7qfMJ5j4SFLkJlpLyLplL9gP0zfgseOsx4vttglV 10rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=G+C98ELEAkGGHjZouaPaS9ZSnVGqJ1zibRlsUZZ9J9Y=; b=NXYPbzCiwGqhlL3nijfMeb93HmVTAaoNCb+a5jPOtRmLdTdr2lXYUQugemZRtvYbrX /K1Zu/pjNWySx+U1hr7BP4Yo+4rH5EJDGxgU3gD4W4n5fn+RbqNFYvM3GZEkvB4Ow7uO opVvi86n+XoZtGqLELoYWxEIlxlSPyLdwjiYkkGTedgiqGARIE8L3WCHmNuYQwhaZBxA kZJwmboRAQvnowTCROsvatWbO3UtoSTNOAnYyrzBHIyKYD6hdAoI5xaqduQFBFzyD32l QvheBxztQnSLZZpFXDzt8Fdgz3img0Pp2XT3UzSopivP64tvAHkfrTVPIBIDAiyGru/z Qqqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=vb2C73PE; 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=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mj24-20020a170906af9800b00782539a0286si7243636ejb.142.2023.01.09.04.50.26; Mon, 09 Jan 2023 04:50: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=@foxmail.com header.s=s201512 header.b=vb2C73PE; 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=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8D3568BCCD; Mon, 9 Jan 2023 14:50:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-233.mail.qq.com (out203-205-221-233.mail.qq.com [203.205.221.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C43E68BB61 for ; Mon, 9 Jan 2023 14:50:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1673268611; bh=sfjAaokmBToC7WkirP22eDd2uHBQX9p4VeoZYTflO/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vb2C73PE+60r+iNcQ8C2eXzz2hTvSaI1w2eREj7AazIRtsWh5Hi14VRGCIGQwPv9x a+DPT+mK/wa54R/oZYHheDLtXxGCxcz3cZSzYhcrlLB83P3dDav06ToiXTqDZxs9K2 KKcBsQJ5TzljkNXF0Qo6OkZ9Xfh20NG5xZ7LasPg= Received: from ZHILIZHAO-MB2.tencent.com ([119.147.10.192]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id C898A4CD; Mon, 09 Jan 2023 20:50:09 +0800 X-QQ-mid: xmsmtpt1673268610tku4awe4p Message-ID: X-QQ-XMAILINFO: MiE+axgVDEQLrEmCtnHalgnQxIBrn1LLJ0kKtyVg8TKrPC4IL3I3fUghUyUSM9 Tr8McjMbORBpcNnff5j/O6XjYv6ThbnXWhDFYMOQTDF+DGBw0oeN4ShfgNOc2jz0qi9ONwEeQLAr JwcPj+zUEE/4kKd6OlrA6NlPuUI7/4WX2ABFHefQA7mGG0IVwI3+iodOUkb1WE0rEpck7xsrUBGS d6ajpd+cRaBSRtRhkVT90VZ+UMIWs01VoYsDyNDUXImXseNeKeCW6sCQTDvaZKHLcY6+OlAcx2Bq Az+NiszTFQPNxAy8/ldgkUXHJrDmcLtsFbZHDPP1oVJTs7unX+X5pja6zHDoKMLGc2pL50KmLk1n jH2PSVnsW72lrGGdRXZyJhWmYmLceB+vBHgCr622FvxWsWKgXxRDvn9KIOVbCOcI4MTTkKDRIi6C +br/UyMsnJ1gUkVwjxFl2mR4AqfbNF2NBOi4cyqG269ERpPs2NtsRPqFKKFb/ed2ltyuo7+GIoYS HG5tFuA0VXY7Ln3fSitFtc4b/bMz/C3jLdkuj279whCERiGmlgDwhBTKzexsvRoIPakTm5dbCrJD vTFePKp+ZbO/VVIe9zS8OjysRVejHlUHmwVa8oE1G2iVQ8njtHnB3Y35Gi9BkSo3BTmBM3gED9Eb LGwJgeNM7WWQKKRnioYSU03dYthD5AqU0QewS8GYP8FvYUVHxPqda6GJWO6ct9a1c7ZJCtv1Y29x fjJ9dR6M+LuDpiBh/RJ+My38KXbKr6EC6afB2L3yXL18FR2U7HP9Nv53x6lYg5FQNJ64XMNSpDJB nWZAxBsnkemv4Dyx7jk35PbUIGGYfgKQBYIdcOOCaiPQ8FLMZ+6/8+fAoCOlN1ZhFogJLdXrY+Kx VXEKZAZ+UnYgKiJfgKbwOf7h9cLoNJjr5hqwTCOjBaJ3IUGMEeWXoVroFPUnhRriuUy5mtaLxfLX RDXswO53pTVZ0jnVM71659Xdk3bVx0CaybYR0ousF30wGOc0MkBbA76bUjP7aQEGaMuxQoiXA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Jan 2023 20:50:04 +0800 X-OQ-MSGID: <20230109125008.13336-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230109125008.13336-1-quinkblack@foxmail.com> References: <20230109125008.13336-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/videotoolbox: prefer hw_frames_ctx/hw_device_ctx over hwaccel_context 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M2175eIq5kft From: Zhao Zhili --- libavcodec/videotoolbox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index a18b49007d..acf0c79822 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1181,7 +1181,8 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) vtctx->logctx = avctx; - if (avctx->hwaccel_context) + if (!avctx->hw_frames_ctx && !avctx->hw_device_ctx && + avctx->hwaccel_context) return videotoolbox_start(avctx); if (!avctx->hw_frames_ctx && !avctx->hw_device_ctx) {