From patchwork Wed Feb 1 22:54:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 2407 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2662927vsb; Wed, 1 Feb 2017 14:54:53 -0800 (PST) X-Received: by 10.28.180.132 with SMTP id d126mr25943383wmf.123.1485989693813; Wed, 01 Feb 2017 14:54:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b58si26273958wrb.1.2017.02.01.14.54.53; Wed, 01 Feb 2017 14:54: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=@overt.org; dkim=neutral (body hash did not verify) header.i=@overt.org; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B2459689222; Thu, 2 Feb 2017 00:54:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-s67.mailgun.info (mail-s67.mailgun.info [184.173.153.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E3DB687ED1 for ; Thu, 2 Feb 2017 00:54:27 +0200 (EET) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=overt.org; q=dns/txt; s=k1; t=1485989666; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=EQYCynnDyh2xdeP/E057jTrSlikgcVyc1KB2pRdc+4A=; b=fHySV6SIfpsG8UIFB3VdIRlSqIu0w5W1uTLirPGa+0iBVD3enDX1h0Gdu+2UvQ6TGXMYbCka 3bwVBcWGOCz/dYo9dkpRlUrsa6uHS8/pWUdT/2OpstloTMUQoY8VNJEx1b38iN9SUnGfqrab PmujtmBc1DDmLNaKmUyPZ8ERqkU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=overt.org; s=k1; q=dns; h=Sender: From: To: Cc: Subject: Date: Message-Id: In-Reply-To: References; b=qocYlCKvdIZOm84Y6E7+hz+XyoJsz3V5sHc6+icqk1LlyKz8rqauoLo3POVtP0jamSl4NR Qb1iFCTt3sDQF1FG3s7WLd9mYK/pWnYctioBGWTp5CECuLp5t6iIDf3NjaSWBwqUdyp2xBtD PK8RPjs88FnnayWsHawtAiiUcwXuA= X-Mailgun-Sending-Ip: 184.173.153.195 X-Mailgun-Sid: WyIyM2Q3MCIsICJmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZyIsICI0YTg5NjEiXQ== Received: from mail.overt.org (155.208.178.107.bc.googleusercontent.com [107.178.208.155]) by mxa.mailgun.org with ESMTP id 58926722.7fd5b44fb880-smtp-out-n01; Wed, 01 Feb 2017 22:54:26 -0000 (UTC) Received: from authenticated-user (mail.overt.org [107.178.208.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 8C024605A0; Wed, 1 Feb 2017 22:54:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1485989665; bh=HxJbkwhWlYBWNWnzDsfibaPMHV9aiS/2V9mHMzD9ewQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P5+kYwYwDAeIvUP8Jo5CFcF4wB6Edg3HKSSoPKAvJRFElBU4/eZuAQZvdT3mEYkE4 Me0GjNJzMLyIDqIEBqqQa6nNqFWsX4z6eSLmCVhiugz5MS/59P7wid36V4s4MRTrTm 0bfMnvuRnG74VbhYY7ESpkaNQeMUYjJrhY4ZmkGFlaJIzYPhP+aamontedthHzKTaZ 1ezi2ZCsM0PVqm5W1xSZ/cEvIszIvF995IUAAM5+nXiR4G/+rVQUOT9LrsyO2wI+4n k/f65aaKr/NK3QfA8gqA2LcvpYbDxZMzHzluD/ZfpUbb6wgb9RZgsCcmWkcuSPtDsb UajUPV31lAnpw== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Feb 2017 14:54:19 -0800 Message-Id: <20170201225419.32405-3-philipl@overt.org> In-Reply-To: <20170201225419.32405-1-philipl@overt.org> References: <20170201225419.32405-1-philipl@overt.org> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/nvenc: Use the right pix format for YUV444P10 content 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: Philip Langdale MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Now that we have an accurate pixfmt available, let's use it for the format mapping in nvenc and stop pretending we support > 10bit. Signed-off-by: Philip Langdale --- libavcodec/nvenc.c | 8 ++++---- libavcodec/version.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 7005465..b2b6ec9 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -41,7 +41,7 @@ const enum AVPixelFormat ff_nvenc_pix_fmts[] = { AV_PIX_FMT_NV12, AV_PIX_FMT_P010, AV_PIX_FMT_YUV444P, - AV_PIX_FMT_YUV444P16, + AV_PIX_FMT_YUV444P10MSB, AV_PIX_FMT_0RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_CUDA, @@ -49,10 +49,10 @@ const enum AVPixelFormat ff_nvenc_pix_fmts[] = { }; #define IS_10BIT(pix_fmt) (pix_fmt == AV_PIX_FMT_P010 || \ - pix_fmt == AV_PIX_FMT_YUV444P16) + pix_fmt == AV_PIX_FMT_YUV444P10MSB) #define IS_YUV444(pix_fmt) (pix_fmt == AV_PIX_FMT_YUV444P || \ - pix_fmt == AV_PIX_FMT_YUV444P16) + pix_fmt == AV_PIX_FMT_YUV444P10MSB) static const struct { NVENCSTATUS nverr; @@ -1041,7 +1041,7 @@ static NV_ENC_BUFFER_FORMAT nvenc_map_buffer_format(enum AVPixelFormat pix_fmt) return NV_ENC_BUFFER_FORMAT_YUV420_10BIT; case AV_PIX_FMT_YUV444P: return NV_ENC_BUFFER_FORMAT_YUV444_PL; - case AV_PIX_FMT_YUV444P16: + case AV_PIX_FMT_YUV444P10MSB: return NV_ENC_BUFFER_FORMAT_YUV444_10BIT; case AV_PIX_FMT_0RGB32: return NV_ENC_BUFFER_FORMAT_ARGB; diff --git a/libavcodec/version.h b/libavcodec/version.h index c038e4b..82a89f9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 75 +#define LIBAVCODEC_VERSION_MINOR 76 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \