From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 43E3E44F2D for ; Mon, 9 Jan 2023 12:50:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9054668BCEC; Mon, 9 Jan 2023 14:50:25 +0200 (EET) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 */ + /** * @} */ -- 2.35.3 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".