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 ESMTPS id ABC224DFF2 for ; Sun, 27 Apr 2025 11:45:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3ED3A68B0ED; Sun, 27 Apr 2025 14:45:31 +0300 (EEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06495687B1C for ; Sun, 27 Apr 2025 14:45:17 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-739525d4e12so3183087b3a.3 for ; Sun, 27 Apr 2025 04:45:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745754315; x=1746359115; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xG7t9VJDVPC3Z7qZDStozXXjNB4RF+lclmWmwWxbA0k=; b=mktlxDgdxcoeT5k6sRZUlt8UiTZ9rbt+/6qwS4ud/McREPhavvq6TmXjZQJBaFfPAt DEMVFEcTWboZaa8H1BfuBksyEMEMIrswLntrN4amg+PzDyXTIPFdep+n5OD0lhgrWoLB KXjs/fhIUFpWbmeQGxupLybP+dxVB1Q5NMwC0eOsGB21ZDiP42+Cu1+6/VtqOZwppytr GQLwHyFdVtNq3mSnWHdCpceaeLrKGYxtu0FhzZvkLRMMpEAgUj8/4+7vTVrRe8rJtxtf 5GP1NPRyTijm4YTUeFPC/4rR1MVgt38NpXMIp2KuwPLBMQNsB+ReudSRr8m0cvN6cFIw +kKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745754315; x=1746359115; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xG7t9VJDVPC3Z7qZDStozXXjNB4RF+lclmWmwWxbA0k=; b=U840cUNMETxwlYudmpQDwhnK1XMR8hNXuyZodXNCbBMfv5oGbXR4ChfWuEj7qjhHS3 H7HpqsuBEnzJpJx0+SVaORAaQIsQ1U6LnHncKXNA8myO08U4j0jTXbX7qeFz6kfMMq6R PkzQ96sm2/NEqHHJBVPRedyD921WQmIjYMl+TWRoOhhz0M7bGFU3Pion/8i17HKeMCKH ii2MybXOHvh0008V5JwhL3ZOT3SAxRs1BZZsz2+4UYB1Vjo29S6qh1c/pCs3OxXS9Rpf QQMP41jWW9mEOebylJDjXYgSrkzyYqfal+5cmBjdYfy3VGeeDL4PF6OANfGhD7P4J/gj 60sw== X-Gm-Message-State: AOJu0YzMDAheYo2T1cJLyuhu7KVwcm6maPKTGa8rtlnWbF7oXYwhquvf mct7XCnpO9JvmLPya+sxHJWTr2W4S9CefrtqyK431SZ+OeaAJ2iYesRgAWHH X-Gm-Gg: ASbGncsu078zZVHXbds3B1LSExaX3X7/3cRBlVQwYT/oqCWzia2oP6mgo4fEerzEGNZ bxZn2+B+4wzCzloNrRjLmqFqQdwQ3z2AlJUe/5ZGQQHZssh0wxmsSr1saDvuH1Vp1YEvCZi7tCd ZF+4qtRV1JGQ4x+82QAhX5e+rZ7Iv+EUkudc5Ew/seasFJdmugRUbOV3selqQT6Xg6UQvzuzWsa T4fOtZ5khzXdPIr8bTOFQnBWvnD76KGY1Ww1aTo204pUKvO/INBVz8KBwvLgxiWPVpKRPi9EAgF qISWZC3kuDf8GlniwKfo5gSMBy/DbUnXoWvDqgu042Wiel4EXy6+DRjFOuidSg== X-Google-Smtp-Source: AGHT+IF+La6Zw7DzDSN6qXtmojfGa9fqi3SDbihkDzs/MFTGkupGDgQyl/pwvf8U+51Aju001C09NQ== X-Received: by 2002:a05:6a20:c889:b0:1f5:6e71:e45 with SMTP id adf61e73a8af0-2045b99c0d4mr11650974637.27.1745754315102; Sun, 27 Apr 2025 04:45:15 -0700 (PDT) Received: from localhost.localdomain ([124.79.129.75]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e259134ebsm6064452b3a.27.2025.04.27.04.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Apr 2025 04:45:14 -0700 (PDT) From: toqsxw@gmail.com X-Google-Original-From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Apr 2025 19:44:32 +0800 Message-ID: <20250427114451.1236-2-toqsxw@outlook.com> X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: <20250427114451.1236-1-toqsxw@outlook.com> References: <20250427114451.1236-1-toqsxw@outlook.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 02/20] avcodec/cbs_sei_syntax_template: add sei message film_grain_characteristics 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: nuomi2021@gmail.com, Wu Jianhua 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: Wu Jianhua Signed-off-by: Wu Jianhua --- libavcodec/cbs_h2645.c | 6 ++++ libavcodec/cbs_sei.h | 21 +++++++++++ libavcodec/cbs_sei_syntax_template.c | 53 ++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index b0cf6e143a..d130c037ed 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -2311,6 +2311,12 @@ static const SEIMessageTypeDescriptor cbs_sei_h266_types[] = { }; static const SEIMessageTypeDescriptor cbs_sei_h274_types[] = { + { + SEI_TYPE_FILM_GRAIN_CHARACTERISTICS, + 1, 0, + sizeof(SEIRawFilmGrainCharacteristics), + SEI_MESSAGE_RW(sei, film_grain_characteristics), + }, SEI_MESSAGE_TYPE_END, }; diff --git a/libavcodec/cbs_sei.h b/libavcodec/cbs_sei.h index 15ef3415ab..a0fb004ecd 100644 --- a/libavcodec/cbs_sei.h +++ b/libavcodec/cbs_sei.h @@ -97,6 +97,27 @@ typedef struct SEIRawAmbientViewingEnvironment { uint16_t ambient_light_y; } SEIRawAmbientViewingEnvironment; +typedef struct SEIRawFilmGrainCharacteristics { + uint8_t fg_characteristics_cancel_flag; + uint8_t fg_model_id; + uint8_t fg_separate_colour_description_present_flag; + uint8_t fg_bit_depth_luma_minus8; + uint8_t fg_bit_depth_chroma_minus8; + uint8_t fg_full_range_flag; + uint8_t fg_colour_primaries; + uint8_t fg_transfer_characteristics; + uint8_t fg_matrix_coeffs; + uint8_t fg_blending_mode_id; + uint8_t fg_log2_scale_factor; + uint8_t fg_comp_model_present_flag[3]; + uint8_t fg_num_intensity_intervals_minus1[3]; + uint8_t fg_num_model_values_minus1[3]; + uint8_t fg_intensity_interval_lower_bound[3][256]; + uint8_t fg_intensity_interval_upper_bound[3][256]; + int16_t fg_comp_model_value[3][256][6]; + uint8_t fg_characteristics_persistence_flag; +} SEIRawFilmGrainCharacteristics; + typedef struct SEIRawMessage { uint32_t payload_type; uint32_t payload_size; diff --git a/libavcodec/cbs_sei_syntax_template.c b/libavcodec/cbs_sei_syntax_template.c index 0205bb47aa..b105299cd9 100644 --- a/libavcodec/cbs_sei_syntax_template.c +++ b/libavcodec/cbs_sei_syntax_template.c @@ -224,6 +224,59 @@ SEI_FUNC(ambient_viewing_environment, return 0; } +SEI_FUNC(film_grain_characteristics, + (CodedBitstreamContext *ctx, RWContext *rw, + SEIRawFilmGrainCharacteristics *current, + SEIMessageState *state)) +{ + int err, c, i, j; + + HEADER("Film Grain Characteristics"); + + flag(fg_characteristics_cancel_flag); + if (!current->fg_characteristics_cancel_flag) { + int filmGrainBitDepth[3]; + + u(2, fg_model_id, 0, 1); + flag(fg_separate_colour_description_present_flag); + if (current->fg_separate_colour_description_present_flag) { + ub(3, fg_bit_depth_luma_minus8); + ub(3, fg_bit_depth_chroma_minus8); + flag(fg_full_range_flag); + ub(8, fg_colour_primaries); + ub(8, fg_transfer_characteristics); + ub(8, fg_matrix_coeffs); + } + + filmGrainBitDepth[0] = current->fg_bit_depth_luma_minus8 + 8; + filmGrainBitDepth[1] = + filmGrainBitDepth[2] = current->fg_bit_depth_chroma_minus8 + 8; + + u(2, fg_blending_mode_id, 0, 1); + ub(4, fg_log2_scale_factor); + for (c = 0; c < 3; c++) + flags(fg_comp_model_present_flag[c], 1, c); + + for (c = 0; c < 3; c++) { + if (current->fg_comp_model_present_flag[c]) { + ubs(8, fg_num_intensity_intervals_minus1[c], 1, c); + us(3, fg_num_model_values_minus1[c], 0, 5, 1, c); + for (i = 0; i <= current->fg_num_intensity_intervals_minus1[c]; i++) { + ubs(8, fg_intensity_interval_lower_bound[c][i], 2, c, i); + ubs(8, fg_intensity_interval_upper_bound[c][i], 2, c, i); + for (j = 0; j <= current->fg_num_model_values_minus1[c]; j++) + ses(fg_comp_model_value[c][i][j], 0 - current->fg_model_id * (1 << (filmGrainBitDepth[c] - 1)), + ((1 << filmGrainBitDepth[c]) - 1) - current->fg_model_id * (1 << (filmGrainBitDepth[c] - 1)), + 3, c, i, j); + } + } + } + flag(fg_characteristics_persistence_flag); + } + + return 0; +} + static int FUNC(message)(CodedBitstreamContext *ctx, RWContext *rw, SEIRawMessage *current) { -- 2.44.0.windows.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".