From patchwork Sun Apr 26 03:02:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 19247 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 771D6449D6A for ; Sun, 26 Apr 2020 06:04:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C94268C577; Sun, 26 Apr 2020 06:04:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE13B68C576 for ; Sun, 26 Apr 2020 06:04:06 +0300 (EEST) IronPort-SDR: ThGnB8HoFnfBw1Ews6sn1Z2XiWi+NJnpCB97TyYKhIiSJc15UPROZHqGICoOwYIcgqHMwiKp6q vxD0cXXVv7Zw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2020 20:03:59 -0700 IronPort-SDR: Fv0IHtutOaSgnuOxlnzHLvZi/fiVjAJjOIVai/hA2S0uWQLYuKLIlsFleSFw+sxiRplPcS/SZM vvnYNms92T6A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,318,1583222400"; d="scan'208";a="403833194" Received: from t.sh.intel.com ([10.239.13.9]) by orsmga004.jf.intel.com with ESMTP; 25 Apr 2020 20:03:58 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 11:02:56 +0800 Message-Id: <1587870176-1441-2-git-send-email-fei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587870176-1441-1-git-send-email-fei.w.wang@intel.com> References: <1587870176-1441-1-git-send-email-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavfi/vaapi: add more factors when using VAProcColorStandardExplicit 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 Cc: Fei Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use VAProcColorStandardExplicit only if the color properties all specificed. Signed-off-by: Fei Wang --- libavfilter/vaapi_vpp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c index 6ffc09d..e1d3373 100644 --- a/libavfilter/vaapi_vpp.c +++ b/libavfilter/vaapi_vpp.c @@ -278,10 +278,14 @@ static void vaapi_vpp_fill_colour_standard(VAAPIColourProperties *props, // use them and avoid doing any mapping. (The driver may not support // some particular code point, but it still has enough information to // make a better fallback choice than we do in that case.) - for (i = 0; i < nb_vacs; i++) { - if (vacs[i] == VAProcColorStandardExplicit) { - props->va_color_standard = VAProcColorStandardExplicit; - return; + if ((props->colorspace != AVCOL_SPC_UNSPECIFIED) && + (props->color_trc != AVCOL_TRC_UNSPECIFIED) && + (props->color_primaries != AVCOL_PRI_UNSPECIFIED)) { + for (i = 0; i < nb_vacs; i++) { + if (vacs[i] == VAProcColorStandardExplicit) { + props->va_color_standard = VAProcColorStandardExplicit; + return; + } } } #endif