From patchwork Mon Jan 9 12:50:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39944 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3066037pzb; Mon, 9 Jan 2023 04:51:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXu87edRJHeN/2//BE2Spn/HB4+FHaVGIo8xCv8bGzgoNLBwsDSl10xRhAmS3EQYMt+z5JxZ X-Received: by 2002:a17:906:c0c2:b0:836:3d22:5d73 with SMTP id bn2-20020a170906c0c200b008363d225d73mr54959279ejb.39.1673268662145; Mon, 09 Jan 2023 04:51:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673268662; cv=none; d=google.com; s=arc-20160816; b=HjOW/TQhG8nYLH129DJ1vLJfLkAd9jyqqUpcJrzyJgPRuj/edfAOkaWBB8zVXwqZTb bjkfixj6pise7gjpt4R3WhnUtYIe/hvzgr/mfqrLW1UdOhg7d51zMnAylwduYIu3kkXO M6LbnLuvMumKKorCl7wt0L2+hpWCQwJZHVtrCwKeTztpQF4+TkSEjl1WYMepnVWvxufM 3RjAJlWMgP3bRvWqg31fbTu9b7MsZCJpQFyF7IkEORndQB9UVNE0kCqr1xnbIKwbWJl2 C5JgKqfLcDQfFLMB+u4UNEXaQFWyWdWj1b5lgeiKzpYsXKGard1uQu+kz/byQmD6dDIM ue9g== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=vXXbt/+iloE7dnD+qSphE/ZkyFo/ZGjg84UN48dWDtE=; b=p0NKc2GgeNl1TCriw1yT78nmfe9lsvvWHAEbSU4VlWxGlP7Ip06EtRF8N5ALFXVOte M4LHZqNlM11mdv81/JtNvhZ0kOmkhFsBunp7+bPeRN8nwW6zJxBXo2sHLSAokrNa7GXQ HE0C638NJpl9b6shKALRsVmGmFkmwe51/x/0PxW111jL2Eya06PsnzSfEUJmE4gWQk0+ xEMlRMKCAmoD/wObDbvs5DJffeRa8ymjf2Poa9iS3OrIEiroKGANBvOJwZgl7mcgWjgK Mn9zcR/RR7vtr40qB48Xa3rMVcndWAtuWq6QeDF46FnHL13yCRCoQKJKjVHKqw6dcsG7 +NZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=KnK4BYVY; 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 xd2-20020a170907078200b0084d302afcc3si5366439ejb.79.2023.01.09.04.51.01; Mon, 09 Jan 2023 04:51:02 -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=KnK4BYVY; 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 87DE168BB61; Mon, 9 Jan 2023 14:50:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-245.mail.qq.com (out203-205-221-245.mail.qq.com [203.205.221.245]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B14B68BCCE for ; Mon, 9 Jan 2023 14:50:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1673268611; bh=eZ7dEWIyxmrWHPHF9IQR/0REjKWikG0Jlle6lPZEWZM=; h=From:To:Cc:Subject:Date; b=KnK4BYVY2WXkrrHZ8kUToS2aViH0v6+ltgP1IfLBZfTxI0wdLes2BQ4m3BBa6Y7W/ VB/O2W/sXmLZwKUZjltJvDQefHo3cLyhiEIf64u53CzkRaaF8xBiNErqqc1THtFtYx XgNF3lQWh2Ab3l7sd6Kpj+AO4RmG/adlvN5hfB9c= 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: xmsmtpt1673268609t7a1p103l Message-ID: X-QQ-XMAILINFO: MiE+axgVDEQLkwG7svVIda68ZKEEA+58AXn6CiiaGaMw2esiXyKMsjT/OwREBB 1iprHtxWiahzY8XFuXG/5PRleJYZdpmRzJUy/9p6XexM3+4zKd6mivZ79vrCFF3YstJmtfZ5u3OF JCzfkFxBgIp9GkEZJIJeiihSMcFAMxKclJSm2PMUptOB0Z5jxsjc+vqPRFPe24DMedRl1zcSDoSq 9GZkc510VPQCD/gyVUsaOTvNsJ3534kLQh1nQofjuWQPkPB5r4bl1ftp2qL6F/LK+O2AZ63cbRv8 0/i0sEhVVbe+scZEaRS/VKlJH8QIGknu2jeNOb3BhyZYPjQV9bXqeHXHrnAe8t13T40d6IqwfBrM Tv/oqf4T3WpN9ntLaq6RV8wErdDuqrYUtOcgOcYWtduUIAUEkD3ax1hLLOmKUSfLHQ5PoYYIqC6T U8TWrFPqQrv53S+bX0jl1QcXb63wPFVZwRP34JSz+sgQVJRuA+UDpu8VRviY1YceIM2LJMajjpIz rNIrau/r+NFvA3xXxvdtO58ykSS5EjkxQ2ZnNue+Fbdl3CCLq21SwwIlrAuzDfsXHV8wxFFBvokB 1j2ZsOZs0Iu7OKooyIdKEL8xNqRaGQZ5T/an6Ibukh+7ELljEBHV33RxEkAkB/vpshCJtz8sKbmO cH+C4xHRJHlFPRdkpPBIjWOS/KKvjKCny7nzD73qcaBHKxf3xypeR/W2WyhO2QAh0oEOmisw70dd /3Jyi/O7v2KIyAihvJG2RN3xQj6gXdaQr7zkccVC8XR7wFFvZgVJ72+1U7aw0AUYMox+y+na1LVz nWmqEo+j9tsuWA1XMOC8kRgdaXP2CrRMNPDrQRQm6dq/c2XSgEmgJQvA7Djg5JDsurIP8KYGzONN ri6xu2NrF6JZbS9wA86YAIs7RefB8ko7MDOrLctYkWxkXiKHnvqYAGHqZlKKjyj86ODNiMU0fbxp eCJuySdfMYQdeZrEK/8dlbeohuuy0z From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Jan 2023 20:50:03 +0800 X-OQ-MSGID: <20230109125008.13336-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/videotoolbox: fix NULL pointer dereference 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: bL/MlHVnYm3g From: Zhao Zhili In the code path of av_videotoolbox_default_init/init2(), avctx->internal->hwaccel_priv_data is NULL and passed to decoder_cb.decompressionOutputRefCon. Then it will be dereferenced inside videotoolbox_decoder_callback(). Delay videotoolbox_star() until ff_videotoolbox_common_init() to fix the bug. --- libavcodec/videotoolbox.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 1b1be8ddb4..a18b49007d 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1181,9 +1181,8 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) vtctx->logctx = avctx; - // Old API - do nothing. if (avctx->hwaccel_context) - return 0; + return videotoolbox_start(avctx); if (!avctx->hw_frames_ctx && !avctx->hw_device_ctx) { av_log(avctx, AV_LOG_ERROR, @@ -1404,7 +1403,7 @@ int av_videotoolbox_default_init2(AVCodecContext *avctx, AVVideotoolboxContext * avctx->hwaccel_context = vtctx ?: av_videotoolbox_alloc_context_with_pix_fmt(pix_fmt, full_range); if (!avctx->hwaccel_context) return AVERROR(ENOMEM); - return videotoolbox_start(avctx); + return 0; } void av_videotoolbox_default_free(AVCodecContext *avctx) From patchwork Mon Jan 9 12:50:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39943 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3065928pzb; Mon, 9 Jan 2023 04:50:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXsl3dk0fl4QUmhK5r5w/KTeTG6re44wLnELsH5cb+yRx1qxLjG1kQFasIOjdQLTnemBKV28 X-Received: by 2002:a17:907:d68b:b0:7c1:691a:6d2c with SMTP id wf11-20020a170907d68b00b007c1691a6d2cmr74737321ejc.7.1673268653482; Mon, 09 Jan 2023 04:50:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673268653; cv=none; d=google.com; s=arc-20160816; b=dp4NHT0ta50BnA9o9s5IILXXhS37tzKLwlG9N9mIF2WbekCBvNCL3ZIizVemrwpQpM o15PC64ivFQjd8+6/IcysmTQQQ+/fy2DBvI7rVvwidetGnaCIyyfTDxqqi7lJyB+qN9Q 3WnhNVyRJXYu7ZeK8GjGBMqBWKcUsBCMrHYSaWPRngonAq06uQ9fMMxV4shN+nDdUGJ5 iYKop1Ie4xBbGELM3VGzbAOJ/OncKaVT2kFSIL2WT0QnYsfOxg0Ks09DOiKvsYuGL2WZ MC9tMqHUYhMMfV9vwe72kSe+sVFHoXpKNxb/wpx72UgzpQZ0Q1JIw/F3S5OT3IcyPokq pziQ== 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=BD3xBA1vQMAvwkNGj+QMX1AxdmgKSuHNUNflxFMJyLo=; b=yc6t3UcOoiGhMqQasJ8upWol+svgw6lxjdh6F9cSolXlhMmbyvMZ98oC9T6ITbsGVr 98dR04g1UnHCtLg/RX83zzKFXedTUfWt6+dUUjfItq/VMcxE5dAlqMiI28qCipgNIx7f NDlCX/Gven/abFpdcg9DHvRsEgDpUnLfI+mjX18EwhwdBBIB2QEhamqhO9Kly8i1K0qo /XH9DrdnxscIyEttPq+BUFIWFUE1Hx0DYTMLL3QKBvAq6q5jSUjyBNQc5x6Ayy4jen9B M/y1+R1vaOi18DCTAbyOPmHpAH5lkh9j48Z0M9rLeNEqWgEtc6ji9J3GMFmHePlWDJxt p9AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=egzR7hvZ; 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 g25-20020a170906595900b007c0fd176698si7295217ejr.772.2023.01.09.04.50.53; Mon, 09 Jan 2023 04:50:53 -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=egzR7hvZ; 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 BA3A668BD07; Mon, 9 Jan 2023 14:50:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DDC268BCCD for ; Mon, 9 Jan 2023 14:50:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1673268612; bh=WmzlHax//eSYjDOOErYRm+t+D+BZdVx9rc7Gwk78zew=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=egzR7hvZCWyHO6zrTLGH77fcz7sNc4aEvDOQXw3NLuAHUhMCoaKfOhqFs311TeIoR y0LfFkruh8Kyu/XSFFeHLoc1+U0G6aYXcYZO8z08SS4yFCLdg97UzKE9Uz6WZXYIk/ +chAsPxIIO4ynWFMSvDx9m5eVk3YOPQo8BxI5Y2s= 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: xmsmtpt1673268611tnanigzmo Message-ID: X-QQ-XMAILINFO: N7h1OCCDntujbD7C7IUGcMq2SRzfINpcAAkzvDTT3RZgHutu4DpoFCyG+6kQRu s8kYxejvHzoZ6d93MPkKZxdAwzJEz0Ot64ZxrWvM92lbAwBBVZHSnhUkfF3evDWi9b4r98KiXp3n YxIkB0ust5cBM+ysRnf92/nbt1IRjSMIOwswI+zWuX990b0tG2g80XTT+8853cbsvDlUFmyqDpQL GZ9q9Q57mhlp2ITBKPIEq33PwtAHk0BxiDTNdL2eHnMDs0+QnbW7f8dGLawE6LTqOGheusDk15yL yt1pCuFq2tTAZbes9/N95hOTZ5U1UMcK0UkcKUhuqu9EeQcgeJsUCp8hLJr3XdfDteWrT6utgV9F bcVgDQYieLqRhpuTLZMARHzV2pzziAK7avAKIky7VER1bM5GeNEVhMla5IyXyl8baclwi7yvp7Tc gpngVgn0RNsu3IcqJjUVqC/Zai9b0Gu05PvokbeXl10g/4duuWODapSSW86UhSQsUcLCncYxk5gc 4lIjnM3ANeVRNY8mAd0KkrmM+jzQRiWEKt9AJX8PN44TjFuc2i4JaJD8KTRhXvaFUaJrb1qTaeKc T5SyQ+xJ4mIuFNtJLokcyH1MBFvZEBzZabMRdFC7NHyimpk3Ebd1gWPw3Mz91sLnDPHgt87s/Rz2 xDj8QjAYG2e6r46YwyPjJFV/Mi0qsmN3OrXogURem9YCYLt7c4D91QpqJgdsIr61MpNBxb+hfUeQ B7C5c8kTNj3P0WmPGHhhDxk2s57Fm5r4pBlIxcCPcAfLDaE1F4+PXjaZNC1tFJpUFS8g31rYAwXb Mx9AANbGo3flR/8maiZNKYLcwJ4uGpf/qlljjATGlfQUqdR6JMfbruruYsYDjNpLsiuzMgJxAOrJ FvbsOJFHru/QzqYrALjaix8hCljFXBYppOO58BapuUg/BeGyPWrE/5TlDYfb23MNPWsBgIR9lHut Ily8Xpdh1Ohm4IygQJpOtZ5YS/xPEfgaTRfi3lQro= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Jan 2023 20:50:05 +0800 X-OQ-MSGID: <20230109125008.13336-3-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 3/5] avcodec/videotoolbox: deprecate create AVVideotoolboxContext by user 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: t0eprMGzDM4s From: Zhao Zhili --- libavcodec/version_major.h | 1 + libavcodec/videotoolbox.c | 35 ++++++++++++++++++++--------------- libavcodec/videotoolbox.h | 12 ++++++++++++ 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 12f863deb7..2c0443c4c8 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -52,6 +52,7 @@ #define FF_API_SVTAV1_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_AYUV_CODECID (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_VT_OUTPUT_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_VT_HWACCEL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_AVCODEC_CHROMA_POS (LIBAVCODEC_VERSION_MAJOR < 60) #endif /* AVCODEC_VERSION_MAJOR_H */ diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index acf0c79822..a3d19c4c63 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1173,6 +1173,22 @@ static enum AVPixelFormat videotoolbox_best_pixel_format(AVCodecContext *avctx) return AV_PIX_FMT_NV12; } +static AVVideotoolboxContext *av_videotoolbox_alloc_context_with_pix_fmt(enum AVPixelFormat pix_fmt, + bool full_range) +{ + AVVideotoolboxContext *ret = av_mallocz(sizeof(*ret)); + + if (ret) { + OSType cv_pix_fmt_type = av_map_videotoolbox_format_from_pixfmt2(pix_fmt, full_range); + if (cv_pix_fmt_type == 0) { + cv_pix_fmt_type = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange; + } + ret->cv_pix_fmt_type = cv_pix_fmt_type; + } + + return ret; +} + int ff_videotoolbox_common_init(AVCodecContext *avctx) { VTContext *vtctx = avctx->internal->hwaccel_priv_data; @@ -1191,7 +1207,7 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - vtctx->vt_ctx = av_videotoolbox_alloc_context(); + vtctx->vt_ctx = av_videotoolbox_alloc_context_with_pix_fmt(AV_PIX_FMT_NONE, false); if (!vtctx->vt_ctx) { err = AVERROR(ENOMEM); goto fail; @@ -1371,22 +1387,9 @@ const AVHWAccel ff_prores_videotoolbox_hwaccel = { .priv_data_size = sizeof(VTContext), }; -static AVVideotoolboxContext *av_videotoolbox_alloc_context_with_pix_fmt(enum AVPixelFormat pix_fmt, - bool full_range) -{ - AVVideotoolboxContext *ret = av_mallocz(sizeof(*ret)); - if (ret) { - OSType cv_pix_fmt_type = av_map_videotoolbox_format_from_pixfmt2(pix_fmt, full_range); - if (cv_pix_fmt_type == 0) { - cv_pix_fmt_type = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange; - } - ret->cv_pix_fmt_type = cv_pix_fmt_type; - } - - return ret; -} +#if FF_API_VT_HWACCEL_CONTEXT AVVideotoolboxContext *av_videotoolbox_alloc_context(void) { return av_videotoolbox_alloc_context_with_pix_fmt(AV_PIX_FMT_NONE, false); @@ -1413,4 +1416,6 @@ void av_videotoolbox_default_free(AVCodecContext *avctx) videotoolbox_stop(avctx); av_freep(&avctx->hwaccel_context); } +#endif /* FF_API_VT_HWACCEL_CONTEXT */ + #endif /* CONFIG_VIDEOTOOLBOX */ diff --git a/libavcodec/videotoolbox.h b/libavcodec/videotoolbox.h index 25a747a49f..3cd1d254ff 100644 --- a/libavcodec/videotoolbox.h +++ b/libavcodec/videotoolbox.h @@ -90,6 +90,8 @@ typedef struct AVVideotoolboxContext { int cm_codec_type; } AVVideotoolboxContext; +#if FF_API_VT_HWACCEL_CONTEXT + /** * Allocate and initialize a Videotoolbox context. * @@ -102,7 +104,9 @@ typedef struct AVVideotoolboxContext { * object and free the Videotoolbox context using av_free(). * * @return the newly allocated context or NULL on failure + * @deprecated Use AVCodecContext.hw_frames_ctx or hw_device_ctx instead. */ +attribute_deprecated AVVideotoolboxContext *av_videotoolbox_alloc_context(void); /** @@ -112,7 +116,9 @@ AVVideotoolboxContext *av_videotoolbox_alloc_context(void); * @param avctx the corresponding codec context * * @return >= 0 on success, a negative AVERROR code on failure + * @deprecated Use AVCodecContext.hw_frames_ctx or hw_device_ctx instead. */ +attribute_deprecated int av_videotoolbox_default_init(AVCodecContext *avctx); /** @@ -123,7 +129,9 @@ int av_videotoolbox_default_init(AVCodecContext *avctx); * @param vtctx the Videotoolbox context to use * * @return >= 0 on success, a negative AVERROR code on failure + * @deprecated Use AVCodecContext.hw_frames_ctx or hw_device_ctx instead. */ +attribute_deprecated int av_videotoolbox_default_init2(AVCodecContext *avctx, AVVideotoolboxContext *vtctx); /** @@ -131,9 +139,13 @@ int av_videotoolbox_default_init2(AVCodecContext *avctx, AVVideotoolboxContext * * av_videotoolbox_default_init(). * * @param avctx the corresponding codec context + * @deprecated Use AVCodecContext.hw_frames_ctx or hw_device_ctx instead. */ +attribute_deprecated void av_videotoolbox_default_free(AVCodecContext *avctx); +#endif /* FF_API_VT_HWACCEL_CONTEXT */ + /** * @} */