From patchwork Sun Aug 22 20:55:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 29728 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1520030iov; Sun, 22 Aug 2021 13:56:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQr0vZoASN5/RZ6nFMRyaBPG/XqHEDrSOm4GMsXDAdOTEbKb2CdIfRn/mihYHe7zneCnzU X-Received: by 2002:a05:6402:2302:: with SMTP id l2mr15963447eda.13.1629665761221; Sun, 22 Aug 2021 13:56:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629665761; cv=none; d=google.com; s=arc-20160816; b=yd6sK/Hy5D72NCQmuBEkH8e0pzZ0kW8rcpZY81GfAGcdPAhImeCvBTXNXgCpNVKz9S 2ZwrYfnLMT9kk88KCA2vdvo0EWOe5O2scDK6LwYy4R9h8ErBaLJY1Obe129i4WcmApri ZojhgGNXtiBxjcOy1dG55NvtJjJhVvP4LgR3aQYKbYu1TVOh/qwePcPbZxkC1AV0Yj9U T7hEFttpnhTTjHf2fHeTkX+92MlFTT3Hl5LEVh3sPG0mRiteZqfUsncyVPnW/HLhUjxa TufZw3DykN+HsaELtB6l06Y+9hrknTW7jd5k2zlH1K0kUoEjQOq+Rvz3MdS9viBExMPT JQSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=HAHqz/YPGVUx4nJRwBs2hQh9TCotfzxq9MERyPlLo4I=; b=yFOBt7eP6VpLzB1/CaENWU0im7OplILpglVCSutkS4zSuns6biTVVXk7HJ7aSiKqA4 1LyswJwszk2LBXySiOaDDPFpaEUa/2gp5BoBzBTv2c8ecdYRkiNolsvLkSPoyWMosRdz nHk5tWALKJ/MFO9SC1IRyR49/panenZC/VkClDh4eD5mMYKhjO5hKYdHWE0mq9FihSlj bGAN9QtN7DGen2N3a0CCbZ2s7qKPlmCWtYqm7MTMNOh+h4/UJcfvBTNbVQAiSr/Dhxm9 VJNESe51h5/qOYy1c+UjhzGbPU82bjRGXjy8uEuphY/A+MJeN5BJ0ZakuMGdykdsOBY8 yWYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KFFdyT6V; 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=QUARANTINE 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 jr1si12469538ejb.574.2021.08.22.13.56.00; Sun, 22 Aug 2021 13:56:01 -0700 (PDT) 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=KFFdyT6V; 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=QUARANTINE 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 2EF5E689F4F; Sun, 22 Aug 2021 23:55:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50E5F680749 for ; Sun, 22 Aug 2021 23:55:50 +0300 (EEST) Received: by mail-lf1-f42.google.com with SMTP id x27so33515701lfu.5 for ; Sun, 22 Aug 2021 13:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=JpwU+2QaWYNzmkqHoeemUywA91NWJ6aVMjP+1RFRAoU=; b=KFFdyT6VUSGBPr4UqHBC72RJq0sjkNeiVCbjN6qhxp7HG20VSXWcJoCZESAUZxhSI/ MzHTb7/fWcrMy2D7Z63ttMQQnbkUVE7rtHdHufMt2dkjGpJLOVAFdsiAxMxGuiz5BKHu PawHMp+uFjugfV5MqJuy8SQRMIhE0L98e76P2WDF9ZbnNhqJ3a008X4lBMzDJHicD1sI aS3GXo5EINRT7hvTXR5z14gOG9hsV/hUN/G4e3ybMiw0URqQTl9XzQmtSFxdAwT6qf5D 65Y0P5+suWwL4hNW6DgeE3fNadHKTTkYHK8fdZw1Q+aCzTQwGMTqON17vPq1+tB6WBkV DbCA== 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=JpwU+2QaWYNzmkqHoeemUywA91NWJ6aVMjP+1RFRAoU=; b=ZtyQ28014Zo8lWgFLRoDslV0m7E8yZe74qFjQdW5zfR4cwfIHN7k6jRiAsLOVgYb0a 6BPMcuclOt8hDv2DUWFIJL+Y6BE8phGnyjV12cFi4JjeRZBEXheOTDhRgBB8c4a7MjSP QEwL7Mj341rIC3gfe/NB3XFkgOxE4SBm6H0dm339BkxMuZ7BYGUyGdtQ/C0FzD8Xh9jh LngjumVOowZPz3uHH5tAY+S0UKd0ReT/+P+gtb5yMNzc5mWYTFXPmsOwzcip1bwTqrnO dMDnTCmP4cIKIZfDnSiWLAkeHFkPMzdshIMfimR+o/TEZ50m2V8LEgMZKGfzB7BxDJC0 7fKA== X-Gm-Message-State: AOAM533coPvV6o84gsL0wlbe9GkrESWVpS4YUoHsiOt4yvDkGti2KVLZ ZiGEjNhnFjxMdq3rHkqn/+VZPzgGP8w= X-Received: by 2002:ac2:5dd3:: with SMTP id x19mr22667381lfq.4.1629665748903; Sun, 22 Aug 2021 13:55:48 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id u2sm1273584lfd.43.2021.08.22.13.55.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Aug 2021 13:55:48 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 23:55:42 +0300 Message-Id: <20210822205542.16631-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_scale: reset color matrix in case of identity & non-RGB X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: iSRygiJUP1Y/ Fixes passing through mismatching metadata from the input side when RGB input (from f.ex. H.264 or HEVC) gets converted to YCbCr. Fixes #9132 --- libavfilter/vf_scale.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index ce39217515..7ca833bbb1 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -738,6 +738,15 @@ scale: out->width = outlink->w; out->height = outlink->h; + // Sanity check: If we've got the RGB/XYZ (identity) matrix configured, and + // the output is no longer RGB, unset the matrix. + // In theory this should be in swscale itself as the AVFrame + // based API gets in, so that not every swscale API user has + // to go through duplicating such sanity checks. + if (out->colorspace == AVCOL_SPC_RGB && + !(av_pix_fmt_desc_get(out->format)->flags & AV_PIX_FMT_FLAG_RGB)) + out->colorspace = AVCOL_SPC_UNSPECIFIED; + if (scale->output_is_pal) avpriv_set_systematic_pal2((uint32_t*)out->data[1], outlink->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : outlink->format);