From patchwork Sat Dec 9 15:38:13 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: 6636 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp810198jah; Sat, 9 Dec 2017 07:41:41 -0800 (PST) X-Google-Smtp-Source: AGs4zMYQdauRbGjmr01EvfCnLC6L91ON3akQ0n5L754Bw1b8rwsEufEsd7I6Sa8ravo2PlEgPJJr X-Received: by 10.223.128.195 with SMTP id 61mr26170829wrl.122.1512834101826; Sat, 09 Dec 2017 07:41:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512834101; cv=none; d=google.com; s=arc-20160816; b=YMj79YJfRvLtE3NA8IHMrZKsYK56ThNGdzzclkvHvXVvCwosIK4n37c/1R1NXOm0d1 J482FcWydrPnHo0c8/eu8WBV41ZT/LvvHYX7yMnTNnqjnDDY2PIgsONqaY8sjCDgiuJY Xvx1EDv4a6tX/qyqif/b+WGFpp8JxxzjmXP8EIZXuu/6CpVbM63LRYgNdeNFREkYdKlZ sB4zReaN9NoTZkdMcqQKpjdnmpFczXUOGN35tBTwV7L1pDEC8zkSbam6qrt/N3qqLEs5 XqQPUalkPhJVuRu9tBxyHWcGOceSwftmnidR27zJQaRZm+vVGcF8ABWrChlWe2sLOHvh gG9g== 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=iyX8cvMygTqTywqstlvGXO9mDn/1GE+wpGX8hvMcIod5eqfadCR02ouvL3jF8w4KBJ 2xNBvIMsbrqlIthlpeg9Nj/g0bpGp/GLtJ6CRXuHdRHFsb2csgoMQBZllBvO+a6X1cQO kWRJLbadS3sELwhliT8ARBE2wHKMvY9JKbyyHU8qH7nAlN/rkDYnayXxwppXHjM1H16/ rpJ7KtufqsfojBq2BA61uttErZxX8S6gxO6mLvEqcV2mYWO0PnFieF7aBoFZxR/6ygUW 4lQYXH8wknStoEPzHfDbkDFsS2B7+PClvynIaFjhYh5vmGXDsHOzG+rv1voy0MhHbH2/ naww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jaNXJDai; 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 j17si7810394wrb.367.2017.12.09.07.41.41; Sat, 09 Dec 2017 07:41:41 -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=jaNXJDai; 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 B862768A544; Sat, 9 Dec 2017 17:39:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95E7568A4EE for ; Sat, 9 Dec 2017 17:39:14 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id a41so13431745wra.6 for ; Sat, 09 Dec 2017 07:39:21 -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=jaNXJDaiAcW5XY3XRpGDviz6txzqdgnBsfQR/MjdDptuYs74NXU3PUv8wRiQjdDvLg LX+NvJF3AUwnafQ064jtv8gYJVYUNXaZmQQknZCEkac5/kIgeX+lWF/9lmJFO2e6Vs43 V4EpqnLVD6BPyxpFLh0NHo/znz34iJfFYsFitEXgpthrPCyjRDdRmU+MDsW3aNFHl23s HUimTOrJ2+LAI9IrT9fHEJ3q9emOw/GOH0u84rE950weoMg/U2jsscMUmhF3T/GfC6RJ ib+yVOGoY2+Vqy9k4GMe9JJCRWSrY7Lzr6HPwf6x/VY8m/YN9+ZocI0mqk0kf7d4Vviu 9Y8g== 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=QEiEtJmPR23HsroVkK3ykknzn3A5oX21DrHvhHXxS/fCoq9Bw1izZAOXez9zEbdk6d 58UME2sOpAU8V3A24aBcVv13AXyiiSHJ91y7QaOIwdxN7MQyqDwUtW7V82Dm1625k44X jpQVm/31vG/hjNEG2r+m7Y+3I/aAIPZ6ZYh8poHMlRi7b853nQi3FxEnEz0q5U5e5+ub rv158VBkZyygHTS/n/m8dYxU7b4nCrR0x0+iX79i1hYA5h9b4XhXnCg56di9IjiGUbrF BBKpDq/LglsGUGVAyaAvanWEcE5DUYzbsuGCEwGL911mVxg/3ovSPmqfEVQT9F4rt7Xc Z8iQ== X-Gm-Message-State: AJaThX6dCcS+RiIrcDAlPm2wz/DTn0O2dRuoVrJFJlRMffSw5iP+o1Wp nl6CDohqEkP7QdAqOPiMT8VG1Q== X-Received: by 10.223.139.67 with SMTP id v3mr28968092wra.70.1512833960894; Sat, 09 Dec 2017 07:39:20 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:20 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:38:13 +0100 Message-Id: <20171209153819.19007-21-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171209153819.19007-1-onemda@gmail.com> References: <20171209153819.19007-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 21/27] 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);