From patchwork Sun Dec 10 13:14:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6669 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1678595jah; Sun, 10 Dec 2017 05:18:40 -0800 (PST) X-Google-Smtp-Source: AGs4zMbq2dWaAgrwJoJiXr8HraLo5m8v9IRIvWqDaK8zw1o4vC7HrgNzDQchPYzpprJhv3Aho8gw X-Received: by 10.28.203.197 with SMTP id b188mr7648846wmg.105.1512911920764; Sun, 10 Dec 2017 05:18:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911920; cv=none; d=google.com; s=arc-20160816; b=t57kKgk8h776Nk+1kaRNPRlVhGzCKwDi++dyJNtyyd8mj+AXSxKD9V+2deaMnR8DSI Wwp0PDeZ9SgvmD9/5wDjsy8npBEyvl9yr/0mBP9umqvrAYOJcuc/nPmTsp+ROweNftGA V/C8Q3yu0jS2wp8Pj+tUe4N5X5+xS8xXPCQVhYjX3zB+zQbSlxgtbcHsy/JLmPLuK1lZ Vg1+lOyz6HTWiKM73kMEiN4nfe9948sqlE7RHOH9rVSrhTDGlU695V1snoIry7ihzQw0 wPu3CyZ60WlJH5Qcxo8i09NHG6bCbxsl6a1vRsiuasAZNa3CWoOThJcT0iYgeSljQCYy GJ5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=6zCxoKaI/JP7bWc+vZYlLAO3ep27Lj7QLmep3sB9cA4=; b=tKFxt8geOtlWeZxumo5DSv7ZcgWYSphC+Ep12Z1alSSbliwXz9KE0Vf/N+tLudgp1x QRDUW53sx/2TY3AwlwSMvrhYLb3lSTgR65YUFwwzBVncPTs5DGv5gyiR7XBX3qqIx8iS Z5zy+8P+VtXNFS3TrG4cyzIYfZ1DrcU9P0cZQmT43usyRf6BcdScpV38/APjjv7hjfMB mlOkbTWzvWSA9Exbqh4xtxtKCjXgDun/uCJSGE8tmvJnQ3vy4HWeMT0uWKwOtu+kfR5k cxVkl9bvVsmxRP4hGq1wepzI2qpoxRSZBAcOWWoDU2OIOHVBxxGf2cGDoCIweOMc9B9c MB5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=a/2dRfW2; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s7si9182014wrf.345.2017.12.10.05.18.40; Sun, 10 Dec 2017 05:18:40 -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=@gmail.com header.s=20161025 header.b=a/2dRfW2; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F9C168A6D4; Sun, 10 Dec 2017 15:15:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD9126898AC for ; Sun, 10 Dec 2017 15:15:38 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id v22so14932239wrb.0 for ; Sun, 10 Dec 2017 05:15:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=BCtT6gn8ScSZwBIEATcepzfFHRL8jIQOJJMFRrOEI+k=; b=a/2dRfW2JCrWFwj7EqUO0knjaUB0HrSlrJPv5eF3efFVed1J7wrE2TCpUO6zUYbeR3 JNv5Dn4VH9fJptxeAtHo5foAmeHQ6YMk8cjwBGde2bRDShiA5qreQRxV2JET633vbL5R LoJr5n1TxE1Ytyjwqxn/oVzM4pFcrR80EFk1UcbVOpEeQetumvyr0MjDxnygPrlN+SgP Jgh/UOXK9n+uS7puMBJO304xZxELML6nQdxJ6bV9CPxcaOvqVImjBlXb8aiYsm42F66E H2b41pw01xodZhDpMkgj59FX7KpCYPOvG/LBqLEVo0i9OpjDPKYDnSqafCCCZi4gO6qP 2PYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=BCtT6gn8ScSZwBIEATcepzfFHRL8jIQOJJMFRrOEI+k=; b=Xxes0xmPUYkC6jHkV2bsX8eI66tg4qzO8kOYNNMot7LjexgdIhRskyiRzzsPo745nn O0qHktAzZ1hrfM8RT/3NzohCbKjDy/FF8XzPgEdbyFo4NmQo+K+DDTztrKPWIsny98BJ ps/xmetu2YhVwWjI6AxDMjjhpmZHw4asbyYudwJkVxVTFw65SoLaQnuwU79wGkeEIl6N ig0zujvPhgIJoK0kYCLqnIolkLK0xTUEqI5ZCAGKdqN8EcEX04Dquqo4BMmm9C2uHwiy cV8YitrLQDuTpug+2UkpfvLamL6TcTeGOqxitnDCsuqWdKfQS0bfo//SAy9KFjQan2+L 2zcg== X-Gm-Message-State: AJaThX7DLTa2ar0KpFO0XUmn5f0Osb/2H5GkWquT7eMRd1af1iF2rlYh LcZoKOB+KVI5MFKSjR9W13pTaQ== X-Received: by 10.223.150.2 with SMTP id b2mr30181584wra.185.1512911745429; Sun, 10 Dec 2017 05:15:45 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:45 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:30 +0100 Message-Id: <20171210131436.15791-23-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210131436.15791-1-onemda@gmail.com> References: <20171210131436.15791-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 23/29] avcodec/nvenc: remove YUVJ pixel formats usage 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/nvenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 4a91d99720..6ef51adaf0 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -911,8 +911,7 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) vui->colourMatrix = avctx->colorspace; vui->colourPrimaries = avctx->color_primaries; vui->transferCharacteristics = avctx->color_trc; - vui->videoFullRangeFlag = (avctx->color_range == AVCOL_RANGE_JPEG - || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ420P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ422P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ444P); + vui->videoFullRangeFlag = avctx->color_range == AVCOL_RANGE_JPEG; vui->colourDescriptionPresentFlag = (avctx->colorspace != 2 || avctx->color_primaries != 2 || avctx->color_trc != 2); @@ -999,8 +998,7 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) vui->colourMatrix = avctx->colorspace; vui->colourPrimaries = avctx->color_primaries; vui->transferCharacteristics = avctx->color_trc; - vui->videoFullRangeFlag = (avctx->color_range == AVCOL_RANGE_JPEG - || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ420P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ422P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ444P); + vui->videoFullRangeFlag = avctx->color_range == AVCOL_RANGE_JPEG; vui->colourDescriptionPresentFlag = (avctx->colorspace != 2 || avctx->color_primaries != 2 || avctx->color_trc != 2);