From patchwork Fri Apr 26 04:13:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ManojGuptaBonda X-Patchwork-Id: 12914 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 89C84448AF0 for ; Fri, 26 Apr 2019 07:14:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 727B968A660; Fri, 26 Apr 2019 07:14:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from hqemgate15.nvidia.com (hqemgate15.nvidia.com [216.228.121.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B62076899DB for ; Fri, 26 Apr 2019 07:14:13 +0300 (EEST) Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 25 Apr 2019 21:13:45 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Thu, 25 Apr 2019 21:14:12 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Thu, 25 Apr 2019 21:14:12 -0700 Received: from bondagupta-NVWorkStation.nvidia.com (172.20.13.39) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 26 Apr 2019 04:14:09 +0000 From: ManojGuptaBonda To: Date: Fri, 26 Apr 2019 09:43:38 +0530 Message-ID: <20190426041339.13914-4-mbonda@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190426041339.13914-1-mbonda@nvidia.com> References: <20190426041339.13914-1-mbonda@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.13.39] X-ClientProxiedBy: HQMAIL106.nvidia.com (172.18.146.12) To HQMAIL101.nvidia.com (172.20.187.10) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1556252025; bh=NzORzH6X8ce2Ewu8mFJG2mnU+Xp5/f8tpvx+O5fdmvY=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:X-Originating-IP: X-ClientProxiedBy:Content-Type; b=QxiRtZGwIR5DephUalrVJ7CUG5SercOr/kD5yRaihMg10p74lf2AfBR9vugOD4zpH 8LslHL/6P2HE5/snSaoFvavxeH3k1ZI7DlIl/EoxkinffQe4Iz+UTrG8Mhad7Kd/Yz fZ6i2WPOUnLgxPkvdszRkK0lrcnQzMmXeNaUY/m5NyQ6xT4c8pIwdmOl3fveQo0mBs Ib4XVAwQxViBRGfNoGJJRZ/XWXG+72lsaR6jmBlfC7XWXOOgEOzwUf3XN/Y0I4dgcA 4l/VxoQD24Dpdmk5F5F7mrSgHCNPsk4YbcPEo2nbCqLLH2ihqpel4Be3lOD8cLM9Ks CSiy3WSb51e4A== Subject: [FFmpeg-devel] [PATCH 3/3] Map 444 pix fmts to new VdpYCbCr types defined in VDPAU. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: ManojGuptaBonda , swarren@nvidia.com, ARitger@nvidia.com, philipl@overt.org Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" New VdpYCbCr Formats VDP_YCBCR_FORMAT_Y_U_V_444 and, VDP_YCBCR_FORMAT_Y_UV_444 have been added in VDPAU to be used in get/putbits for YUV 4:4:4 surfaces. Earlier mapping of AV_PIX_FMT_YUV444P to VDP_YCBCR_FORMAT_YV12 is not valid. Hence this Change maps AV_PIX_FMT_YUV444P to VDP_YCBCR_FORMAT_Y_U_V_444 to access the YUV 4:4:4 surface via read-back API's of VDPAU. --- libavutil/hwcontext_vdpau.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_vdpau.c b/libavutil/hwcontext_vdpau.c index c11c3cfdab..786a51f802 100644 --- a/libavutil/hwcontext_vdpau.c +++ b/libavutil/hwcontext_vdpau.c @@ -73,8 +73,8 @@ static const VDPAUPixFmtMap pix_fmts_422[] = { }; static const VDPAUPixFmtMap pix_fmts_444[] = { - { VDP_YCBCR_FORMAT_YV12, AV_PIX_FMT_YUV444P }, - { 0, AV_PIX_FMT_NONE, }, + { VDP_YCBCR_FORMAT_Y_U_V_444, AV_PIX_FMT_YUV444P }, + { 0, AV_PIX_FMT_NONE, }, }; static const struct { @@ -349,7 +349,7 @@ static int vdpau_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, return AVERROR(EINVAL); } - if (vdpau_format == VDP_YCBCR_FORMAT_YV12) + if ((vdpau_format == VDP_YCBCR_FORMAT_YV12) || (vdpau_format == VDP_YCBCR_FORMAT_Y_U_V_444)) FFSWAP(void*, data[1], data[2]); err = priv->get_data(surf, vdpau_format, data, linesize); @@ -400,7 +400,7 @@ static int vdpau_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, return AVERROR(EINVAL); } - if (vdpau_format == VDP_YCBCR_FORMAT_YV12) + if ((vdpau_format == VDP_YCBCR_FORMAT_YV12) || (vdpau_format == VDP_YCBCR_FORMAT_Y_U_V_444)) FFSWAP(const void*, data[1], data[2]); err = priv->put_data(surf, vdpau_format, data, linesize);