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 4FC784C464 for ; Sun, 28 Jul 2024 10:26:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE3CD68D92E; Sun, 28 Jul 2024 13:25:49 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA5CD68D80D for ; Sun, 28 Jul 2024 13:25:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1722162338; bh=sGnOU5eLEiuZPO0frtVWn3UA0egZHQO3gtjPbr8BWng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VrRsiReFRZ2rs4Ts75y3TkkdRxkQbKkLbDIzCWGHIKgHAATSAglSaAIgFqG2TV8aW u5uU9krMhONE2DAIZJls/MaN+nubeJ4wFXO0KdnH6c0gVSVUoi67Kk3K5MVyDxl6ht FW20V/keK3MO9VDaBrmg8ZeHnLjZlVmbW1atYd/I= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 37BC6432C6; Sun, 28 Jul 2024 12:25:38 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 12:25:19 +0200 Message-ID: <20240728102527.17991-14-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240728102527.17991-1-ffmpeg@haasn.xyz> References: <20240728102527.17991-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/22] avcodec/dovi_rpu: separate static ext blocks 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 Static and dynamic extension blocks are handled differently by metadata compression, so we need to separate the extension block array into two. --- libavcodec/dovi_rpu.h | 20 ++++++++++++++++++-- libavcodec/dovi_rpudec.c | 31 +++++++++++++++++++++---------- libavcodec/dovi_rpuenc.c | 11 ++++++++--- 3 files changed, 47 insertions(+), 15 deletions(-) diff --git a/libavcodec/dovi_rpu.h b/libavcodec/dovi_rpu.h index ed5bfa7b26..f3ccc27ae8 100644 --- a/libavcodec/dovi_rpu.h +++ b/libavcodec/dovi_rpu.h @@ -33,8 +33,10 @@ #define DOVI_MAX_DM_ID 15 typedef struct DOVIExt { - AVDOVIDmData dm[AV_DOVI_MAX_EXT_BLOCKS]; - int num_dm; + AVDOVIDmData dm_static[7]; ///< static extension blocks + AVDOVIDmData dm_dynamic[25]; ///< dynamic extension blocks + int num_static; + int num_dynamic; } DOVIExt; typedef struct DOVIContext { @@ -191,4 +193,18 @@ int ff_dovi_guess_profile_hevc(const AVDOVIRpuDataHeader *hdr); /* Default values for AVDOVIColorMetadata */ extern const AVDOVIColorMetadata ff_dovi_color_default; +static inline int ff_dovi_rpu_extension_is_static(int level) +{ + switch (level) { + case 6: + case 10: + case 32: /* reserved as static by spec */ + case 254: + case 255: + return 1; + default: + return 0; + } +} + #endif /* AVCODEC_DOVI_RPU_H */ diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index 1650547c80..6ef7a88ffd 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -51,9 +51,10 @@ int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata) if (s->ext_blocks) { const DOVIExt *ext = s->ext_blocks; size_t ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size); - for (int i = 0; i < ext->num_dm; i++) - memcpy(av_dovi_get_ext(dovi, i), &ext->dm[i], ext_sz); - dovi->num_ext_blocks = ext->num_dm; + for (int i = 0; i < ext->num_static; i++) + memcpy(av_dovi_get_ext(dovi, dovi->num_ext_blocks++), &ext->dm_static[i], ext_sz); + for (int i = 0; i < ext->num_dynamic; i++) + memcpy(av_dovi_get_ext(dovi, dovi->num_ext_blocks++), &ext->dm_dynamic[i], ext_sz); } *out_metadata = dovi; @@ -296,15 +297,23 @@ static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) while (num_ext_blocks--) { AVDOVIDmData *dm; - - if (ext->num_dm >= FF_ARRAY_ELEMS(ext->dm)) - return AVERROR_INVALIDDATA; - dm = &ext->dm[ext->num_dm++]; + uint8_t level; ext_block_length = get_ue_golomb_31(gb); - dm->level = get_bits(gb, 8); + level = get_bits(gb, 8); start_pos = get_bits_count(gb); + if (ff_dovi_rpu_extension_is_static(level)) { + if (ext->num_static >= FF_ARRAY_ELEMS(ext->dm_static)) + return AVERROR_INVALIDDATA; + dm = &ext->dm_static[ext->num_static++]; + } else { + if (ext->num_dynamic >= FF_ARRAY_ELEMS(ext->dm_dynamic)) + return AVERROR_INVALIDDATA; + dm = &ext->dm_dynamic[ext->num_dynamic++]; + } + + dm->level = level; switch (ver) { case 1: ret = parse_ext_v1(s, gb, dm); break; case 2: ret = parse_ext_v2(s, gb, dm, ext_block_length); break; @@ -674,8 +683,10 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, color->source_diagonal = get_bits(gb, 10); /* Parse extension blocks */ - if (s->ext_blocks) - s->ext_blocks->num_dm = 0; + if (s->ext_blocks) { + DOVIExt *ext = s->ext_blocks; + ext->num_static = ext->num_dynamic = 0; + } if ((ret = parse_ext_blocks(s, gb, 1)) < 0) { ff_dovi_ctx_unref(s); return ret; diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c index 667d681c25..7193e2d9c8 100644 --- a/libavcodec/dovi_rpuenc.c +++ b/libavcodec/dovi_rpuenc.c @@ -758,9 +758,14 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, if (ext) { size_t ext_sz = FFMIN(sizeof(AVDOVIDmData), metadata->ext_block_size); - for (int i = 0; i < metadata->num_ext_blocks; i++) - memcpy(&ext->dm[i], av_dovi_get_ext(metadata, i), ext_sz); - ext->num_dm = metadata->num_ext_blocks; + ext->num_static = ext->num_dynamic = 0; + for (int i = 0; i < metadata->num_ext_blocks; i++) { + const AVDOVIDmData *dm = av_dovi_get_ext(metadata, i); + if (ff_dovi_rpu_extension_is_static(dm->level)) + memcpy(&ext->dm_static[ext->num_static++], dm, ext_sz); + else + memcpy(&ext->dm_dynamic[ext->num_dynamic++], dm, ext_sz); + } } } else { s->color = &ff_dovi_color_default; -- 2.45.2 _______________________________________________ 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".