From patchwork Mon Feb 27 17:34:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Rapha=C3=ABl_Zumer?= X-Patchwork-Id: 40533 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp203171pzb; Mon, 27 Feb 2023 09:35:11 -0800 (PST) X-Google-Smtp-Source: AK7set9MVzeD+PSCq6tOUfnD7JSZDJn3hsfPd36hZfsH07iOOx2jIMolvMVbM6LjiNMWSK3bxOwT X-Received: by 2002:a17:906:a2d0:b0:8e4:96c4:8a4 with SMTP id by16-20020a170906a2d000b008e496c408a4mr20668518ejb.62.1677519311011; Mon, 27 Feb 2023 09:35:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677519310; cv=none; d=google.com; s=arc-20160816; b=dWlCLQ8Nd8siGebdbvrGcYnhlv49hBGZ+0NmX+Y+6Ur0OSE3fpF487lX2EK/boCY7L Mre//f/Pk7yavAxuXcbl02FgNlh1gbHOrBoV0pX0X+31/oHtRSWqDLrrVwhreXB21fI+ EFTn11WVL1aGU19P+AKByIRgCGZcK9v80Rp9CSVqLqL3GiQBjBrqLka37+5TFCJebXz6 jjl/jmt+QF8La17iGDqx60CPHMbvn/M4TlN9UiG+SDMx0NRYb3pZoT0bcxymnlaGh6Pb I/NQryGmKbazknsss92QV7DGbqQxuQKJTijaEMTUlM1g5KPOveXUkS7Vuk6GAeuWsSgE XD8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=F6uH4VibqdEDwoBIr1TwwdpVzs/2GPNN9z65soMV8jQ=; b=kOWnViTYNO96KXCoQHZtB5t0PSfmTFXLwbezt3mMCd61pNwRAqtmIDkKEVnypt3Xmj BOHWW60vwqYK/QUy0pH3HTlJpufTFgCqXicSd2f4ETwyJAd1KIjpAMOJwljMb9na97Ch kixS63v1pPmjHG2E2tanJuVdo3asYj5NGRljoLiE7gBHOUJErzAbFTItqC0C7Mw3TFAp 4fDBawfEfpeIY8Cd3Y50rz/sUxSpppLXTsSNixRVinLALWQL09b6ARA9dhyMwyeNZtUf 0zGGhQ9WWDLhm/wjifji/5kdvtb3CJpy1/NARtoSouIlEPBSLeFqVkzY8VC2d18fd0tG vrfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@vimeo.com header.s=google header.b="A2/ZkHmH"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=vimeo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rp5-20020a170906d96500b008b23ed7e385si9294343ejb.91.2023.02.27.09.35.10; Mon, 27 Feb 2023 09:35:10 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@vimeo.com header.s=google header.b="A2/ZkHmH"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=vimeo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E42D689E9B; Mon, 27 Feb 2023 19:35:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6AA4689900 for ; Mon, 27 Feb 2023 19:35:01 +0200 (EET) Received: by mail-qt1-f174.google.com with SMTP id c19so7441101qtn.13 for ; Mon, 27 Feb 2023 09:35:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vimeo.com; s=google; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Z0NycDzRuVbaanhO/zwe56IGuQlNlXUIRcwd0LScmyI=; b=A2/ZkHmHsfo5fALO5VEjYrLmClqD4FpbzmZ5RuIcVzUMtxmYp2G4xm9fEU2SQBUGO6 VOjRonEj1aO0Qo/BXI/M7Dnewj2qvMEy1S7F5I7OkHWa5NCrKJI66C/lOy1zXstAaVNi pZ1xv4WPHAvIUtqu3CE6iPA65SGiiVOYzJbO8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Z0NycDzRuVbaanhO/zwe56IGuQlNlXUIRcwd0LScmyI=; b=oA6Q7Pt2HdYi11sJA52yrFHrCLiLuNcNltWaULXkL8D8GmFRfd4gkcBr+bBtlsdZud rNpgWVmgoPBe41rYFST+7a3D2tqib3tfEjSCGRLNV0vsiU3q051FNR33Jrrx+bP2OWuD FannFZOfmhfT1b0VAox918uJXh5xXIpB6/lo9KWZiF4U+R3kjB/Jld0y8ijiNtnMo+Up PiOONdaVkMavIFPXFERK9EUrgVcaShpLHGT4E3PgIM4GCSJKKKegiGK/AYOyo00IqQNv F20l88dKc5TGI3w5l6RNjkUEhaGOGqdF5HWBLRQfNj4EgdG8DL3ZSSeR5XKfLZoCvjs/ NpgQ== X-Gm-Message-State: AO0yUKXxQoAgKHwtbhK4B+n4mpQ3VBw52OmQvBApD2WFlSaM3GfvU1OV nLcBpi75NtY4HriKLTna4BGYx54SvSNdkbKg++w= X-Received: by 2002:ac8:4e4d:0:b0:3bf:a8cf:3096 with SMTP id e13-20020ac84e4d000000b003bfa8cf3096mr39037qtw.33.1677519300082; Mon, 27 Feb 2023 09:35:00 -0800 (PST) Received: from ?IPV6:2600:4041:6c:7000:1f01:20c:8ba9:815b? ([2600:4041:6c:7000:1f01:20c:8ba9:815b]) by smtp.gmail.com with ESMTPSA id x2-20020ac84a02000000b003b9a426d626sm4923004qtq.22.2023.02.27.09.34.59 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Feb 2023 09:34:59 -0800 (PST) Message-ID: <725ad573-5e22-84a3-b12f-e68baa2b3980@vimeo.com> Date: Mon, 27 Feb 2023 12:34:58 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 From: =?utf-8?q?Rapha=C3=ABl_Zumer?= To: ffmpeg-devel@ffmpeg.org Content-Language: en-US, fr-FR Subject: [FFmpeg-devel] [PATCH 2/2] avutil: add HDR10+ dynamic metadata serialization function 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vaIv8aY3aygG Resent due to my mail client incorrectly re-wrapping lines in the version I sent earlier. See the previous patch for context. Signed-off-by: Raphaël Zumer --- libavutil/hdr_dynamic_metadata.c | 147 +++++++++++++++++++++++++++++++ libavutil/hdr_dynamic_metadata.h | 10 +++ libavutil/version.h | 2 +- 3 files changed, 158 insertions(+), 1 deletion(-) diff --git a/libavutil/hdr_dynamic_metadata.c b/libavutil/hdr_dynamic_metadata.c index 98f399b032..72d310e633 100644 --- a/libavutil/hdr_dynamic_metadata.c +++ b/libavutil/hdr_dynamic_metadata.c @@ -225,3 +225,150 @@ int av_dynamic_hdr_plus_from_t35(AVDynamicHDRPlus *s, const uint8_t *data, return 0; } + +AVBufferRef *av_dynamic_hdr_plus_to_t35(AVDynamicHDRPlus *s) +{ + AVBufferRef *buf; + size_t size_bits, size_bytes; + PutBitContext pbc, *pb = &pbc; + + if (!s) + return NULL; + + // Buffer size per CTA-861-H p.253-254: + size_bits = + // 56 bits for the header + 58 + + // 2 bits for num_windows + 2 + + // 937 bits for window geometry for each window above 1 + FFMAX((s->num_windows - 1), 0) * 937 + + // 27 bits for targeted_system_display_maximum_luminance + 27 + + // 1-3855 bits for targeted system display peak luminance information + 1 + (s->targeted_system_display_actual_peak_luminance_flag ? 10 + + s->num_rows_targeted_system_display_actual_peak_luminance * + s->num_cols_targeted_system_display_actual_peak_luminance * 4 : 0) + + // 0-442 bits for intra-window pixel distribution information + s->num_windows * 82; + for (int w = 0; w < s->num_windows; w++) { + size_bits += s->params[w].num_distribution_maxrgb_percentiles * 24; + } + // 1-3855 bits for mastering display peak luminance information + size_bits += 1 + (s->mastering_display_actual_peak_luminance_flag ? 10 + + s->num_rows_mastering_display_actual_peak_luminance * + s->num_cols_mastering_display_actual_peak_luminance * 4 : 0) + + // 0-537 bits for per-window tonemapping information + s->num_windows * 1; + for (int w = 0; w < s->num_windows; w++) { + if (s->params[w].tone_mapping_flag) { + size_bits += 28 + s->params[w].num_bezier_curve_anchors * 10; + } + } + // 0-21 bits for per-window color saturation mapping information + size_bits += s->num_windows * 1; + for (int w = 0; w < s->num_windows; w++) { + if (s->params[w].color_saturation_mapping_flag) { + size_bits += 6; + } + } + + size_bytes = (size_bits + 7) / 8; + + buf = av_buffer_alloc(size_bytes); + if (!buf) { + return NULL; + } + + init_put_bits(pb, buf->data, size_bytes); + + // itu_t_t35_country_code shall be 0xB5 (USA) + put_bits(pb, 8, 0xB5); + // itu_t_t35_terminal_provider_code shall be 0x003C + put_bits(pb, 16, 0x003C); + // itu_t_t35_terminal_provider_oriented_code is set to ST 2094-40 + put_bits(pb, 16, 0x0001); + // application_identifier shall be set to 4 + put_bits(pb, 8, 4); + // application_mode is set to Application Version 1 + put_bits(pb, 8, 1); + + // Payload as per CTA-861-H p.253-254 + put_bits(pb, 2, s->num_windows); + + for (int w = 1; w < s->num_windows; w++) { + put_bits(pb, 16, s->params[w].window_upper_left_corner_x.num / s->params[w].window_upper_left_corner_x.den); + put_bits(pb, 16, s->params[w].window_upper_left_corner_y.num / s->params[w].window_upper_left_corner_y.den); + put_bits(pb, 16, s->params[w].window_lower_right_corner_x.num / s->params[w].window_lower_right_corner_x.den); + put_bits(pb, 16, s->params[w].window_lower_right_corner_y.num / s->params[w].window_lower_right_corner_y.den); + put_bits(pb, 16, s->params[w].center_of_ellipse_x); + put_bits(pb, 16, s->params[w].center_of_ellipse_y); + put_bits(pb, 8, s->params[w].rotation_angle); + put_bits(pb, 16, s->params[w].semimajor_axis_internal_ellipse); + put_bits(pb, 16, s->params[w].semimajor_axis_external_ellipse); + put_bits(pb, 16, s->params[w].semiminor_axis_external_ellipse); + put_bits(pb, 1, s->params[w].overlap_process_option); + } + + put_bits(pb, 27, s->targeted_system_display_maximum_luminance.num * luminance_den / + s->targeted_system_display_maximum_luminance.den); + put_bits(pb, 1, s->targeted_system_display_actual_peak_luminance_flag); + if (s->targeted_system_display_actual_peak_luminance_flag) { + put_bits(pb, 5, s->num_rows_targeted_system_display_actual_peak_luminance); + put_bits(pb, 5, s->num_cols_targeted_system_display_actual_peak_luminance); + for (int i = 0; i < s->num_rows_targeted_system_display_actual_peak_luminance; i++) { + for (int j = 0; j < s->num_cols_targeted_system_display_actual_peak_luminance; j++) { + put_bits(pb, 4, s->targeted_system_display_actual_peak_luminance[i][j].num * peak_luminance_den / + s->targeted_system_display_actual_peak_luminance[i][j].den); + } + } + } + + for (int w = 0; w < s->num_windows; w++) { + for (int i = 0; i < 3; i++) { + put_bits(pb, 17, s->params[w].maxscl[i].num * rgb_den / s->params[w].maxscl[i].den); + } + put_bits(pb, 17, s->params[w].average_maxrgb.num * rgb_den / s->params[w].average_maxrgb.den); + put_bits(pb, 4, s->params[w].num_distribution_maxrgb_percentiles); + for (int i = 0; i < s->params[w].num_distribution_maxrgb_percentiles; i++) { + put_bits(pb, 7, s->params[w].distribution_maxrgb[i].percentage); + put_bits(pb, 17, s->params[w].distribution_maxrgb[i].percentile.num * rgb_den / + s->params[w].distribution_maxrgb[i].percentile.den); + } + put_bits(pb, 10, s->params[w].fraction_bright_pixels.num * fraction_pixel_den / + s->params[w].fraction_bright_pixels.den); + } + + put_bits(pb, 1, s->mastering_display_actual_peak_luminance_flag); + if (s->mastering_display_actual_peak_luminance_flag) { + put_bits(pb, 5, s->num_rows_mastering_display_actual_peak_luminance); + put_bits(pb, 5, s->num_cols_mastering_display_actual_peak_luminance); + for (int i = 0; i < s->num_rows_mastering_display_actual_peak_luminance; i++) { + for (int j = 0; j < s->num_cols_mastering_display_actual_peak_luminance; j++) { + put_bits(pb, 4, s->mastering_display_actual_peak_luminance[i][j].num * peak_luminance_den / + s->mastering_display_actual_peak_luminance[i][j].den); + } + } + } + + for (int w = 0; w < s->num_windows; w++) { + put_bits(pb, 1, s->params[w].tone_mapping_flag); + if (s->params[w].tone_mapping_flag) { + put_bits(pb, 12, s->params[w].knee_point_x.num * knee_point_den / s->params[w].knee_point_x.den); + put_bits(pb, 12, s->params[w].knee_point_y.num * knee_point_den / s->params[w].knee_point_y.den); + put_bits(pb, 4, s->params[w].num_bezier_curve_anchors); + for (int i = 0; i < s->params[w].num_bezier_curve_anchors; i++) { + put_bits(pb, 10, s->params[w].bezier_curve_anchors[i].num * bezier_anchor_den / + s->params[w].bezier_curve_anchors[i].den); + } + put_bits(pb, 1, s->params[w].color_saturation_mapping_flag); + if (s->params[w].color_saturation_mapping_flag) { + put_bits(pb, 6, s->params[w].color_saturation_weight.num * saturation_weight_den / + s->params[w].color_saturation_weight.den); + } + } + } + + flush_put_bits(pb); + return buf; +} diff --git a/libavutil/hdr_dynamic_metadata.h b/libavutil/hdr_dynamic_metadata.h index 1f953ef1f5..f75d3e0739 100644 --- a/libavutil/hdr_dynamic_metadata.h +++ b/libavutil/hdr_dynamic_metadata.h @@ -21,6 +21,7 @@ #ifndef AVUTIL_HDR_DYNAMIC_METADATA_H #define AVUTIL_HDR_DYNAMIC_METADATA_H +#include "buffer.h" #include "frame.h" #include "rational.h" @@ -351,4 +352,13 @@ AVDynamicHDRPlus *av_dynamic_hdr_plus_create_side_data(AVFrame *frame); int av_dynamic_hdr_plus_from_t35(AVDynamicHDRPlus *s, const uint8_t *data, int size); +/** + * Serialize dynamic HDR10+ metadata to a user data registered ITU-T T.35 buffer. + * @param s A pointer containing the decoded AVDynamicHDRPlus structure. + * + * @return Pointer to an AVBufferRef containing the raw ITU-T T.35 representation + * of the HDR10+ metadata if succeed, or NULL if buffer allocation fails. + */ +AVBufferRef *av_dynamic_hdr_plus_to_t35(AVDynamicHDRPlus *s); + #endif /* AVUTIL_HDR_DYNAMIC_METADATA_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 900b798971..7635672985 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 3 +#define LIBAVUTIL_VERSION_MINOR 4 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \