From patchwork Fri Mar 29 00:33:37 2024 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: 47632 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1699655pzb; Thu, 28 Mar 2024 17:34:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVboguTyWl6hcC63RL9wr7r8Z+et8f33U5T/Q7yFcy/c1RN2ElAXwH27TgcfNIdoA/8HFi4AqeOZScFi9stgRMFVKk68jYdDD6x1w== X-Google-Smtp-Source: AGHT+IFBocqCrAwqX9qeF7HBBUfkX+5d5pb9HpFHVmNJAp0XeBKMyS3oW0Bj5F3zkk9BV4pOGluM X-Received: by 2002:a17:906:27c4:b0:a4e:2e14:f75e with SMTP id k4-20020a17090627c400b00a4e2e14f75emr363028ejc.77.1711672470699; Thu, 28 Mar 2024 17:34:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711672470; cv=none; d=google.com; s=arc-20160816; b=k3lvbJ7a8fJHyDUoGB6uKNOBFjhm1XErAOlZ+83izyWYKZwxQG8dNZn9wYah3YUidt G3Rfx8m4+8wdIbmGbFLKV4C2xhqZ/IRLESw+vxLuzpm24asrUf8umc4jdqbdtVYy43bv VhUa/VXliBKHgS4wllWgVgDTxfbommWVexVf/2pgj0oENr434pmB24HH86bCJgC9LPmZ euGsuWhH19GNA7iQYwl6OohuRtSFR5GmxEv9IxIxAJ+Th2ybtE+zGu0E2GnjYqpjND2C Ju3hXIbgOpGFH9RUjmJISpUrNNTn61pqAA4kmDEweMD0AwnQiDHdUQDl33mLAEEet+p4 xIxA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=f7bh6EsgcjGLIy0i34ftC+OKd3H3Smb3jM9ALLG4Cq4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=0AoRLBZier8kvOltNGk4FmmcvKhCAM4CQYy69Ycjqe7Ibv69Q0UVBGhkzVRE4GxzNn jEVjF9iSjy4bQr0YZ2NGr6FpocI16v6dA4SuyXA5XC4CZx9JLf3sVDno89HfPvnMvyBY nO7cAjZZcFaGTu0GDhRHGPYdmYjaTzbC/16ub46cEb2VOETJgjhvs2VT9SM/LhJbS1Uv ZfJCR7HC4rQsPLV5aQ2yi9SZTPOoWbExSHeLXOLXqeLhriNHJX/gs2WUO72dHUpamIZZ cUgkEEX4FWCLhtYS95WQWVXxbo/5i9XH9BaWGvBhTab4y4/PnM5bAaRwJGEh0OQISP68 7gqg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gMSAnmGM; 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 y14-20020a1709060a8e00b00a46ac2d2e38si1153983ejf.78.2024.03.28.17.34.30; Thu, 28 Mar 2024 17:34:30 -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=20230601 header.b=gMSAnmGM; 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 52AE268D741; Fri, 29 Mar 2024 02:34:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C79F68D73E for ; Fri, 29 Mar 2024 02:33:51 +0200 (EET) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-515b69e8f38so1575537e87.1 for ; Thu, 28 Mar 2024 17:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711672431; x=1712277231; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AiQQfhD4OecWEkn1qQDtRdtmrMZFVWWJX0zHglX08u4=; b=gMSAnmGM2SGxEzcXn8dSJKmcaSJPI3kVORAEkfSR2DVsanPV61bc9jYVCY+nW4mnqB m2LA+FCTqTZFbqtoMhGmRqph/7qSqcs5bVFV3JW6DApD6D70KpYOeDWQsp/8qLNae3d4 uB+An1YtVb3pcK9f5XIaoRcBwbBK3d/Rk07vHiIQPRv92xDXMfnikcH1cp3qoDznjN15 iwiQDuZnjANarY7N9Jii18yRGOJJodihzsYLrgASxIM8eyJqlW++ZKlJ5/koeeSJyzMb U+0x0gY5dE2CqVIo0gulyWPC+GJux8oNZw/MHNmdC63gj1gT8s7tHCic4lwcZHEIr+u+ km0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711672431; x=1712277231; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AiQQfhD4OecWEkn1qQDtRdtmrMZFVWWJX0zHglX08u4=; b=ETn8nvT/fiy9AFR8UmT0s7htNGWIDfAs0Um2KAwKQsXVGLmQQT3t1sxSdEg5Ln6x2A qb+EXv63tLOEx/WbVhTE3kib6+fQMb52RceYbsxViRsud//4n2bIApULj1KhEuYI0YDX guiRnooBbvXEK8fWB+0O+am6HHiqPYCTR+MSv9fFLeezXel/1USaVUuxjSVcgkeYoWPu 7I5YDMgsUp9tMv5qlxF8HvAXZgce1TNaCYNkNwabDRZNCe29vvzVEl1xolwriNoVToyw jYzZklsO6DfUQlN/IzyXxXDy+3nl4hnZNIi40dML7fhdmXtd2JAyjDVuH5kbnlgj9K76 IEVA== X-Gm-Message-State: AOJu0YxTzibOE2H1xaDXAcuVWwFjfgR+E2ERuJ0e90Q00s2VCb1u1X/q ed393A73SkTNsQGcCoPrZnPlxQbnUNhkC+fmo453bqFqGePZIW3xJT3zAZJf X-Received: by 2002:ac2:5b83:0:b0:514:b4ca:f478 with SMTP id o3-20020ac25b83000000b00514b4caf478mr578346lfn.39.1711672430702; Thu, 28 Mar 2024 17:33:50 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id h20-20020a0565123c9400b005132bdbcbc5sm399210lfv.135.2024.03.28.17.33.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 17:33:50 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 02:33:37 +0200 Message-ID: <20240329003343.1099137-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240329003343.1099137-1-jeebjp@gmail.com> References: <20240329003343.1099137-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/libx265: do not arbitrarily limit color values 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: nbSMYbem/5Zh Newer specifications such as H.273 have, and probably will further in the future add new values to these, so - instead of trying to update these limits - we should simply check if the values are not set to the value of "unspecified". This should allow newer avutil values such as IPT-C2 or YCgCo-R variants be passed to x265 itself, which apparently does its own validation further down the line. --- libavcodec/libx265.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index d3e74eaacf..43ab14bfee 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -315,12 +315,9 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || avctx->pix_fmt == AV_PIX_FMT_YUVJ444P; - if ((avctx->color_primaries <= AVCOL_PRI_SMPTE432 && - avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) || - (avctx->color_trc <= AVCOL_TRC_ARIB_STD_B67 && - avctx->color_trc != AVCOL_TRC_UNSPECIFIED) || - (avctx->colorspace <= AVCOL_SPC_ICTCP && - avctx->colorspace != AVCOL_SPC_UNSPECIFIED)) { + if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || + avctx->color_trc != AVCOL_TRC_UNSPECIFIED || + avctx->colorspace != AVCOL_SPC_UNSPECIFIED) { ctx->params->vui.bEnableColorDescriptionPresentFlag = 1;