From patchwork Mon Nov 2 22:46:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 23348 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 2BCD444B1B8 for ; Tue, 3 Nov 2020 02:45:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1269F68811D; Tue, 3 Nov 2020 02:45:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDA4E68065D for ; Tue, 3 Nov 2020 02:45:44 +0200 (EET) Received: by mail-lf1-f68.google.com with SMTP id a7so19872837lfk.9 for ; Mon, 02 Nov 2020 16:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OIJQ+E/YyuDDsHcnM/lKdjjmzpnlhOVQImWtoUjaz94=; b=QgId5xRN3D+NjKnopk0/NDqu/WhRRxA1fs1PA1MSMAkl146PB+K49nv55sjFnsg7+1 cSCnMkxmpj1QSpdXjPcjZongLG+NuEXoB8O6SJ2St+xxW/bDplz3HFy9G5quHuUNST3X /R1Uggoatn2aQcVuiVHUVPkyHyh41feHkhNhK31/9n2nicvRTHUCuQhFlkeChn0ElPfg oIEYte2lgh53n2XWr56Pv686XNhRpB3jWBj3FxXZOLTwBqTxBv42QeE6US4hKy9pWy4Q xt0eL6JVs6DhYrJn4sX6l/tFA/K9Lo7dwJ8cqaZMKjqyUYwUFaJaK0j6kluzEYTX6thO v+Tg== 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:mime-version:content-transfer-encoding; bh=OIJQ+E/YyuDDsHcnM/lKdjjmzpnlhOVQImWtoUjaz94=; b=htrg3LCTprp+qRuoCtoMiCR0fTTMUM2wCgsGUr0FPOPu4WTOpPoBxGlxV1RyI11pfW iSN4gOR7mrBF2lwFdW7B9naeaqdiwixjBBwXMNbSb68I61IDuE8gzPxQ4xNwDV/uSPDr en7MY+LRGM4OJ/UZjpUAZ59xJHjNPe4zlScIvBapAnfzrk3airGMxNh8chwUt5EorQq8 z8mnUZOvC7m7uEMUZxz+W/YEYkBn6P7ZEjig67N8HWYvesIy7DeKBQFsvoQS/Atw8SiR RvluHoxRGPz3IMFX3qfrLPQIJaHZ7t7WbIFrx760EDSs7pVWNG6goMEFeWM8UOHvzXe0 TWfg== X-Gm-Message-State: AOAM533v/sXx8XVoGcrsIH1fimDmymDRyfAyOdpba/YtNUHjq/wMcsxJ ezB4I1mRf/839pTE0L8IRYToAF/n4BdM+g== X-Google-Smtp-Source: ABdhPJzatx6QFTkVUZIYha/c5H40XOsJ7iOuGJr1FjMaBZbsMUjTkjFdv+GiVfon9ptS4x1aXJ13wg== X-Received: by 2002:adf:aad0:: with SMTP id i16mr22134838wrc.270.1604357453289; Mon, 02 Nov 2020 14:50:53 -0800 (PST) Received: from localhost.localdomain (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id s133sm971628wmf.30.2020.11.02.14.50.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 14:50:51 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Nov 2020 22:46:48 +0000 Message-Id: <20201102224649.2563498-2-sw@jkqxz.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201102224649.2563498-1-sw@jkqxz.net> References: <20201102224649.2563498-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] vaapi_encode_h265: Fix setting colour properties 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Matching the previous commit for H.264. --- libavcodec/vaapi_encode_h265.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 316030914c..3e0af17ea5 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -488,30 +488,20 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) vui->aspect_ratio_info_present_flag = 1; } - if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED || - avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || + // Unspecified video format, from table E-2. + vui->video_format = 5; + vui->video_full_range_flag = + avctx->color_range == AVCOL_RANGE_JPEG; + vui->colour_primaries = avctx->color_primaries; + vui->transfer_characteristics = avctx->color_trc; + vui->matrix_coefficients = avctx->colorspace; + if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || avctx->color_trc != AVCOL_TRC_UNSPECIFIED || - avctx->colorspace != AVCOL_SPC_UNSPECIFIED) { + avctx->colorspace != AVCOL_SPC_UNSPECIFIED) + vui->colour_description_present_flag = 1; + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED || + vui->colour_description_present_flag) vui->video_signal_type_present_flag = 1; - vui->video_format = 5; // Unspecified. - vui->video_full_range_flag = - avctx->color_range == AVCOL_RANGE_JPEG; - - if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || - avctx->color_trc != AVCOL_TRC_UNSPECIFIED || - avctx->colorspace != AVCOL_SPC_UNSPECIFIED) { - vui->colour_description_present_flag = 1; - vui->colour_primaries = avctx->color_primaries; - vui->transfer_characteristics = avctx->color_trc; - vui->matrix_coefficients = avctx->colorspace; - } - } else { - vui->video_format = 5; - vui->video_full_range_flag = 0; - vui->colour_primaries = avctx->color_primaries; - vui->transfer_characteristics = avctx->color_trc; - vui->matrix_coefficients = avctx->colorspace; - } if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) { vui->chroma_loc_info_present_flag = 1;