From patchwork Mon Nov 2 22:46:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 23341 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 87268447D27 for ; Tue, 3 Nov 2020 00:59:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 69BEF68AEBC; Tue, 3 Nov 2020 00:59:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 733DF6801B3 for ; Tue, 3 Nov 2020 00:59:12 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id p19so2208860wmg.0 for ; Mon, 02 Nov 2020 14:59:12 -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:mime-version :content-transfer-encoding; bh=xLqobk2RYjtNoPGuTtez7D4g4ywwZhurnLHA+OzVKm8=; b=kxtGmY1kooZH4PGGohavwajUrgEwd2dk3ITipWqvHg2k/VUM48IL6ERnsVXUyO29EW fl/AD3XrVMgTUFibKz+grg9a0eQnJVftuU56AaRQd1T8pt3iaU7Yy/pxczWWNPDUJrLF JExHrxtC3C80+kK1TyPEHO9K29Vojgblga9EIj0sA2ELZmJzdoYlfph1+hNDR1gmBZPu kzMGajwenkuQPs385M6DDrZzFyX9869j0Yw7ISZrueJtiZJeIc06IWTRcFqT1r3Ie6j9 b8+d977FDJcqwuKSu7d0hWqJ6EALlgroP1U9TpihTDIkr937Xas8T6ahTfKJ1oQ3gaPa 8W8Q== 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:mime-version :content-transfer-encoding; bh=xLqobk2RYjtNoPGuTtez7D4g4ywwZhurnLHA+OzVKm8=; b=jIbwmrAzVmcsPaui2cIxd8gOFo6QYfUum/98uc1xcGObWQ7f+Zf5Gl6M3JxFQytqhI Wd2a10XJub6qdjn+5d2/UOd12e2Dso6GS7kbjvqjMvmpYY79rzHKilSTcW/WkG5gMG4F JM0jLb7xLJYSe4GDtxIXPXsBCnNhvhMJrsTlRaxP+RSGs6pAZXIv9Njfxar5z6Sbj7x6 NWAOXGIy5XT5fRNodfmWDb+qoLYAiioUn244l3msGF1PfOi9QwTRBDcZ5OP++zW2ZilI CEKbxjJZaxdp+qU2r4NLO8IjxBihqAM5r4B10EomeCwILogRLt9C0nlL+Jz/ccUqmjXD Obyw== X-Gm-Message-State: AOAM530lpuhveERHXGmmkJNWIZ6EttvcmfVS1lMr8qO+nIBmWM1NJoIQ WwN1tKNJxzpyOdBzFPND2ZrMtyZfxt8C7w== X-Google-Smtp-Source: ABdhPJwB75z2i4ipACml4VGLklhXnTGiu3qJGNSuLnd54L3yiKcAgSSvYGzwanr837vG/FJx0o2iHQ== X-Received: by 2002:a1c:2ed3:: with SMTP id u202mr356392wmu.85.1604357451550; Mon, 02 Nov 2020 14:50:51 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 14:50:50 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Nov 2020 22:46:47 +0000 Message-Id: <20201102224649.2563498-1-sw@jkqxz.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] vaapi_encode_h264: 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" The properties should always be set; only the presence flags want to be conditional. Fixes #8959. Tested-By: Xu, Yefeng --- libavcodec/vaapi_encode_h264.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 5e1683e851..e52a0e37a4 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -411,30 +411,20 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->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. + sps->vui.video_format = 5; + sps->vui.video_full_range_flag = + avctx->color_range == AVCOL_RANGE_JPEG; + sps->vui.colour_primaries = avctx->color_primaries; + sps->vui.transfer_characteristics = avctx->color_trc; + sps->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) + sps->vui.colour_description_present_flag = 1; + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED || + sps->vui.colour_description_present_flag) sps->vui.video_signal_type_present_flag = 1; - sps->vui.video_format = 5; // Unspecified. - sps->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) { - sps->vui.colour_description_present_flag = 1; - sps->vui.colour_primaries = avctx->color_primaries; - sps->vui.transfer_characteristics = avctx->color_trc; - sps->vui.matrix_coefficients = avctx->colorspace; - } - } else { - sps->vui.video_format = 5; - sps->vui.video_full_range_flag = 0; - sps->vui.colour_primaries = avctx->color_primaries; - sps->vui.transfer_characteristics = avctx->color_trc; - sps->vui.matrix_coefficients = avctx->colorspace; - } if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) { sps->vui.chroma_loc_info_present_flag = 1; 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; 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;