From patchwork Sun Jul 16 09:13:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 42756 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4735628pzb; Sun, 16 Jul 2023 02:14:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlHH3fiHa2uE+aeREuR+JNFBWJSzGjQjGmM3sreucYe67k5zlujQA05kGqJDuUk/L7BSI2uN X-Received: by 2002:a05:6402:14d1:b0:51e:fa7:a292 with SMTP id f17-20020a05640214d100b0051e0fa7a292mr8463712edx.12.1689498849792; Sun, 16 Jul 2023 02:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689498849; cv=none; d=google.com; s=arc-20160816; b=F0GWee7yVcVpmWn2fgv9aRHH9Lyr3fF6iw1koyb5jlnqMjHrUTXVQzTZS3l1VbH2aq rZw8QRavzSPboVSd7M2cV2SxNMvp9Ca1jyIkgakF9cK822+n+LPsDcYL78HpbejWryFP vsWoJs3KI1J8Ma5WFUMqzjpG9lbw9MKHXuP9pE/eltELXhfkNohE9sllkHg8ETpd29N8 wyPkZ0MomCcdXykVAQPuEb7DD2YqOGyFnH6Wj17WPt3Xx41PGLIP9khdfM2GoVtgg4Gk JN3pJzmvxo6cQ+h4olETmgBh2gWkjlmfGUHbZQt5Qi1ByvNGJovcZRZp7+6yxNRAhANn 6D+g== 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=NyJ6xO7yKfUb6OBAXct4mIRi5482/VQIPFhKLONeDig=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=sGtWYFNE401Fd7V7ELvp8Bwr1kWmY61uS4fsLd2iWiFV7pFl/FUiUPoi2lFeURqRAZ C/Ij4NGv7dqzGBcBSYIiJSD2I7rAie2RjcLu00t7oChw6xlXy+xl2WVLzD46lFLuxxS1 4ltxRYpNYQcDjFqTylZTP/9MA9g+6pauYJQhzovX2K8SP8BI31t6ZGwgvkZon+Ki7W7f WA0jGDsTJUSAMQdAvHlD+AMYR5xdrO5cUWWQkA3RA2WNHlJ0hRR6ai8zJ6Ki9JFsBRmD q000BFPO325vuSxhetcmka6YXg5WT4TIhMfZQil9TWk6CJXS7amWB+MwfDZnQ4cidWLE L3SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=IsnXUBUu; 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 dy11-20020a05640231eb00b0052166bfe68asi3538071edb.429.2023.07.16.02.14.09; Sun, 16 Jul 2023 02:14:09 -0700 (PDT) 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=IsnXUBUu; 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 6469068C4F3; Sun, 16 Jul 2023 12:13:55 +0300 (EEST) 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 7C51C68C501 for ; Sun, 16 Jul 2023 12:13:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1689498818; bh=gG7ncJWYajXppMPWjpsqAAG+ISFr54qw5NDcSF1HeSM=; h=From:To:Cc:Subject:Date; b=IsnXUBUuHlHEKIs3haZZpM/R+wrCWAB9G1WrfXehvNCcESIscFkER7Ss7nSLbfuSV iphNxadJrdztilCkIWEc5FmFSAKwRPiPjuxUnpc/b96JGv1yfYOlB5Ffk7PwI7BcEZ faP2Mdpm6b9tIGsAD7Adh0TN2mdnvdY+xzuIuTHI= Received: from ZHILIZHAO-MB2.tencent.com ([113.116.31.61]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 35F220E3; Sun, 16 Jul 2023 17:13:31 +0800 X-QQ-mid: xmsmtpt1689498811tvl14aqhc Message-ID: X-QQ-XMAILINFO: NDgMZBR9sMman3RMQQW0YMaVtpYgabbWnun2uZS5zcruumTZxPWFS8KstqWn2S 3OrzKxusfGd8fawakU37gw0S2f3Dcz3LYItF8sW6gmNGQVrdFvYnBFo8gjFjF1pCHgjPfqCHyO8z c+YNisj2sPvBHVpXVJ7LeVlR5rZ0yTdec7LUjPF8PIUp294Oosd4mONR9DZ9hLGR0KJANYlA6Z9n H5rSKCFQK4gtfOJXYI8hjkdlODAD1fxgwxukUT03jP78K/91+p6q8qaX8qVm3NwZeVQ475NP9X25 2qjErJUPLMg0+a7Te0DPEL7FHi6vW1BMrilt2fvyKD88sxAa7i9hmPCI/HDlXeujAgOZ7Qi02Ga7 geOd2RnL1j6eNT6lmfJ0OmFMLVLpTmdRzCdeQjbKPlwh4IF78zVhCsY5T3LD0Vp2xRTuhaC+MOpN qRJf8lAKTApbLedOgfcGjktfLpOJOw+fiQYWhAGxuaP8bOdx8MvD7JfaN/Bbe4mvWZ/yRiRzecwr QXOizcroS0rbLa/b4Fn8WaBm+zq6ko9TvoaKJAYUfz7v5tpYysN0pYGbljaZbYlNHpI0SLc6G20r DDmMMEUAaQNbECVjVaJfI0FRWA1JrgQyR1x6oseadlc3HYwT/oaPGGTwNf35PH4t2XkTFio6KJms p1o8qfksE1m6VMdxVxsDTXwmwrkQcu7VRCJC4swX7+/mY8E0ztGaanRT0j6zpYE6ry1GF/q3tlWh PjvC/0WRI1ewvU1WUWJsAsOsC24QvUKFPrwRVn4bIuqwD8LTSo9WDl93+8vcHkypGcb6la3K7b+q CSmS8m8rPlrK+zceMLXwLcG256DXUoYJ9arwmD4fATs9g3Xp1GPtEmXlhjC4KuF3Dt9jyzPCtHug mJ19M6KSlYwdBPf4aXqRwdRzBY+Q2ym1UIpczRWBqyc6GHYfG6V0ymiVC6Md6RmPr0gGkQ+4izyH On2DasUAAmZGu/91wcL9ulP42vBe1L X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 17:13:27 +0800 X-OQ-MSGID: <20230716091329.28797-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/videotoolboxenc: use color parameters conversion from avutil 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: 0r6negFL3W6F From: Zhao Zhili --- libavcodec/videotoolboxenc.c | 137 ++++------------------------------- 1 file changed, 13 insertions(+), 124 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 6114351392..8e493c4f7a 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1001,132 +1001,20 @@ pbinfo_nomem: return AVERROR(ENOMEM); } -static int get_cv_color_primaries(AVCodecContext *avctx, - CFStringRef *primaries) -{ - enum AVColorPrimaries pri = avctx->color_primaries; - switch (pri) { - case AVCOL_PRI_UNSPECIFIED: - *primaries = NULL; - break; - - case AVCOL_PRI_BT470BG: - *primaries = kCVImageBufferColorPrimaries_EBU_3213; - break; - - case AVCOL_PRI_SMPTE170M: - *primaries = kCVImageBufferColorPrimaries_SMPTE_C; - break; - - case AVCOL_PRI_BT709: - *primaries = kCVImageBufferColorPrimaries_ITU_R_709_2; - break; - - case AVCOL_PRI_BT2020: - *primaries = compat_keys.kCVImageBufferColorPrimaries_ITU_R_2020; - break; - - default: - av_log(avctx, AV_LOG_ERROR, "Color primaries %s is not supported.\n", av_color_primaries_name(pri)); - *primaries = NULL; - return -1; - } - - return 0; -} - -static int get_cv_transfer_function(AVCodecContext *avctx, - CFStringRef *transfer_fnc, - CFNumberRef *gamma_level) +static int get_cv_gamma(AVCodecContext *avctx, + CFNumberRef *gamma_level) { enum AVColorTransferCharacteristic trc = avctx->color_trc; - Float32 gamma; + Float32 gamma = 0; *gamma_level = NULL; - switch (trc) { - case AVCOL_TRC_UNSPECIFIED: - *transfer_fnc = NULL; - break; - - case AVCOL_TRC_BT709: - *transfer_fnc = kCVImageBufferTransferFunction_ITU_R_709_2; - break; - - case AVCOL_TRC_SMPTE240M: - *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_240M_1995; - break; - -#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ - case AVCOL_TRC_SMPTE2084: - *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ; - break; -#endif -#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR - case AVCOL_TRC_LINEAR: - *transfer_fnc = kCVImageBufferTransferFunction_Linear; - break; -#endif -#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG - case AVCOL_TRC_ARIB_STD_B67: - *transfer_fnc = kCVImageBufferTransferFunction_ITU_R_2100_HLG; - break; -#endif - - case AVCOL_TRC_GAMMA22: - gamma = 2.2; - *transfer_fnc = kCVImageBufferTransferFunction_UseGamma; - *gamma_level = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma); - break; - - case AVCOL_TRC_GAMMA28: - gamma = 2.8; - *transfer_fnc = kCVImageBufferTransferFunction_UseGamma; - *gamma_level = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma); - break; - - case AVCOL_TRC_BT2020_10: - case AVCOL_TRC_BT2020_12: - *transfer_fnc = compat_keys.kCVImageBufferTransferFunction_ITU_R_2020; - break; - - default: - *transfer_fnc = NULL; - av_log(avctx, AV_LOG_ERROR, "Transfer function %s is not supported.\n", av_color_transfer_name(trc)); - return -1; - } - - return 0; -} - -static int get_cv_ycbcr_matrix(AVCodecContext *avctx, CFStringRef *matrix) { - switch(avctx->colorspace) { - case AVCOL_SPC_BT709: - *matrix = kCVImageBufferYCbCrMatrix_ITU_R_709_2; - break; - - case AVCOL_SPC_UNSPECIFIED: - case AVCOL_SPC_RGB: - *matrix = NULL; - break; - - case AVCOL_SPC_BT470BG: - case AVCOL_SPC_SMPTE170M: - *matrix = kCVImageBufferYCbCrMatrix_ITU_R_601_4; - break; - - case AVCOL_SPC_SMPTE240M: - *matrix = kCVImageBufferYCbCrMatrix_SMPTE_240M_1995; - break; - - case AVCOL_SPC_BT2020_NCL: - *matrix = compat_keys.kCVImageBufferYCbCrMatrix_ITU_R_2020; - break; - - default: - av_log(avctx, AV_LOG_ERROR, "Color space %s is not supported.\n", av_color_space_name(avctx->colorspace)); - return -1; - } + if (trc == AVCOL_TRC_GAMMA22) + gamma = 2.2; + else if (trc == AVCOL_TRC_GAMMA28) + gamma = 2.8; + if (gamma != 0) + *gamma_level = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma); return 0; } @@ -1694,9 +1582,10 @@ static int vtenc_configure_encoder(AVCodecContext *avctx) vtctx->dts_delta = vtctx->has_b_frames ? -1 : 0; - get_cv_transfer_function(avctx, &vtctx->transfer_function, &gamma_level); - get_cv_ycbcr_matrix(avctx, &vtctx->ycbcr_matrix); - get_cv_color_primaries(avctx, &vtctx->color_primaries); + get_cv_gamma(avctx, &gamma_level); + vtctx->transfer_function = av_map_videotoolbox_color_trc_from_av(avctx->color_trc); + vtctx->ycbcr_matrix = av_map_videotoolbox_color_matrix_from_av(avctx->colorspace); + vtctx->color_primaries = av_map_videotoolbox_color_primaries_from_av(avctx->color_primaries); if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { From patchwork Sun Jul 16 09:13:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 42757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4735664pzb; Sun, 16 Jul 2023 02:14:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlH9UQCvZizeLjXA0IqQxzIcn2k7vPw9qdDhyZk8YkNJln2jzyB4XbqWixPQ9DRoF6MXVmcP X-Received: by 2002:aa7:cd14:0:b0:51e:1705:155c with SMTP id b20-20020aa7cd14000000b0051e1705155cmr8875339edw.35.1689498858315; Sun, 16 Jul 2023 02:14:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689498858; cv=none; d=google.com; s=arc-20160816; b=qsfDrR4hjOvpcj6wT9ReeGc0NDfw0wgZZmEfXLtJsjJc46p+P8tI/Ql3KWu6IINlaf tj/E42qFTnb8/aD/vwvNUDbw6ClS3c5hCyIhnCFFTybOf4tzgHgSCXeVhSRizZ6PZZb3 iK3NPWXlAditLlglck7cm6fQkPBA4nqzgmHRX4OX+XjWKLKdOONg5+fMXdMl4GhyeQGn jgRV93vAuNaBXGRnyFyRvUE1fpmCr6Fkqk6wpCPwnxKp9jnrwwCJ/IgExbFVNQQyb48j dOU2GAU3RJioVPlicW/8sw7aLD4lcFL84vHDYCjMm4l09P4g9bnTXMa2j1GGFJDGN5Yb UtcA== 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=v4RwQisR7MlHj1NtNHdg25oGVlcbzKR5VvtD6sUubm4=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=N/FYexOy2ktVhLTqfspSHp5hTy6+63/fakOXDjByvlP1j0jZUJDLlRocMvvOBKvfJm XpjR5nVpHZk/9sIusy6LsPevtrsF9wM1bx3uLnX00u9dwVf6syyBGmQprbNmEaTHLesD cpKC1W3h6pjlTcTmP/eOyKJavfKj2GjhdxVD5bOb8GwfO5c3egxTSNs4yxZB9BYe8WBD 3HWZqVngVTWW4I5ez+skFltNxZ/UJwYl0gpg5OJ5wYk/LOOFuiOmMHCdInR47WAUGYTl OHHnHY2cts3iOeX6U9kuxlShxKJ+xEMz7FqFDtLSciYtuiI4ezvHXlTqscRHMAy3P3sx OkVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=pHk+RL7Z; 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 bo3-20020a0564020b2300b0051be9f09bf8si4290762edb.9.2023.07.16.02.14.18; Sun, 16 Jul 2023 02:14:18 -0700 (PDT) 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=pHk+RL7Z; 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 78EA568C5E6; Sun, 16 Jul 2023 12:13:56 +0300 (EEST) 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 D51FD68C558 for ; Sun, 16 Jul 2023 12:13:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1689498818; bh=kN5c9TUdsquVs6BkfcgBruc2HY7xGpIF3wteXJXKQqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pHk+RL7ZK3G07uV/YJYlD0Y2XI4o6Sf3Ck3KKoND89VOxq9cPnMyYHV1hm5HduN5O 0MaozXUJ5qpkDjof6ICbto6mfjdSPw0PLT2UN7gYXbWNT2Jaem+dySoCiRFxZZJj2d PQNxVjss0jHFrATJfxhOhgsc2eeUTibweyIggT1k= Received: from ZHILIZHAO-MB2.tencent.com ([113.116.31.61]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 35F220E3; Sun, 16 Jul 2023 17:13:31 +0800 X-QQ-mid: xmsmtpt1689498818tlva1cyiy Message-ID: X-QQ-XMAILINFO: Nt+cTZuZCMyihw59lb6nkgbFty+1RgY1xotTRcQcBhTbcx++21/o/AVkxEMZcI VJ5DBiUeZWJGfHSO3ditM7pZyFv4PPK+hEqL+u+Nubadzdo5r3UIZO+ihK5e+7YmHJnOEwbfXM7T fJKA/o+N3NBa0IKvXRq0AMKnimU0cy+rFkAZbSGm0bNDrTIhTAv7JUKCuFzqVfZQdj/6Uc76rcOH uM7qyFF0mMrfq6+cEgptKcJZReTWYw3CC8hysvwaNkkmGbzqas5NFU8f4wQxcp/NI9S+AtnMx80k L8jImf3gr12KRPDmBClDkOtjhmCsEIB5fg/xREX7f6zHsVEt8wLWCcupfOZaA2IoFtUM6l3DY1/d SSgqV+7Fy+xkLZE+Bkc/2xgAoQomAAnkO15hJYSMpH0+ROTaWR4f3BefwyuET/mqQ/jmTcQXdbha xTpLi0//5AqQcCJWpiwxZpnvbT2sw930BCSl7rjD2QCA5oGWKMb96yYW05SqqpNGu7ZMDfBGWewz L+wBnLy1aKb2SZdMP369GqXSwxxf92Eg46cMPkkBP+CiaNbY+JaYuWpdhpPuQGGbaxr98uyHnqu9 OO8T4EgAKZvufuPN/4HpjePfepdSSxATe1SQ5NrprbfG0qslKLuVPLkMg7IKzKjbNZKm7LYT1ugT 2exQfPUMkNrMk7IkO1ARdNfgwK1esAJmiXuZNcpZnNqcPezd4sedqU0qKVRCGwyNLN/ZK6ynCLa1 E+M3vqsRgQyo/euYwLcKVJ03XexzKG5aVquecSCrcLn7Uux+jLgn5aGeUB7Qr3u+e3fBvO4IbuLr 51PHFRCeTnDRrp1iATIbDg4pDFs5i6z+N2p17P5ryQBzAtlHL2tLiPSYQ3sTdTB7rpK9Oc26SekM RKWEAZTUOx/ge4RivSXKMwI+FBvXj8SuPpTysmOY0mCrrX+IFBIcgUN+HeEuybvtb0j71wLXp5Uk oQrrSpJUEEeBAL8kKHxjxV9kGVVHD1vniGBQ6gfFubp6Qrj6wneQ== X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 17:13:28 +0800 X-OQ-MSGID: <20230716091329.28797-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230716091329.28797-1-quinkblack@foxmail.com> References: <20230716091329.28797-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avfilter: add scale_vt for videotoolbox pix_fmt 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: tTiAaP/+OAJR From: Zhao Zhili For example, ./ffmpeg -hwaccel videotoolbox \ -hwaccel_output_format videotoolbox_vld \ -i ios-265.mov \ -c:v hevc_videotoolbox \ -profile:v main \ -b:v 3M \ -vf scale_vt=w=iw/2:h=ih/2:color_matrix=bt709:color_primaries=bt709:color_transfer=bt709 \ -c:a copy \ -tag:v hvc1 \ /tmp/test.mp4 Input: hevc (Main 10) (hvc1 / 0x31637668), yuv420p10le(tv, bt2020nc/bt2020/arib-std-b67), 3840x2160 Output: hevc (Main) (hvc1 / 0x31637668), yuv420p(tv, bt709, progressive), 1920x1080 --- Changelog | 1 + configure | 1 + doc/filters.texi | 21 ++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 4 +- libavfilter/vf_scale_vt.c | 244 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 271 insertions(+), 2 deletions(-) create mode 100644 libavfilter/vf_scale_vt.c diff --git a/Changelog b/Changelog index 3876082844..dadaf15de6 100644 --- a/Changelog +++ b/Changelog @@ -25,6 +25,7 @@ version : - Raw VVC bitstream parser, muxer and demuxer - Bitstream filter for editing metadata in VVC streams - Bitstream filter for converting VVC from MP4 to Annex B +- scale_vt filter for videotoolbox version 6.0: - Radiance HDR image support diff --git a/configure b/configure index dab3fb9036..bef6a6cb21 100755 --- a/configure +++ b/configure @@ -3835,6 +3835,7 @@ zmq_filter_deps="libzmq" zoompan_filter_deps="swscale" zscale_filter_deps="libzimg const_nan" scale_vaapi_filter_deps="vaapi" +scale_vt_filter_deps="videotoolbox" scale_vulkan_filter_deps="vulkan spirv_compiler" vpp_qsv_filter_deps="libmfx" vpp_qsv_filter_select="qsvvpp" diff --git a/doc/filters.texi b/doc/filters.texi index e5325c7410..500f3ac3cf 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21175,6 +21175,27 @@ Scale a logo to 1/10th the height of a video, while preserving its display aspec @end example @end itemize +@section scale_vt + +Scale and convert the color parameters using VTPixelTransferSession. + +The filter accepts the following options: +@table @option +@item w +@item h +Set the output video dimension expression. Default value is the input dimension. + +@item color_matrix +Set the output colorspace matrix. + +@item color_primaries +Set the output color primaries. + +@item color_transfer +Set the output transfer characteristics. + +@end table + @section scharr Apply scharr operator to input video stream. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 9b7813575a..ef2c87104f 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -457,6 +457,7 @@ OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o scale_eval.o \ OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale_eval.o OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_vpp_qsv.o OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale_eval.o vaapi_vpp.o +OBJS-$(CONFIG_SCALE_VT_FILTER) += vf_scale_vt.o scale_eval.o OBJS-$(CONFIG_SCALE_VULKAN_FILTER) += vf_scale_vulkan.o vulkan.o vulkan_filter.o OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale_eval.o OBJS-$(CONFIG_SCALE2REF_NPP_FILTER) += vf_scale_npp.o scale_eval.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9a7fadc58d..fefaa94d2b 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -427,6 +427,7 @@ extern const AVFilter ff_vf_scale_cuda; extern const AVFilter ff_vf_scale_npp; extern const AVFilter ff_vf_scale_qsv; extern const AVFilter ff_vf_scale_vaapi; +extern const AVFilter ff_vf_scale_vt; extern const AVFilter ff_vf_scale_vulkan; extern const AVFilter ff_vf_scale2ref; extern const AVFilter ff_vf_scale2ref_npp; diff --git a/libavfilter/version.h b/libavfilter/version.h index c001693e3c..77f38cb9b4 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 8 -#define LIBAVFILTER_VERSION_MICRO 102 +#define LIBAVFILTER_VERSION_MINOR 9 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_scale_vt.c b/libavfilter/vf_scale_vt.c new file mode 100644 index 0000000000..a7f72c8de9 --- /dev/null +++ b/libavfilter/vf_scale_vt.c @@ -0,0 +1,244 @@ +/* + * Copyright (c) 2023 Zhao Zhili + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "libavutil/hwcontext.h" +#include "libavutil/hwcontext_videotoolbox.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "internal.h" +#include "scale_eval.h" + +typedef struct ScaleVtContext { + AVClass *class; + + VTPixelTransferSessionRef transfer; + int output_width; + int output_height; + char *w_expr; + char *h_expr; + + enum AVColorPrimaries colour_primaries; + enum AVColorTransferCharacteristic colour_transfer; + enum AVColorSpace colour_matrix; + char *colour_primaries_string; + char *colour_transfer_string; + char *colour_matrix_string; +} ScaleVtContext; + +static av_cold int scale_vt_init(AVFilterContext *avctx) +{ + ScaleVtContext *s = avctx->priv; + int ret; + CFStringRef value; + + ret = VTPixelTransferSessionCreate(kCFAllocatorDefault, &s->transfer); + if (ret != noErr) { + av_log(avctx, AV_LOG_ERROR, "transfer session create failed, %d\n", ret); + return AVERROR_EXTERNAL; + } + +#define STRING_OPTION(var_name, func_name, default_value) \ + do { \ + if (s->var_name##_string) { \ + int var = av_##func_name##_from_name(s->var_name##_string); \ + if (var < 0) { \ + av_log(avctx, AV_LOG_ERROR, "Invalid %s.\n", #var_name); \ + return AVERROR(EINVAL); \ + } \ + s->var_name = var; \ + } else { \ + s->var_name = default_value; \ + } \ + } while (0) + + STRING_OPTION(colour_primaries, color_primaries, AVCOL_PRI_UNSPECIFIED); + STRING_OPTION(colour_transfer, color_transfer, AVCOL_TRC_UNSPECIFIED); + STRING_OPTION(colour_matrix, color_space, AVCOL_SPC_UNSPECIFIED); + + if (s->colour_primaries != AVCOL_PRI_UNSPECIFIED) { + value = av_map_videotoolbox_color_primaries_from_av(s->colour_primaries); + if (!value) { + av_log(avctx, AV_LOG_ERROR, + "Doesn't support converting to colour primaries %s\n", + s->colour_primaries_string); + return AVERROR(ENOTSUP); + } + VTSessionSetProperty(s->transfer, kVTPixelTransferPropertyKey_DestinationColorPrimaries, value); + } + + if (s->colour_transfer != AVCOL_TRC_UNSPECIFIED) { + value = av_map_videotoolbox_color_trc_from_av(s->colour_transfer); + if (!value) { + av_log(avctx, AV_LOG_ERROR, + "Doesn't support converting to trc %s\n", + s->colour_transfer_string); + return AVERROR(ENOTSUP); + } + VTSessionSetProperty(s->transfer, kVTPixelTransferPropertyKey_DestinationTransferFunction, value); + } + + if (s->colour_matrix != AVCOL_SPC_UNSPECIFIED) { + value = av_map_videotoolbox_color_matrix_from_av(s->colour_matrix); + if (!value) { + av_log(avctx, AV_LOG_ERROR, + "Doesn't support converting to colorspace %s\n", + s->colour_matrix_string); + return AVERROR(ENOTSUP); + } + VTSessionSetProperty(s->transfer, kVTPixelTransferPropertyKey_DestinationYCbCrMatrix, value); + } + + return 0; +} + +static av_cold void scale_vt_uninit(AVFilterContext *avctx) +{ + ScaleVtContext *s = avctx->priv; + + if (s->transfer) { + VTPixelTransferSessionInvalidate(s->transfer); + CFRelease(s->transfer); + s->transfer = NULL; + } +} + +static int scale_vt_filter_frame(AVFilterLink *link, AVFrame *in) +{ + int ret; + AVFilterContext *ctx = link->dst; + ScaleVtContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + CVPixelBufferRef src; + CVPixelBufferRef dst; + + AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + ret = AVERROR(ENOMEM); + goto fail; + } + + ret = av_frame_copy_props(out, in); + if (ret < 0) + goto fail; + + av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den, + (int64_t)in->sample_aspect_ratio.num * outlink->h * link->w, + (int64_t)in->sample_aspect_ratio.den * outlink->w * link->h, + INT_MAX); + if (s->colour_primaries != AVCOL_PRI_UNSPECIFIED) + out->color_primaries = s->colour_primaries; + if (s->colour_transfer != AVCOL_TRC_UNSPECIFIED) + out->color_trc = s->colour_transfer; + if (s->colour_matrix != AVCOL_SPC_UNSPECIFIED) + out->colorspace = s->colour_matrix; + + src = (CVPixelBufferRef)in->data[3]; + dst = (CVPixelBufferRef)out->data[3]; + ret = VTPixelTransferSessionTransferImage(s->transfer, src, dst); + if (ret != noErr) { + av_log(ctx, AV_LOG_ERROR, "transfer image failed, %d\n", ret); + ret = AVERROR_EXTERNAL; + goto fail; + } + + av_frame_free(&in); + + return ff_filter_frame(outlink, out); + +fail: + av_frame_free(&in); + av_frame_free(&out); + return ret; +} + +static int scale_vt_config_output(AVFilterLink *outlink) +{ + int err; + AVFilterContext *avctx = outlink->src; + ScaleVtContext *s = avctx->priv; + AVFilterLink *inlink = outlink->src->inputs[0]; + + err = ff_scale_eval_dimensions(s, s->w_expr, s->h_expr, inlink, outlink, + &s->output_width, + &s->output_height); + if (err < 0) + return err; + + outlink->w = s->output_width; + outlink->h = s->output_height; + + if (inlink->sample_aspect_ratio.num) { + AVRational r = {outlink->h * inlink->w, outlink->w * inlink->h}; + outlink->sample_aspect_ratio = av_mul_q(r, inlink->sample_aspect_ratio); + } else { + outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; + } + + return 0; +} + +#define OFFSET(x) offsetof(ScaleVtContext, x) +#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) +static const AVOption scale_vt_options[] = { + { "w", "Output video width", + OFFSET(w_expr), AV_OPT_TYPE_STRING, {.str = "iw"}, .flags = FLAGS }, + { "h", "Output video height", + OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, .flags = FLAGS }, + { "color_matrix", "Output colour matrix coefficient set", + OFFSET(colour_matrix_string), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, + { "color_primaries", "Output colour primaries", + OFFSET(colour_primaries_string), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, + { "color_transfer", "Output colour transfer characteristics", + OFFSET(colour_transfer_string), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, + { NULL }, +}; + +AVFILTER_DEFINE_CLASS(scale_vt); + +static const AVFilterPad scale_vt_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = &scale_vt_filter_frame, + }, +}; + +static const AVFilterPad scale_vt_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = &scale_vt_config_output, + }, +}; + +const AVFilter ff_vf_scale_vt = { + .name = "scale_vt", + .description = NULL_IF_CONFIG_SMALL("Scale Videotoolbox frames"), + .priv_size = sizeof(ScaleVtContext), + .init = scale_vt_init, + .uninit = scale_vt_uninit, + FILTER_INPUTS(scale_vt_inputs), + FILTER_OUTPUTS(scale_vt_outputs), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VIDEOTOOLBOX), + .priv_class = &scale_vt_class, + .flags = AVFILTER_FLAG_HWDEVICE, +}; From patchwork Sun Jul 16 09:13:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 42755 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4735571pzb; Sun, 16 Jul 2023 02:13:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlE/TAI8fon2z8Z9iLVvedIGI7DNNbG8tqjiyd+N9Nqdf8EEPDd5Mjw/rUdcAEPbxe11o7Y7 X-Received: by 2002:a17:906:40cc:b0:994:1eb4:6898 with SMTP id a12-20020a17090640cc00b009941eb46898mr8127170ejk.9.1689498839584; Sun, 16 Jul 2023 02:13:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689498839; cv=none; d=google.com; s=arc-20160816; b=si7tFYHUNmRRyGzTEAj5/GyBAeA0duit2altBFUd+aT5V0W7fhGljN1DyC1dRGjIYF U0XscDiL5NnhovrKzBMPwNnPMQQE+pcTB+9R0eo+tQxFrm2pwJRTcC3e9qF7siuVTjWO aqESQS2v2sFI8UPMJFBmS+tDEp1tYVsV/cdlyOt7YU2ELw1gMzXAninMHvyzpsO4Kp6s RfX0FBbPgGpZCfhmx5pv0wku29IXk3UkNNW4FMsaHaCAC7ZV+ENsFlumw4rZH82dM87l D72obYhcMT6o4/hkoKRs0ylwc7O3bmdJD1sHNHXzRvSZVaR3je8G8nxR3nRjJL6sefVm yTCQ== 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=he+PKQEOZMpxx0XdTH0HeDxb+vK9SDOO1I9fMAtfEsw=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=qaYDv9w4yaabcP32pD8chjy+6dXH2tshusBkash5GexQCkLrI30M2NZ6nxd+n6eNx8 AAnqLfzATuuaTkuea5s5zdmA+cgvTFyfVuIhj6lLatglluLfXTGg8k+harWIR9fGpGAj b6BERQ5jreKE/6HGCeCv2KKnRnjokbtvWG9faLLZYPkQgT0UPfJDTwlmRJx+Tjec/m9j L3/qebrawk86ExIBh/E3TOobi5b3TJd6GfYowxvAeHFdHIfTEGB61Y50/XaDdUWMzV14 yRB+sBLqyBVptlc/nJpY9qlLOxUdRmF4CHxzuzb0uvlL6red43EEVu/zhFL2ZuGt94CE fycQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=cm1zBBdM; 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 c13-20020a170906694d00b009930ef7f05dsi11841251ejs.908.2023.07.16.02.13.58; Sun, 16 Jul 2023 02:13:59 -0700 (PDT) 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=cm1zBBdM; 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 1921A68C5B2; Sun, 16 Jul 2023 12:13:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EFB168C418 for ; Sun, 16 Jul 2023 12:13:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1689498819; bh=5kg/eSmFkB6kDhEGgnq/IxShGLaHc2PjwkQeWcu+k6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cm1zBBdMK5XwawUn5a5v5VbaCEyqVpNqbyb/09lihWXuAINQuDwUCNjOc2G50woqT +lmBXp6y3fdJp7yxST7GZAmFSiOc68BVrhJzD0BSxGOzCO3kzCfUyI2vETLhn2se8R gcTrL72in6JNLgCMn7KI02y6uz+53RjI+qG8uJ/4= Received: from ZHILIZHAO-MB2.tencent.com ([113.116.31.61]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 35F220E3; Sun, 16 Jul 2023 17:13:31 +0800 X-QQ-mid: xmsmtpt1689498818ti6jasu7b Message-ID: X-QQ-XMAILINFO: N7/wgsuYk0Vx80objxImoajtWwLseQbt+JhFBTmL1Y7XKjL/XjSlLFAcYhxEo7 C/Ubb8SKjZsgTbn7CmCn9gylPKPBQu7gTvLqIEXVpIWKJuJ1mqpGayMBqh10FQtf8KlxZ/Hi/Aol eOlexL+nFE0mng275pjzVyuRGKOQbGcZ6+oid6/emxxPBjdOFjYss0B/4X4N4qE+YgCUrd0ZSvdL 8fzWBfPrxkafFuylLx6Fm1NvF6kU+CgE69XE5jRDllErEGInrL2vo/MRwTRyoOKlj+JRkh62/0fC gMk9Q/zc2zQXB8Q9migbu0RCmzUOlTDFndMqjomvV1/EtajGyp8FpKHRuMesGrdMZbRHMg4QWTPO UJms23stYocZAFizOCgYb2VmhN+uHGAMxbFSrGxWd2i3G9qveX5MzFCTgDPiLJlWfpmYCu2XFQf/ x+tQZI4LZ1dl5dodwCmp3Z75HUOZAJy0VSEwwc4C4HlJQX3+YEsDy3RqoLZ/0PCoT9CZJJo+MKji hZsyCE+yCAt7y53/4V3GLqV11iyyF3JbLedLH0kIMhlUK9lYy5bkVXHduQvRqyJb+s9x1JFTCrcz bDmUTpeXdBNs+4EFdb7wwZxYRGo//SGCpfMJllZXSbku6637Au5FjO6phS8p4CjlCu+o4s4yaBaM kP8Tr6RvPzC58hM3cwR3U9p3vX6/qfvYerKikx5SLWxUhfNLsc1l9LTxS+8TTvZoe/ChHqPvSlvh iwD25PReC82EaiOOwKRg5T96J3WbTMdxaVzBmJSEwO4ifQ25oN51j5PDPhWeH6GMiXvl8EW+9Xil mAh7GgcYvgaEV6jc0rBshUP0kfdfNH708bDZsm7944kDc+RCk68RyOxRZ1t2Pl5ytBOb9qLbEVyz jD9YslSmPZ6j/23zbtlGBTPybmaoeBKA/uoJ7ZCKwy6dZTDtthuXDRcJnZvEieX3T/4TYZBTqjoR VHGH8TcuoFiCwHIGJ0pR2OFJZW7lPGlgQyjV4Ig5nuNbrpS3M6J1698Kway1KcbiZUak2//fc= X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 17:13:29 +0800 X-OQ-MSGID: <20230716091329.28797-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230716091329.28797-1-quinkblack@foxmail.com> References: <20230716091329.28797-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avfilter: add transpose_vt for videotoolbox pix_fmt 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: crFR+QP/NEeN From: Zhao Zhili --- Changelog | 1 + configure | 2 + doc/filters.texi | 48 +++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_transpose_vt.c | 246 ++++++++++++++++++++++++++++++++++ 7 files changed, 300 insertions(+), 1 deletion(-) create mode 100644 libavfilter/vf_transpose_vt.c diff --git a/Changelog b/Changelog index dadaf15de6..bbda4f4fd4 100644 --- a/Changelog +++ b/Changelog @@ -26,6 +26,7 @@ version : - Bitstream filter for editing metadata in VVC streams - Bitstream filter for converting VVC from MP4 to Annex B - scale_vt filter for videotoolbox +- transpose_vt filter for videotoolbox version 6.0: - Radiance HDR image support diff --git a/configure b/configure index bef6a6cb21..e446a912c9 100755 --- a/configure +++ b/configure @@ -3823,6 +3823,7 @@ tonemap_vaapi_filter_deps="vaapi VAProcFilterParameterBufferHDRToneMapping" tonemap_opencl_filter_deps="opencl const_nan" transpose_opencl_filter_deps="opencl" transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags" +transpose_vt_filter_deps="videotoolbox VTPixelRotationSessionCreate" transpose_vulkan_filter_deps="vulkan spirv_compiler" unsharp_opencl_filter_deps="opencl" uspp_filter_deps="gpl avcodec" @@ -6467,6 +6468,7 @@ check_headers termios.h check_headers unistd.h check_headers valgrind/valgrind.h check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox +check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox check_headers windows.h check_headers asm/types.h diff --git a/doc/filters.texi b/doc/filters.texi index 500f3ac3cf..1c9bd38cb2 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -27661,6 +27661,54 @@ Default value is @code{0}. @end table +@section transpose_vt + +Transpose rows with columns in the input video and optionally flip it. +For more in depth examples see the @ref{transpose} video filter, which shares mostly the same options. + +It accepts the following parameters: + +@table @option + +@item dir +Specify the transposition direction. + +Can assume the following values: +@table @samp +@item cclock_flip +Rotate by 90 degrees counterclockwise and vertically flip. (default) + +@item clock +Rotate by 90 degrees clockwise. + +@item cclock +Rotate by 90 degrees counterclockwise. + +@item clock_flip +Rotate by 90 degrees clockwise and vertically flip. + +@item hflip +Flip the input video horizontally. + +@item vflip +Flip the input video vertically. + +@end table + +@item passthrough +Do not apply the transposition if the input geometry matches the one +specified by the specified value. It accepts the following values: +@table @samp +@item none +Always apply transposition. (default) +@item portrait +Preserve portrait geometry (when @var{height} >= @var{width}). +@item landscape +Preserve landscape geometry (when @var{width} >= @var{height}). +@end table + +@end table + @section transpose_vulkan Transpose rows with columns in the input video and optionally flip it. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ef2c87104f..30a0e22ef8 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -525,6 +525,7 @@ OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o OBJS-$(CONFIG_TRANSPOSE_NPP_FILTER) += vf_transpose_npp.o OBJS-$(CONFIG_TRANSPOSE_OPENCL_FILTER) += vf_transpose_opencl.o opencl.o opencl/transpose.o OBJS-$(CONFIG_TRANSPOSE_VAAPI_FILTER) += vf_transpose_vaapi.o vaapi_vpp.o +OBJS-$(CONFIG_TRANSPOSE_VT_FILTER) += vf_transpose_vt.o OBJS-$(CONFIG_TRANSPOSE_VULKAN_FILTER) += vf_transpose_vulkan.o vulkan.o vulkan_filter.o OBJS-$(CONFIG_TRIM_FILTER) += trim.o OBJS-$(CONFIG_UNPREMULTIPLY_FILTER) += vf_premultiply.o framesync.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index fefaa94d2b..089ad3a0ed 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -492,6 +492,7 @@ extern const AVFilter ff_vf_transpose; extern const AVFilter ff_vf_transpose_npp; extern const AVFilter ff_vf_transpose_opencl; extern const AVFilter ff_vf_transpose_vaapi; +extern const AVFilter ff_vf_transpose_vt; extern const AVFilter ff_vf_transpose_vulkan; extern const AVFilter ff_vf_trim; extern const AVFilter ff_vf_unpremultiply; diff --git a/libavfilter/version.h b/libavfilter/version.h index 77f38cb9b4..4a69d6be98 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 9 +#define LIBAVFILTER_VERSION_MINOR 10 #define LIBAVFILTER_VERSION_MICRO 100 diff --git a/libavfilter/vf_transpose_vt.c b/libavfilter/vf_transpose_vt.c new file mode 100644 index 0000000000..197ea5707c --- /dev/null +++ b/libavfilter/vf_transpose_vt.c @@ -0,0 +1,246 @@ +/* + * Copyright (c) 2023 Zhao Zhili + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "libavutil/hwcontext.h" +#include "libavutil/hwcontext_videotoolbox.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "internal.h" +#include "transpose.h" + +typedef struct TransposeVtContext { + AVClass *class; + + VTPixelRotationSessionRef session; + int dir; + int passthrough; +} TransposeVtContext; + +static av_cold int transpose_vt_init(AVFilterContext *avctx) +{ + TransposeVtContext *s = avctx->priv; + int ret; + + ret = VTPixelRotationSessionCreate(kCFAllocatorDefault, &s->session); + if (ret != noErr) { + av_log(avctx, AV_LOG_ERROR, "Rotation session create failed, %d\n", ret); + return AVERROR_EXTERNAL; + } + + return 0; +} + +static av_cold void transpose_vt_uninit(AVFilterContext *avctx) +{ + TransposeVtContext *s = avctx->priv; + + if (s->session) { + VTPixelRotationSessionInvalidate(s->session); + CFRelease(s->session); + s->session = NULL; + } +} + +static int transpose_vt_filter_frame(AVFilterLink *link, AVFrame *in) +{ + int ret; + AVFilterContext *ctx = link->dst; + TransposeVtContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + CVPixelBufferRef src; + CVPixelBufferRef dst; + + if (s->passthrough) + return ff_filter_frame(outlink, in); + + AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + ret = AVERROR(ENOMEM); + goto fail; + } + + ret = av_frame_copy_props(out, in); + if (ret < 0) + goto fail; + + src = (CVPixelBufferRef)in->data[3]; + dst = (CVPixelBufferRef)out->data[3]; + ret = VTPixelRotationSessionRotateImage(s->session, src, dst); + if (ret != noErr) { + av_log(ctx, AV_LOG_ERROR, "transfer image failed, %d\n", ret); + ret = AVERROR_EXTERNAL; + goto fail; + } + + av_frame_free(&in); + + return ff_filter_frame(outlink, out); + +fail: + av_frame_free(&in); + av_frame_free(&out); + return ret; +} + +static int transpose_vt_config_output(AVFilterLink *outlink) +{ + int err; + AVFilterContext *avctx = outlink->src; + TransposeVtContext *s = avctx->priv; + AVFilterLink *inlink = outlink->src->inputs[0]; + CFStringRef rotation = kVTRotation_0; + CFBooleanRef vflip = kCFBooleanFalse; + CFBooleanRef hflip = kCFBooleanFalse; + int swap_w_h = 0; + + if ((inlink->w >= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_LANDSCAPE) || + (inlink->w <= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_PORTRAIT)) { + av_log(avctx, AV_LOG_VERBOSE, + "w:%d h:%d -> w:%d h:%d (passthrough mode)\n", + inlink->w, inlink->h, inlink->w, inlink->h); + return 0; + } + + s->passthrough = TRANSPOSE_PT_TYPE_NONE; + + switch (s->dir) { + case TRANSPOSE_CCLOCK_FLIP: + rotation = kVTRotation_CCW90; + vflip = kCFBooleanTrue; + swap_w_h = 1; + break; + case TRANSPOSE_CCLOCK: + rotation = kVTRotation_CCW90; + swap_w_h = 1; + break; + case TRANSPOSE_CLOCK: + rotation = kVTRotation_CW90; + swap_w_h = 1; + break; + case TRANSPOSE_CLOCK_FLIP: + rotation = kVTRotation_CW90; + vflip = kCFBooleanTrue; + swap_w_h = 1; + break; + case TRANSPOSE_REVERSAL: + rotation = kVTRotation_180; + break; + case TRANSPOSE_HFLIP: + hflip = kCFBooleanTrue; + break; + case TRANSPOSE_VFLIP: + vflip = kCFBooleanTrue; + break; + default: + av_log(avctx, AV_LOG_ERROR, "Failed to set direction to %d\n", s->dir); + return AVERROR(EINVAL); + } + + err = VTSessionSetProperty(s->session, kVTPixelRotationPropertyKey_Rotation, + rotation); + if (err != noErr) { + av_log(avctx, AV_LOG_ERROR, "Set rotation property failed, %d\n", err); + return AVERROR_EXTERNAL; + } + err = VTSessionSetProperty(s->session, kVTPixelRotationPropertyKey_FlipVerticalOrientation, + vflip); + if (err != noErr) { + av_log(avctx, AV_LOG_ERROR, "Set vertical flip property failed, %d\n", err); + return AVERROR_EXTERNAL; + } + err = VTSessionSetProperty(s->session, kVTPixelRotationPropertyKey_FlipHorizontalOrientation, + hflip); + if (err != noErr) { + av_log(avctx, AV_LOG_ERROR, "Set horizontal flip property failed, %d\n", err); + return AVERROR_EXTERNAL; + } + + if (swap_w_h) { + outlink->w = inlink->h; + outlink->h = inlink->w; + } + + return 0; +} + +#define OFFSET(x) offsetof(TransposeVtContext, x) +#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) +static const AVOption transpose_vt_options[] = { + { "dir", "set transpose direction", + OFFSET(dir), AV_OPT_TYPE_INT, { .i64 = TRANSPOSE_CCLOCK_FLIP }, 0, 6, FLAGS, "dir" }, + { "cclock_flip", "rotate counter-clockwise with vertical flip", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, + { "clock", "rotate clockwise", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK }, .flags=FLAGS, .unit = "dir" }, + { "cclock", "rotate counter-clockwise", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK }, .flags=FLAGS, .unit = "dir" }, + { "clock_flip", "rotate clockwise with vertical flip", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, + { "reversal", "rotate by half-turn", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_REVERSAL }, .flags=FLAGS, .unit = "dir" }, + { "hflip", "flip horizontally", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_HFLIP }, .flags=FLAGS, .unit = "dir" }, + { "vflip", "flip vertically", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_VFLIP }, .flags=FLAGS, .unit = "dir" }, + + { "passthrough", "do not apply transposition if the input matches the specified geometry", + OFFSET(passthrough), AV_OPT_TYPE_INT, { .i64=TRANSPOSE_PT_TYPE_NONE }, 0, INT_MAX, FLAGS, "passthrough" }, + { "none", "always apply transposition", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_PT_TYPE_NONE }, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { "portrait", "preserve portrait geometry", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_PT_TYPE_PORTRAIT }, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { "landscape", "preserve landscape geometry", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_PT_TYPE_LANDSCAPE }, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + + { NULL } +}; + +AVFILTER_DEFINE_CLASS(transpose_vt); + +static const AVFilterPad transpose_vt_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = &transpose_vt_filter_frame, + }, +}; + +static const AVFilterPad transpose_vt_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = &transpose_vt_config_output, + }, +}; + +const AVFilter ff_vf_transpose_vt = { + .name = "transpose_vt", + .description = NULL_IF_CONFIG_SMALL("Transpose Videotoolbox frames"), + .priv_size = sizeof(TransposeVtContext), + .init = transpose_vt_init, + .uninit = transpose_vt_uninit, + FILTER_INPUTS(transpose_vt_inputs), + FILTER_OUTPUTS(transpose_vt_outputs), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VIDEOTOOLBOX), + .priv_class = &transpose_vt_class, + .flags = AVFILTER_FLAG_HWDEVICE, +};