From patchwork Mon Nov 2 22:46:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 23340 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 1DB37447C67 for ; Tue, 3 Nov 2020 00:57:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E318A68AA9B; Tue, 3 Nov 2020 00:57:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B86C6880BE for ; Tue, 3 Nov 2020 00:57:34 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id c18so10961202wme.2 for ; Mon, 02 Nov 2020 14:57:34 -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=ss8AeC6pAuQpqr+W3odwjc58xNkjxV/avvXY18wt01g=; b=0iDajn1+sLFn9WkMH1WQFpQok0bm/V2PM1d5JIcbEmyDD1vTbau7XnTHu3Bhxsw4nr XHsmXixiH0Q7T7fWcO3BoYwixtjYf0JaJvOFK2lC9rwPlMedHBZDNQ1mEedVlv6nsud+ zae13NjB62Jg6xBQeyLy4jdpOrKOo8h78wngnWaIiSxW+ZXTugpfHkeSyg6Z46tgXGjx gplqk3QNRmFrbNZbyrAT+VqERFfa4efeMjMc1CbgLGxeMHIPOYao5oPa/LHy/oFAthaJ FoXkVeDMENRDE7IdpqsREY7l6jVxYABGy6ZxJoZQJRpKFS5vzN9cd4TKh7+hP5eGL9ha i3Gw== 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=ss8AeC6pAuQpqr+W3odwjc58xNkjxV/avvXY18wt01g=; b=cOn1u72wu/cgfpWtCvyDmzbmJ8JgA7tHs/Z7ARP09bN9VcN3YPH23NCHc9P29BPCF7 Kf/dlvxs9ULPPqhoKtsiXeSWdMfTedQVVBlRHcXGos1ogwfplqvULmdn+oaNgbaiqvnS kvTZrZYTBiC2oOYnemux7H645BdAcojAegIST0VoYw8Pa2nsepOPfc9n9/Kw7ZvzkDnf l3LEJNWtkdLjNcHW1j7NSrFTBw/Ib7l9PFnygpWH2Oi7NFRE1LWeqyTz8+HObADDn4Gs ChjuO9XnTMWnvWBoxNXG6b+de5UwIAQr4rtW+LDVFY+txopwTMyyShrwFH1tAxyYEz45 bLsQ== X-Gm-Message-State: AOAM530eAgw1+V/ktvkuGDvYY7Ok9DH1EnRP131yn38BNKkfn97lo8XX m4XLZqeySr6PginwDHhGHf3zDTHIa0EJAA== X-Google-Smtp-Source: ABdhPJxr+Tu6VLVL1z6JgaTrJ71YEAde9B2v8lWz27l8VbIgaP4EyD9aGyv5qGVip1NM2K4L7ilzOw== X-Received: by 2002:a1c:5f45:: with SMTP id t66mr394378wmb.20.1604357454150; Mon, 02 Nov 2020 14:50:54 -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.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 14:50:53 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Nov 2020 22:46:49 +0000 Message-Id: <20201102224649.2563498-3-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 3/3] vaapi_encode_mpeg2: 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" Follow the same pattern as the previous commits for H.264 and H.265. --- libavcodec/vaapi_encode_mpeg2.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c index b8f1c06d0f..df2c62b8e7 100644 --- a/libavcodec/vaapi_encode_mpeg2.c +++ b/libavcodec/vaapi_encode_mpeg2.c @@ -292,17 +292,16 @@ static int vaapi_encode_mpeg2_init_sequence_params(AVCodecContext *avctx) priv->sequence_display_extension.extension_start_code_identifier = MPEG2_EXTENSION_SEQUENCE_DISPLAY; + // Unspecified video format, from table 6-6. sde->video_format = 5; - if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || + + sde->colour_primaries = avctx->color_primaries; + sde->transfer_characteristics = avctx->color_trc; + sde->matrix_coefficients = avctx->colorspace; + sde->colour_description = + avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || avctx->color_trc != AVCOL_TRC_UNSPECIFIED || - avctx->colorspace != AVCOL_SPC_UNSPECIFIED) { - sde->colour_description = 1; - sde->colour_primaries = avctx->color_primaries; - sde->transfer_characteristics = avctx->color_trc; - sde->matrix_coefficients = avctx->colorspace; - } else { - sde->colour_description = 0; - } + avctx->colorspace != AVCOL_SPC_UNSPECIFIED; sde->display_horizontal_size = avctx->width; sde->display_vertical_size = avctx->height;