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 D20264D3E9 for ; Tue, 18 Nov 2025 23:53:48 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'qb3ye/SUpO/waSE8eyp3iDwPhSXAkC0Y6Xjkn93mKMo=', expected b'+pvQA4b8zefu7V4turbpM585ADgD/UwCjE0GlSdvd6E=')) 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=1763510017; 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=qb3ye/SUpO/waSE8eyp3iDwPhSXAkC0Y6Xjkn93mKMo=; b=YFeAb52Q+Wqz3MSsEtBHRnfG5V0UNPiwLyns75ZP/SD1JhO2/DhyOCOGhgdpLLnFMggIe fkwa/zuv/OsnFrRJf/X6/GzuRjLwi46KJG3CECL08oM2PtQLU1NbpkDwfoggqohe5aQ9Ptu mpbVtQbcP5MU+NyLnwso9tXzgYdN+UAdhysZFL9T8NX7Yj3HrjvcC0YrVP8goDaBhKVwtkX V26hqceW73i3U8BopIURMSvoQGaAJyiekESnNEZ2ninF05a4ovlF9/HIFgiZ4A/g2dUfAtZ zQMGHZMZlzKYlRQYdW+vRxVKfCqKVS9Q04kM44Pt8F3jic3vbZuO+kZJoEJw== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2C56068FF10; Wed, 19 Nov 2025 01:53:37 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1763510015; b=CYaSqbwY86a8XJWNkinLfsMVqg5ylYbRqncVycQSk6LyzfTxpo/QO9pF+0fwUcP09GyiW tK9OXBQbYQZF11S8g/WRaJr6VUuRJR8qpMc8A2T4ej9rhkhaSVFdsJRuj7Frk+LBc2M85d+ d0lnVUTCP1An832ptw4DvatvxZGONfB5URSdCX5tE41iqeDEdxtpHy0mzLcsCp00VN9PvXs Cv2fez8+wQyrWTNgPUsFzDFyToj1v0bdMo+Hd4gtnyc8gKe9VPBZW7CgngOyeGxBYHmH6EK Lm9idNYvuyARKbeHKbRqC5AvEgHRAkwIIlyYmw4BFoOLSB/4nFjVObgB8Dtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1763510015; 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=oJJG4lTM5nPlAm55CEwemVcSsBwlrfvQD+Qb7UZv/ck=; b=oHeZHjCacc591wmG6eQ18aJAsIoBvZXrluomblQvr4isGwwkeK+/jswhKgMsek7MogYOP U+IBGLhWRRDExXK9l0I1Sd9vT2fZtOQOotxUbGP98x+HHrKvzuG7+quW0vTUV/5DU38Tss/ yrgAKPbjcck6WDGHbY0p/VEamANJrtl1aRgs19feyr3c8SJL5XrpbFyEP3WFxsbopoxzudg AfWH5zuLvs9Xbg3zQUz/qfLFoNl5kSqhcuz0cCOkqu4BRfFb00pU1GHJ2+OfnLePsUOoJ0I Kgd1wFdB2y0rf10rvWLjcFFg/oN6jxzeO3DFFh1gwSyzHErgMBiE8dop+O9Q== 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=1763510008; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=+pvQA4b8zefu7V4turbpM585ADgD/UwCjE0GlSdvd6E=; b=QEBprj4d4y+kup1J7F0a4+7iMujJjk8VMwNubXCKqaOm5YePrwFRgeyzXrgElHmU6SWGq +Ay3M7IFWOKGa1dKmhIzN0kn1fNQWmf8jAQf980VwEzhMjg97P3DcIVBBNvL3CL3Gvi2caQ NdDocMD+dA+QLXcBAW2cjFHES8OTOoTu0rNcw1CpCESVuUkF0obwnmPzjBU9S/r7mjcHkn5 /c5iP2eVfenOUTh0U9v9q6e0WXsgVxNNricAojnofZV8RfiSlnLYyiJYdelCh/15KDNKVJ+ dVoLv3Mhooc4Wjtf95VJcFmqYSkVQzbdMc01Srk6tdwb8F+oMCjM1MAw3t/g== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6D06E68FEF8 for ; Wed, 19 Nov 2025 01:53:28 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Nov 2025 23:53:28 -0000 Message-ID: <176351000857.59.17738278266713090673@2cb04c0e5124> Message-ID-Hash: OIMPTBQD5XUP7SMQ2YFXCFFBAQA6SYCU X-Message-ID-Hash: OIMPTBQD5XUP7SMQ2YFXCFFBAQA6SYCU 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] dovi: fix L11 metadata (PR #20962) 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: Cosmin Stejerean via ffmpeg-devel Cc: Cosmin Stejerean Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20962 opened by Cosmin Stejerean (cosmin) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20962 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20962.patch The handling of L11 dolby vision metadata was based on an old version of `dovi_tool` however the structure does not match the spec and it has been fixed in `dovi_tool` for almost 4 years. This brings the ffmpeg handling of L11 metadata inline with the latest version of the spec, the official DolbyVision verifier and aligns with latest `dovi_tool` L11 definition as well. >>From ae8cfe9fd38f0d31cad64de5e8ee2abd11b7f0b3 Mon Sep 17 00:00:00 2001 From: Cosmin Stejerean Date: Tue, 18 Nov 2025 13:45:37 -0800 Subject: [PATCH 1/2] avutil/dovi_meta - fix L11 dovi metadata definition the current fields in AVDOVIDmLevel11 are based on an out-of-date version of dovi_tool, these fields never made it into any spec and were cleaned up in dovi_tool almost 4 years ago --- libavutil/dovi_meta.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavutil/dovi_meta.h b/libavutil/dovi_meta.h index 5e8a1e43d7..2cb105ee40 100644 --- a/libavutil/dovi_meta.h +++ b/libavutil/dovi_meta.h @@ -279,12 +279,8 @@ typedef struct AVDOVIDmLevel11 { uint8_t content_type; uint8_t whitepoint; uint8_t reference_mode_flag; - uint8_t sharpness; - uint8_t noise_reduction; - uint8_t mpeg_noise_reduction; - uint8_t frame_rate_conversion; - uint8_t brightness; - uint8_t color; + uint8_t reserved_byte2; + uint8_t reserved_byte3; } AVDOVIDmLevel11; typedef struct AVDOVIDmLevel254 { -- 2.49.1 >>From 1d587bb378a8a714774401bbdba3818502f9bf64 Mon Sep 17 00:00:00 2001 From: Cosmin Stejerean Date: Tue, 18 Nov 2025 13:47:22 -0800 Subject: [PATCH 2/2] avcodec/dovi_rpu(enc|dec) - fix parsing and writing of L11 DoVi metadata --- libavcodec/dovi_rpudec.c | 8 ++------ libavcodec/dovi_rpuenc.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index 4750d48337..1f1544578b 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -261,12 +261,8 @@ static int parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, dm->l11.whitepoint = get_bits(gb, 4); dm->l11.reference_mode_flag = get_bits1(gb); skip_bits(gb, 3); /* reserved */ - dm->l11.sharpness = get_bits(gb, 2); - dm->l11.noise_reduction = get_bits(gb, 2); - dm->l11.mpeg_noise_reduction = get_bits(gb, 2); - dm->l11.frame_rate_conversion = get_bits(gb, 2); - dm->l11.brightness = get_bits(gb, 2); - dm->l11.color = get_bits(gb, 2); + dm->l11.reserved_byte2 = get_bits(gb, 8); + dm->l11.reserved_byte3 = get_bits(gb, 8); break; case 254: dm->l254.dm_mode = get_bits(gb, 8); diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index fa351c2b55..da6cf45753 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -546,12 +546,8 @@ static void generate_ext_v2(PutBitContext *pb, const AVDOVIDmData *dm) put_bits(pb, 4, dm->l11.whitepoint); put_bits(pb, 1, dm->l11.reference_mode_flag); put_bits(pb, 3, 0); /* reserved */ - put_bits(pb, 2, dm->l11.sharpness); - put_bits(pb, 2, dm->l11.noise_reduction); - put_bits(pb, 2, dm->l11.mpeg_noise_reduction); - put_bits(pb, 2, dm->l11.frame_rate_conversion); - put_bits(pb, 2, dm->l11.brightness); - put_bits(pb, 2, dm->l11.color); + put_bits(pb, 8, dm->l11.reserved_byte2); + put_bits(pb, 8, dm->l11.reserved_byte3); break; case 254: put_bits(pb, 8, dm->l254.dm_mode); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org