From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A6E4C4BB49 for ; Sun, 28 Dec 2025 18:35:27 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'+/9jcq2go/SoK0sPPygThyw+fv7wKgiE+FzAwLv+ayU=', expected b'izycDEA/bz3Xv2APLhrnyTCwlLFFhS3e+DaWcVOywRM=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766946915; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=+/9jcq2go/SoK0sPPygThyw+fv7wKgiE+FzAwLv+ayU=; b=ceGhqYvNNLPuuh5rDc7G9poEBgNywiiJ7GwBoUcqWtCoXV8/5ACIBsPpCap0dhNlk8VC3 TILNVztdCd/rHt0E5iBrB/06enqrKgreq1xQm9fVJAWSPvAXUvZudP0iXowBYynefQqIkrb ohPib1CEzo8ZeSZCrnzmI2q2SLXwyMlGaPorzFfD1WjGc6iGlOZdFS++yMrgNQ4YaCQaE46 he0tbAJRWFzOuBJ8hJMU/lT0qiP2HfOq3rAKpRyv8cHfSNKwoCT94Ubg6CwR0nuYE299Tdu 1iFXwmYJJQhPaZQEKnIiREoVSfjrfwLwBz8kM7XUJDKqFeJUtlSn4uh1Eswg== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 10812690C0D; Sun, 28 Dec 2025 20:35:15 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1766946897; b=i0PS4t5/fwFV32s3mdXhMpHL7cnVC+huMgRDHnfHup3N4dvk5OZY+rwPg5NrB6VmcWef2 2QVn/xD9WE5mg7LldIf5FeiUBoQHwGK1R4SvnnKNzCAD3B5qY3Y+g9kBkdc9LxzmBAk8TNS mdsf3Wfisn4DUWiPQZyDM8JDBnK5JFkrTQ47tW02+NXVAkClukMaruJseRLdRzaU8zluxvw valW4nZIfnbNpa4+e58IqolSkib2TC2UTe4F/wwOlisT1q42wuPpjm09yxAxULuJ5QLH0bw jvqj3ZMTBEfd8rrjjZW4KqiPQ6J/pvhKaNvwSBfCYa+bgqb3GQ7+qjtZwF9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1766946897; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=BwEySzyJfiixp2BA4OvCzZv8Y/Do32dDdgkBTkW1GTY=; b=S/3/4fGNfJc8E1fYGLNIhgDhLLxZR964Xx0A9ClHRMjUf5UyVuUsk5W5YqjaYff0zmxKp k4RjKDlqpqd8taa7Pe+EWEVvNhoySF+PI5tlsLhWoCcurp+dwDMR9PrzmJ6H3yiRhLPXcjq Z9AxKTUkv4N8GzIU8ToBTiT/rlvlByVgRlg6OmetTyunrhoMWl+lsxaWJ2vg8ge7KoUfDtR btnS6H9Y4UC/mfte1kcukGH0J0U7FouxP8+qJMnNGBsc+qWOTsqDydDskmB2AE+sPk9jv+/ Lk75085xxpDluj5JfbOIOiuQendolYlHtJkWsYC4pggDhk5QEwoQIpz+KEVQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766946888; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=izycDEA/bz3Xv2APLhrnyTCwlLFFhS3e+DaWcVOywRM=; b=aSMC/+64INmIAPQk2iPiOLlC2LVzYL4m3Hm6F1Rz21trHYA9QXBHqvtB9P2CKlRrlxy93 6aJboyshz+wwYiqhSIzijMz9i3V8+Y1DGqhM04XyVZFiDXdJno14awW9m1JWgSEVIyvfDW9 /6sZwiE5rHUiauas6bknd2maJtAjktQ6NMPNwAlLIo90j49Tj2a/5xl5wyz3DMpCy0bz3YN /EgYLxF8LWFK6Lxyjfh4xnns1lrGELkdm2KE0ZFA/4uEItQqXSAx6WGXy93pNi9lyIZm89P 0DbUEGijodIuSnZi08/m8SESazRvVIwcScS8rAysjn/YtbF+q6f98QVjbc8w== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 8DC80690B99 for ; Sun, 28 Dec 2025 20:34:48 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Dec 2025 18:34:48 -0000 Message-ID: <176694688873.25.6173297684350085297@4457048688e7> Message-ID-Hash: 4KWLAL3PWQHSSZIA43TLQGTGPKNE43BR X-Message-ID-Hash: 4KWLAL3PWQHSSZIA43TLQGTGPKNE43BR X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec: fix setting GBR pixel format in AV1 decoders (PR #21306) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21306 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21306 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21306.patch Fixes issue #21304 >>From a8f1c2366e23ad35f34e2a9af0cd63f38e26fc00 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sun, 28 Dec 2025 15:21:06 -0300 Subject: [PATCH 1/2] avcodec/libaomdec: don't overwrite color information from the container if unset in the bitstream Fixes part of #21304. Signed-off-by: James Almer --- libavcodec/libaomdec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 9e9c4d18c5..79b299bac8 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -71,9 +71,12 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) AVCOL_RANGE_MPEG, AVCOL_RANGE_JPEG }; avctx->color_range = color_ranges[img->range]; - avctx->color_primaries = (enum AVColorPrimaries)img->cp; - avctx->colorspace = (enum AVColorSpace)img->mc; - avctx->color_trc = (enum AVColorTransferCharacteristic)img->tc; + if (img->cp != AOM_CICP_CP_UNSPECIFIED) + avctx->color_primaries = (enum AVColorPrimaries)img->cp; + if (img->mc != AOM_CICP_MC_UNSPECIFIED) + avctx->colorspace = (enum AVColorSpace)img->mc; + if (img->tc != AOM_CICP_TC_UNSPECIFIED) + avctx->color_trc = (enum AVColorTransferCharacteristic)img->tc; switch (img->fmt) { case AOM_IMG_FMT_I420: -- 2.49.1 >>From fc5f45bd42c7f9cd203ca260765e549bd15ecaf2 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sun, 28 Dec 2025 15:20:03 -0300 Subject: [PATCH 2/2] avcodec/libdav1d: only consider colorspace when choosing between YUV and GBR Several files use values for primaries and transfer characteristics other than BT709 and IEC_61966 respectively, while still being GBR. Also always set color_range while at it. It's always coded in the bistream. Fixes part of #21304. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 7f63bb1b15..14ec9842a0 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -147,13 +147,10 @@ static void libdav1d_init_params(AVCodecContext *c, const Dav1dSequenceHeader *s c->colorspace = (enum AVColorSpace) seq->mtrx; c->color_primaries = (enum AVColorPrimaries) seq->pri; c->color_trc = (enum AVColorTransferCharacteristic) seq->trc; - c->color_range = seq->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; } + c->color_range = seq->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; - if (seq->layout == DAV1D_PIXEL_LAYOUT_I444 && - c->colorspace == AVCOL_SPC_RGB && - c->color_primaries == AVCOL_PRI_BT709 && - c->color_trc == AVCOL_TRC_IEC61966_2_1) + if (seq->layout == DAV1D_PIXEL_LAYOUT_I444 && c->colorspace == AVCOL_SPC_RGB) c->pix_fmt = pix_fmt_rgb[seq->hbd]; else c->pix_fmt = pix_fmt[seq->layout][seq->hbd]; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org