From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2AD4C4B5F1 for ; Sun, 9 Jun 2024 15:07:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D03C68D5D6; Sun, 9 Jun 2024 18:06:13 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E424668D3FA for ; Sun, 9 Jun 2024 18:06:03 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1717945558; bh=2rvGyBMGm/dBr4RBitpc5iVv4caammGKqML30NiHWnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Svzmdfjb2kCyoOHuv3aq9JOwGwTnpfFSTxSF2TsykYNOB5ROXkUoImy2yrwFxX2sM ZmMH2uscx+aOH8SpET7Ckv0XsYQMaGhxv6Yr311elTEwH1ERT/XaWSdG/94X623aK5 c44cv8T8W5BjyP2O9i6Hv4dop1W7+esdna29gIqA= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 2124542AC1; Sun, 9 Jun 2024 17:05:58 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 17:05:51 +0200 Message-ID: <20240609150553.72865-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240609150553.72865-1-ffmpeg@haasn.xyz> References: <20240609150553.72865-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] avcodec/dovi_rpu: guard ext blocks by dm_metadata_present 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 Cc: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas In the spec, dm_metadata_present also toggles all extension blocks, so we need to move them inside the branch. --- libavcodec/dovi_rpudec.c | 25 +++++++++++++------------ libavcodec/dovi_rpuenc.c | 21 ++++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index 51f824d126..064d74575f 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -613,22 +613,23 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, color->source_min_pq = get_bits(gb, 12); color->source_max_pq = get_bits(gb, 12); color->source_diagonal = get_bits(gb, 10); - } else { - s->color = &ff_dovi_color_default; - } - - /* Parse extension blocks */ - s->num_ext_blocks = 0; - if ((ret = parse_ext_blocks(s, gb, 1)) < 0) { - ff_dovi_ctx_unref(s); - return ret; - } - if (get_bits_left(gb) > 48 /* padding + CRC32 + terminator */) { - if ((ret = parse_ext_blocks(s, gb, 2)) < 0) { + /* Parse extension blocks */ + s->num_ext_blocks = 0; + if ((ret = parse_ext_blocks(s, gb, 1)) < 0) { ff_dovi_ctx_unref(s); return ret; } + + if (get_bits_left(gb) > 48 /* padding + CRC32 + terminator */) { + if ((ret = parse_ext_blocks(s, gb, 2)) < 0) { + ff_dovi_ctx_unref(s); + return ret; + } + } + } else { + s->color = &ff_dovi_color_default; + s->num_ext_blocks = 0; } return 0; diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 8fceefe2c1..f7d11c9042 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -508,6 +508,8 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, vdr_dm_metadata_present = memcmp(color, &ff_dovi_color_default, sizeof(*color)); use_prev_vdr_rpu = !memcmp(s->vdr[vdr_rpu_id], mapping, sizeof(*mapping)); + if (num_ext_blocks_v1 || num_ext_blocks_v2) + vdr_dm_metadata_present = 1; if (vdr_dm_metadata_present && !s->dm) { s->dm = ff_refstruct_allocz(sizeof(AVDOVIColorMetadata)); @@ -657,18 +659,19 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, memcpy(s->dm, color, sizeof(*color)); s->color = s->dm; - } - - set_ue_golomb(pb, num_ext_blocks_v1); - align_put_bits(pb); - for (int i = 0; i < metadata->num_ext_blocks; i++) - generate_ext_v1(pb, av_dovi_get_ext(metadata, i)); - if (num_ext_blocks_v2) { - set_ue_golomb(pb, num_ext_blocks_v2); + /* Extension blocks */ + set_ue_golomb(pb, num_ext_blocks_v1); align_put_bits(pb); for (int i = 0; i < metadata->num_ext_blocks; i++) - generate_ext_v2(pb, av_dovi_get_ext(metadata, i)); + generate_ext_v1(pb, av_dovi_get_ext(metadata, i)); + + if (num_ext_blocks_v2) { + set_ue_golomb(pb, num_ext_blocks_v2); + align_put_bits(pb); + for (int i = 0; i < metadata->num_ext_blocks; i++) + generate_ext_v2(pb, av_dovi_get_ext(metadata, i)); + } } flush_put_bits(pb); -- 2.45.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".