From patchwork Fri Mar 29 00:33:34 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: 47630 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1699533pzb; Thu, 28 Mar 2024 17:34:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXIK4vGrXn60b9oA3XaTmDpQNcye/5yqVuq2+PAPfA0u3dkg1C+X1RblDPhQEhnlVJqzf7lOw9no+CMeGDAn9DehC+TzzR6A46aig== X-Google-Smtp-Source: AGHT+IEdfF8Su1bcAdiJQmdarZ2Gy9TRaxwtvOKzwFH5HqGvDqoq6yCWqYdEi4EpaSPvTr4/M7D2 X-Received: by 2002:a17:907:96a1:b0:a4d:f27c:bb7 with SMTP id hd33-20020a17090796a100b00a4df27c0bb7mr546738ejc.3.1711672453869; Thu, 28 Mar 2024 17:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711672453; cv=none; d=google.com; s=arc-20160816; b=jGZ0hLsMxFTP8Y+YHBUP+YORUYOtJERtGqIMOl0brzcsQvG1Win0xmDzCcircVNr+o ZEFTwQn8TnAIfyQfgvZYA+CRRI0F/CM2Rwsj7hvfFNQXPrCTw1dWu08rZhy3+Zqtf31C o5FjOi5GlK4ewZS3HeykM6fjg0JLhnGN2gizVDv+BOCHZ7YNIK23b7alqnxdR5X7lvys pH7DwV2lqhHXIHo4/2zbrmqBJWBXFpVeFL/uYnjRtPfKkmvVVETNcAnamZVsaDPuxGB2 BPs5460x1TaxZtZwh1wNDXQODstTf+0oGqREZPAT3pLPbgYLgpYgbNaHhE7/WPsNEAZl LcSQ== 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=1jz7D3hOaN4bDQIz2aVqDv0ci5GM2ae5SjWFW4JU7Xs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=zOXbGC4T84zkmCVRfpShQ5d9r6dZ081na9T1/nSPi37FER/VBZADfw8x/Z3GhHBFtE Nvwz6gJdIDhN3fXZro+iEMLHvCHX1ckZqDrdyWiN7Zh1ZqmHH6SHkLtlM7Oq2KFAENNY eoZksEE/TeL9yuBk6HjAsz3FK1Hz24gxcn83EjQRAEo9s/5mLmSz4Qd1w5NUbt1YsGRu INDnkTa+VjRMs0h66pqWJpKHkSC/J0EqHRjIkmPsnHx5GwHRMEmW5Z7fa40jNRRMgybB qbiky7lsFRspQIGISFEm6O/DKX2KH+RO8dUl2kd2PR2lCQAk1PGsIGhjlXAJslnADmx9 oALg==; 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=lZURqB2k; 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 sd13-20020a170906ce2d00b00a4e2871fc8bsi715806ejb.817.2024.03.28.17.34.13; Thu, 28 Mar 2024 17:34:13 -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=lZURqB2k; 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 BA87F68D752; Fri, 29 Mar 2024 02:33:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDDF068D741 for ; Fri, 29 Mar 2024 02:33:50 +0200 (EET) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-515c198e835so1708115e87.3 for ; Thu, 28 Mar 2024 17:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711672430; x=1712277230; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=/36qN0h8vcCL8rTQj6Xhrj62QaNAG3FOYvDVa0zDDT0=; b=lZURqB2k0udO1O4C6Vxm8d27fDM3vBvmKIVQNR8mlv+hN7hl3JF5Z4I1QsWgV8Z9Ky F37WbXq74FFAXlVtIip0RGeeRTNhxi2H+r9YT1VJxfC57lEydg+9CYGthkVHickXwtuR cfeG8NK3u1r+eXnbX+klPGGnKsxV4/7f/uBhIew6vZ+pBIW5SS3Iq8XEA8Qy66Y7bj+6 Y+u33v7d7aB6i9wZGxl9e8grXJFs5mb6UKbXufMDV6+tgl0jlqcSqN16D4JpqoQ/iMn1 yRSo3axqzeDtGnH0+3+3xfQYXVi+d0xFd11g1gE0O4MmRZ4GDdAOYyIO8cuaR4oDOf3d wOBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711672430; x=1712277230; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/36qN0h8vcCL8rTQj6Xhrj62QaNAG3FOYvDVa0zDDT0=; b=V8R++tXciHYO1orF4skuc3BhqWxTq51dHJ24CnoWj78NVa0OYGOB1CAE1LaPqcKYRf UcH1XZP0H4XoUkt7c+GP7pHSYbSPVBNJo1rOpuJgFBzbbmdDz8aQstkq/G5uNlqq7h38 X6UFvo2cpEL9ndHvnf5PsvsTfNq9n8IuQquwOIMpbOFraQtKl5/NnUAEj2Q3+GKd/Ixr 4+xsuNaNWwZnlK6DyaAc6xbfoLezgiPIRWAKxbWYY0PoC+os7pEdfEggPSvsN5rpjbed EEJJJeJ2mgC96FzRbDXzbqXMsJzec7FTQlySvPAbmTtH34VVkDcW+0wWBXQ7ucWoFR9B H1mA== X-Gm-Message-State: AOJu0YyS9+XbTTotOE6CUBaTzWh3OBTNLpCFRMeOBFl/geHSLsAI3qlT 0tJQE/NTfxnXZg7xP93qCf7cQElSltr/5ZCIR2qcoW1xDRMK+ZhFGbQBH2n/ X-Received: by 2002:a05:6512:1d2:b0:515:cedb:a512 with SMTP id f18-20020a05651201d200b00515cedba512mr358854lfp.58.1711672429471; Thu, 28 Mar 2024 17:33:49 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 17:33:49 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 02:33:34 +0200 Message-ID: <20240329003343.1099137-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avutil/pix{desc, fmt}: add new matrix coefficients from H.273 v3 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: JV/bN77odeR0 * SMPTE ST 2128 IPT-C2 defines the coefficients utilized in DoVi Profile 5. Profile 5 can thus now be represented in VUI as {AVCOL_RANGE_JPEG, AVCOL_PRI_BT2020, AVCOL_TRC_SMPTE2084, AVCOL_SPC_IPT_C2, AVCHROMA_LOC_LEFT} (although other chroma sample locations are allowed). AVCOL_TRC_SMPTE2084 should in this case be interpreted as 'PQ with reshaping'. * YCgCo-Re and YCgCo-Ro define the bitexact YCgCo-R, where the number of bits added to a source RGB bit depth is 2 (i.e., even) and 1 (i.e., odd), respectively. --- doc/APIchanges | 4 ++++ libavutil/pixdesc.c | 3 +++ libavutil/pixfmt.h | 3 +++ libavutil/version.h | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index aa102b4925..296d87d8fb 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-03-27 - xxxxxxxxxx - lavu 59.11.100 - pixfmt.h + Add AVCOL_SPC_IPT_C2, AVCOL_SPC_YCGCO_RE and AVCOL_SPC_YCGCO_RO + to map new matrix coefficients defined by H.273 v3. + 2024-03-27 - xxxxxxxxxx - lavu 59.10.100 - frame.h Add AVSideDataDescriptor, enum AVSideDataProps, and av_frame_side_data_desc(). diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 9c708520b1..1c0bcf2232 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2854,6 +2854,9 @@ static const char * const color_space_names[] = { [AVCOL_SPC_CHROMA_DERIVED_NCL] = "chroma-derived-nc", [AVCOL_SPC_CHROMA_DERIVED_CL] = "chroma-derived-c", [AVCOL_SPC_ICTCP] = "ictcp", + [AVCOL_SPC_IPT_C2] = "ipt-c2", + [AVCOL_SPC_YCGCO_RE] = "ycgco-re", + [AVCOL_SPC_YCGCO_RO] = "ycgco-ro", }; static const char * const chroma_location_names[] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 4aa20e4e58..430118d3e1 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -623,6 +623,9 @@ enum AVColorSpace { AVCOL_SPC_CHROMA_DERIVED_NCL = 12, ///< Chromaticity-derived non-constant luminance system AVCOL_SPC_CHROMA_DERIVED_CL = 13, ///< Chromaticity-derived constant luminance system AVCOL_SPC_ICTCP = 14, ///< ITU-R BT.2100-0, ICtCp + AVCOL_SPC_IPT_C2 = 15, ///< SMPTE ST 2128 + AVCOL_SPC_YCGCO_RE = 16, ///< YCgCo-R, even addition of bits + AVCOL_SPC_YCGCO_RO = 17, ///< YCgCo-R, odd addition of bits AVCOL_SPC_NB ///< Not part of ABI }; diff --git a/libavutil/version.h b/libavutil/version.h index 8774ed4d1a..d0cc34f43a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 10 +#define LIBAVUTIL_VERSION_MINOR 11 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ From patchwork Fri Mar 29 00:33:35 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: 47629 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1699455pzb; Thu, 28 Mar 2024 17:34:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXz5wVJGaXhK59ywhba8CdO1IkiLtFWLqyz5Ex8Suus91YIe6pq7KXKJit9pWyuR9DEoNzDs1OGxlWI1ILoAUH3cVLasZ4CRqUINw== X-Google-Smtp-Source: AGHT+IGk0UterhVJNRg5iXDjycZqXIhpBDHjUlWDLMpNJQILGg1Cm/WCFtu0zx1yBnxN0AaCwIWL X-Received: by 2002:a05:6402:1ed4:b0:566:13a2:3008 with SMTP id g20-20020a0564021ed400b0056613a23008mr548973edg.6.1711672442958; Thu, 28 Mar 2024 17:34:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711672442; cv=none; d=google.com; s=arc-20160816; b=WkuBwIN2j5Y1sM951SEtNiS/GYzB5uWGg9CKwFRZk4FX16FdeLF+PeCs4zA8Of8bDi 3HmboatBos7LnWneVZX+e2G+QLpxQaKQ1nJNN5bcKXMpsKPe3vDacktcg/Y9Y5OAJVKO FvA7SGlCxwDOVuEakgna3SJWeRg8yf1GYHPjMxu0ZUufEiSZPmqRvSFBbW/q7xLvCDkv GdShxcS97FgscufizvU12oRJfMua1jH7TUSA6GDnPZ3grpQYJLKLwAvvZPfGV+JbcdIS YOdIknxE47ayuNo9bqPjhrtgzd/3vTH8Jp3sXCryaDPzfC4O5btckepmSqg0i064pvT4 UAXw== 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=esoP5oNBGhv7ENBB8VWs5X0QhMpWYT89iq74vhf+WuE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=KuycBEb7cAeEEQdO1Fbin7+Kt4lDu7ngapBpI1n5rrjhx/KiuCkOF0lgwjOi6cPQD0 AXbCeQ0EwsWBmUJPaoGPvi7Vp5yiV44Gu15gmY7rqmg+EkUYPKHMR+FQcoy9GTxBfLu4 jm/70AzdGcaeDXMiNkKVJbviLk2O5VEmtgBNFpUI1kb2/dazkKEu2JMcWW5/c3P+utuC 8Nztruhg3y4q1emCvVjyGjHAcxkgrwYCw2tsltDjy/6kpvRYlyN8S4x2AkbhEjFlBeP4 wO7BW5Jvul2sQZ3FVcE4bLgGc6P6KJjSksRp8g/okwybWHwgXPnSY1hmRJdIN/FiRwT7 Za+w==; 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=GprxhM+L; 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 x15-20020a05640226cf00b0056bea24ea94si1276777edd.363.2024.03.28.17.34.02; Thu, 28 Mar 2024 17:34:02 -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=GprxhM+L; 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 769E968D74E; Fri, 29 Mar 2024 02:33:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC45268D73E for ; Fri, 29 Mar 2024 02:33:50 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-515c3eeea5dso1552096e87.1 for ; Thu, 28 Mar 2024 17:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711672430; x=1712277230; 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=Qldj8Sr76IFM2gOMFkOGguDi9CpHZEM84gTx6nPSJew=; b=GprxhM+LEUGysAoMP2DQe+kagKeBKbs+hUYua1Nfco3tW8cfhhjNV2WY5jgJ4aDM0P /ZztiV8/e+bPRZbTUMw9c/qWjZQuAjecjAH7dxcD6wn+iDOIpOoMs7XuhicsacqVd+Ot 8OpKakbJayi986hIBkwRR+UGQPzmEKKWN5aSxHktkJjEDRUkXAHdVqRc74RkhAL6MdHn w+Fx4Ap8hoZt+QFrekoKoVc/HMD87J18JAW+VqDE3sM7crtquEy4GtzK5g2AUm7iA/Xb iTPEPYV5I4+JgM0+6YhAFHAWl/N61vEI/PgWT1KdD18Gt1FL+8rGldgo8N1lQ8tI5jnF ONQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711672430; x=1712277230; 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=Qldj8Sr76IFM2gOMFkOGguDi9CpHZEM84gTx6nPSJew=; b=qcp+1K5aef6aidSoXokpx/2gFR1i8iXMN4DaQaEmQd4xp5kfT/2c5zH+AcTZEqvyJq V3c0M9pPFWrCUmugXat6p4/xuwEAihS8pfLUxHT++h9NN2jxniVXTiB7f1LH0TTyQvgC fdNBrv0wlYzt25BNpXHwZuxQpP2nGDUbWjWqL3O1Z1unJ418nc8gEez/0VROk3H2P7Sd lSSRFKmnl3+LQlYnVfsN8g5a/wxsGn6I5H33tnXMVrmw+nyYN1T4yvpKlbvnYTwVjPyG YCtaa6MyropvO0Bd4xhdwez3hSI/g2nZuMeKEG72iSFQXCpl2FvbosLx0qAZmaKYnxzC RUpA== X-Gm-Message-State: AOJu0YxqExTbGwGlAeppgsmhCYE3p+BcM5P/qmb5g9xuHYAaWBwCRanx /iHETbYFV/NVEcTRDVsizVsS/9nJRyPxjITWy7l72RlRuQMjaTSdYNIv1XcQ X-Received: by 2002:ac2:4a73:0:b0:513:c876:c80a with SMTP id q19-20020ac24a73000000b00513c876c80amr575836lfp.34.1711672429867; Thu, 28 Mar 2024 17:33:49 -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.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 17:33:49 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 02:33:35 +0200 Message-ID: <20240329003343.1099137-2-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 2/4] avcodec/options_table: map IPT-C2, YCgCo-R variants in colorspace 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: oKEUNu0EXuz1 --- libavcodec/options_table.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 7a2ef3474e..7a70fa7b6c 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -331,8 +331,11 @@ static const AVOption avcodec_options[] = { {"chroma-derived-nc", "Chroma-derived NCL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_CHROMA_DERIVED_NCL }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, {"chroma-derived-c", "Chroma-derived CL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_CHROMA_DERIVED_CL }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, {"ictcp", "ICtCp", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_ICTCP }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, +{"ipt-c2", "IPT-C2", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_IPT_C2 }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, {"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, {"ycocg", "YCGCO", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCGCO }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, +{"ycgco-re", "YCgCo-R, even add.", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCGCO_RE }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, +{"ycgco-ro", "YCgCo-R, odd add.", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCGCO_RO }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, {"bt2020_ncl", "BT.2020 NCL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT2020_NCL }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, {"bt2020_cl", "BT.2020 CL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT2020_CL }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"}, {"color_range", "color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, INT_MAX, V|E|D, .unit = "color_range_type"}, From patchwork Fri Mar 29 00:33:36 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: 47631 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1699602pzb; Thu, 28 Mar 2024 17:34:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4aSfg6lKTgLQcb2CDts95k/8vejudFEnCE4sv0fXeToZbR3xiE5i/0cMbq8s7QL6QwmgabOuPrny2ggmFe0PMT/qAmYWzVEr01A== X-Google-Smtp-Source: AGHT+IHAr30D71FAEmCsWYevecNXHgL5k57t12OWbSlAsVzVzS1qugP9pmWUEDiPiwqZfwwgax+Y X-Received: by 2002:a17:906:130f:b0:a4e:d1b:ef9e with SMTP id w15-20020a170906130f00b00a4e0d1bef9emr826089ejb.4.1711672462183; Thu, 28 Mar 2024 17:34:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711672462; cv=none; d=google.com; s=arc-20160816; b=vn1zd5x5QFDyMy3VVmdxdKg3FKWm4wn5DjaSX4qD1nW7AFnhvjHJrSJjwXJbO6luaI IdKD0/BBMtj5S8t+pl6C3rwP/fWaNd/ais6Q74FjygM7Bh7xCqBPUNMtM0NwzQ+0eknM F1Jwx1VXENTiZzS7bPSR05CFEY5PHxEdptzygEaInO56xxsqvJEkslH5VwZa/veOXH8U iPIsTtU5HAtXJ1hYcVAUfH6/FaTelOz9Yrv5h/LIQ205tsrSRPtQB9SLNhmFVUO2494L FKimDCNTWMP+yp/sQcEmIzj+qBiQ8DnchaAiEendGHZ+UUyAEBU/0YGJhHLEFrzZ12PD Jy0Q== 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=cBuZpcIKCPM0+ypMUQKn4wXnHX2UVUwbtmmxts+f08Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=f+hQJ0w4ng/q9jm+NMppW1dAa9xG4Klj4/mF/M+Y4PILsb7Jg5cdpHCmgdR0vZOGFf GwfEG5x+lWfyt3HfvM5GORSd0S/WGas6Rz1bwdHqfLl1bWbPgkdBU1oOoVzv8Xzg+mmU QtM7gOe9a3jNi9vDw7H33dukLnK0Z4GbbD/2oh0FJcnnmv9KgJkpD2LXzjEFmCy9hgeV /WziSF0QP0UZg24MQK7Gw6IjTTd+Pg4uD1I5fuq3ZunxsZ01+qFNMw+ow2IcBEpxpbQf i5P7zAIDQ/AaDIZEQs2R6Izot0k5BolU2SfoX46eAkTxXxMdpyKFIkrYaNCr1sWBKdiK maag==; 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=gTJ5Djym; 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 sa5-20020a1709076d0500b00a4df3e5e6b1si1285591ejc.802.2024.03.28.17.34.21; Thu, 28 Mar 2024 17:34:22 -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=gTJ5Djym; 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 E094B68D758; Fri, 29 Mar 2024 02:34:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36D3B68D73E for ; Fri, 29 Mar 2024 02:33:51 +0200 (EET) Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2d48f03a8bbso22134021fa.0 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=1711672430; x=1712277230; 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=FUkOqR1HkZwxsTVocFApvrCsjsLHUDJ1IGG9zYEaxqQ=; b=gTJ5DjymgYp0QLYB7M285tg4ekTO4z6gax4NpJwFqp8fiDCgXcTM8qqxzkS5DqCdmQ RwpxABlqf8JRuwfyGWxUY48nT0J5OnGcoKwXrsO9eXJrc5L3WeLJm4NCZ4G0hMId7l6K N1ABmvH4j8PdB/u5C8Fm00Phj3x8An29nY2T4uC/ZVJbGRXMvWHeXquWpkxQnDly1Utr fSR0IeJaEtMSM0RBQOFyH94nRt2aKJwZUk6jnJtKb7+fdNX3ig0DpNUmsUz5fIEJuJD5 CyM2y9BXzxnhlrE8tNdQJoNw5XEU9LgBSybC0UywUas9yCiIezMgohkDeHvxmpruUu7s Lyfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711672430; x=1712277230; 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=FUkOqR1HkZwxsTVocFApvrCsjsLHUDJ1IGG9zYEaxqQ=; b=Lb4UdDWeYZmffweYEchm0BDHgUVKs4XyzXa6QtG47S7Q2ILjOhP48lHTYF4Q+SPFiF Zvww9CNBtqN8Pdo+LXCWeRl437m88TFz9i7ij0mFN4yTUVBLHD8CZNbbMo/O/N+QofqQ uWTSR9kLXbkPIqN2l3qJpziwyNAypgcrW050QMBhwNT+9sKl1j1LISkw+pRd+tEqAei0 zA16Y5YwBwsc78+7Gys8rDzIj2vMpBMCq3kAzcMU/OWvdSL9C77NqasvH3DlxB6mvmrv 3Pa58ovQAAUZ0NxLLV8r8uxqhh6eLXghNr95IrQ6Ac6cKbt/vN7dSqhgMuLsOoiuI88H zMnA== X-Gm-Message-State: AOJu0YzYIEkXUoHmKn9Sh2HhFjJRPENUhM70zyWe3UMNzloeQcAhg8h6 o1cc2yRUdvpjrI+TJjEeFh4COyKgZJTOkg2fpi7Wao6dCr55VIMYKVLAAe9Y X-Received: by 2002:a05:6512:2fc:b0:513:c4b5:aff2 with SMTP id m28-20020a05651202fc00b00513c4b5aff2mr1382064lfq.6.1711672430263; 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.49 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:36 +0200 Message-ID: <20240329003343.1099137-3-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 3/4] avfilter/{buffersrc, vf_setparams}: map IPT-C2, YCgCo-R variants 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: qdMUJ0FPLOA1 --- libavfilter/buffersrc.c | 3 +++ libavfilter/vf_setparams.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index ddcd403785..680eedf25b 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -337,12 +337,15 @@ static const AVOption buffer_options[] = { { "smpte170m", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_SMPTE170M}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "smpte240m", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_SMPTE240M}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "ycgco", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_YCGCO}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, + { "ycgco-re", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_YCGCO_RE}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, + { "ycgco-ro", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_YCGCO_RO}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "bt2020nc", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_BT2020_NCL}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "bt2020c", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_BT2020_CL}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "smpte2085", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_SMPTE2085}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "chroma-derived-nc", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_CHROMA_DERIVED_NCL},INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "chroma-derived-c", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_CHROMA_DERIVED_CL}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "ictcp", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_ICTCP}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, + { "ipt-c2", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_IPT_C2}, INT_MIN, INT_MAX, V, .unit = "colorspace"}, { "range", "select color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64=AVCOL_RANGE_UNSPECIFIED}, 0, AVCOL_RANGE_NB-1, V, .unit = "range"}, { "unspecified", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_UNSPECIFIED}, 0, 0, V, .unit = "range"}, { "unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_UNSPECIFIED}, 0, 0, V, .unit = "range"}, diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c index c96f4d314b..b7da8eb54b 100644 --- a/libavfilter/vf_setparams.c +++ b/libavfilter/vf_setparams.c @@ -110,12 +110,15 @@ static const AVOption setparams_options[] = { {"smpte170m", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_SMPTE170M}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {"smpte240m", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_SMPTE240M}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {"ycgco", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_YCGCO}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, + {"ycgco-re", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_YCGCO_RE}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, + {"ycgco-ro", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_YCGCO_RO}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {"bt2020nc", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_BT2020_NCL}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {"bt2020c", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_BT2020_CL}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {"smpte2085", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_SMPTE2085}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {"chroma-derived-nc", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_CHROMA_DERIVED_NCL},INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {"chroma-derived-c", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_CHROMA_DERIVED_CL}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {"ictcp", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_ICTCP}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, + {"ipt-c2", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_SPC_IPT_C2}, INT_MIN, INT_MAX, FLAGS, .unit = "colorspace"}, {NULL} }; 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;