From patchwork Mon Mar 13 23:37:12 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: 40671 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2153273pzb; Mon, 13 Mar 2023 16:37:24 -0700 (PDT) X-Google-Smtp-Source: AK7set96Z51oXWWQEmZCZgfSTlWFxIDWKOreKipG/T+JRL5u+ba3u4vgXMQ0fZsYXGxMFi5u1N1L X-Received: by 2002:a17:906:8588:b0:926:4e16:a551 with SMTP id v8-20020a170906858800b009264e16a551mr244317ejx.30.1678750643993; Mon, 13 Mar 2023 16:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678750643; cv=none; d=google.com; s=arc-20160816; b=raGm4/lXpxqxixyfnRBSPAuLcMISppUO5b5dgITKcKza7ppb/JgzUVolqm9AcsY7M+ i+yd6fVC3xVqy4QMQqhfgHZ7ZDYPtqNSj48P7IF9m3xbgdD/dVKrxTRaAepkMTGFd/RS cyX2PNPnyJ9PnG5HQ3QcK+NxUApAYnp5yE8KpRUP8sVkS0pfdPjrzLqATrvF+1wyqq22 LGlIQBcoG/2GM4NS5/uMo5XaeK19n7iOY6IMwmtj1/ukukrLtgVikuSIbXdLAbZ8FXQR KKViEe02AF5XPmQtZgtbEgz11uZrpIIiCZyMlvk4l2ZBNvCzLf3poVPKRFXeLu851CR6 vq0g== 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=33NNDTCfKCbgeil04lJp2o8/trt866H+2YMlarHeGow=; b=HctFmT3mM5XgreBoFKKITZveHohcIoiEJIRdl7FYsFK8izy/lnKv024XltEDtBJxky mzVn0PXFsvG70hIeC96/6WRX1++sEN9cv6b1LDnfSPuGYiGZisaVQ+9m4JW1U+XKBUwL LQlXFMHr+Dd8gKz5OBQDW5SnOzVZYbgQJ1HnShtCWgXRuOS/Q8XhDyKhCuRFMuKnkOjG 9CvmasrLQ2+t7m6gAzjjk+ViCIpdYhSVYxFX4yiCv3WzQJoGBXeWKXGNtmkVt9q7+o3K vtz1IZ9pMX66+xO5qVDCxERtKNLPoGDwPNfcmDnLDBn6cvLR8TPmGS8XrBdMpFrIMp4r YV+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@vimeo.com header.s=google header.b=F37X0Fmk; 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 u17-20020a170906c41100b00922d1fdfadesi915696ejz.429.2023.03.13.16.37.23; Mon, 13 Mar 2023 16:37:23 -0700 (PDT) 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=F37X0Fmk; 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 942EC68BD6C; Tue, 14 Mar 2023 01:37:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7C9968AFCE for ; Tue, 14 Mar 2023 01:37:15 +0200 (EET) Received: by mail-qt1-f181.google.com with SMTP id y10so15116549qtj.2 for ; Mon, 13 Mar 2023 16:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vimeo.com; s=google; t=1678750634; 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=ymfQf6Gk/GHOPMbCG3+2/6swfTW3NU6YXtFmn4p3aR0=; b=F37X0Fmk69Ejt08tI3uWiqvWQIANzePtAYzMWX/F+7Fi+6JeaTPnch21m6wZRIb4VB tVB35vMrV+t9vH5rfm5mXe5ZzCzT2FsG+X98BCr69XFjsA6Pn4pBLLSROMF0QvUP3Qiv 1lC4C7IXZfE14KxQtZ2RWDXpLS1n7+RSgdTzg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678750634; 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=ymfQf6Gk/GHOPMbCG3+2/6swfTW3NU6YXtFmn4p3aR0=; b=hFmYrAbd3BCgOc3zORydhgQxcLCg5wMxiMY+T1Hu4W76/6pXHCz4fOq9ZQmvcSiUqs /s6wOZxqwSohZfy1t36N3DyyPdNj8CElHgWIgx6tm/Da5xDrD6JiPwG+QwCGuCoKeGb/ R1+YfSEJlyM/zfzFK8/G8rnQcgVzdGpE3itYRYIJ2VCy4zGS0k66dhpcSL2SOnLMMQdu Oi/2bSXfCRA4U3eJ0NrcfS1CP+if2mW6csVYDGc1/Rn7pkNmsNqAPOkXeRWwcVrmV3V+ qmIs0pFPpWsS626RHNDR/BSSjzfgO9189FIkjMI3ojQ15Jlg1UkxcSSXR0CFNc4eDNRE griw== X-Gm-Message-State: AO0yUKX6FXDIfIrTlUrN2BJdfsmWrYd/tn6gDwA3X7ZTOB/1T95YSUXY jxOqwY+4d+SoX4MKIKA1F+TDskXL+qEgBNuWE+z7lA== X-Received: by 2002:ac8:5dd0:0:b0:3bf:b6ba:1c1f with SMTP id e16-20020ac85dd0000000b003bfb6ba1c1fmr63078032qtx.10.1678750634244; Mon, 13 Mar 2023 16:37:14 -0700 (PDT) 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 do51-20020a05620a2b3300b007435a646354sm690057qkb.0.2023.03.13.16.37.12 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Mar 2023 16:37:13 -0700 (PDT) Message-ID: <346a1d99-111e-1fd8-c52c-37145c9b9214@vimeo.com> Date: Mon, 13 Mar 2023 19:37:12 -0400 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 v6 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: 8eVbYDTtUAR0 Co-authored-by: Mohammad Izadi Signed-off-by: Raphaël Zumer --- doc/APIchanges | 5 ++ libavutil/hdr_dynamic_metadata.c | 148 +++++++++++++++++++++++++++++++ libavutil/hdr_dynamic_metadata.h | 13 +++ libavutil/version.h | 2 +- 4 files changed, 167 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 14737223cb..3a61d61931 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,11 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-03-13 - xxxxxxxxxx - lavu 58.4.100 - hdr_dynamic_metadata.h + Add av_dynamic_hdr_plus_from_t35() and av_dynamic_hdr_plus_to_t35() + functions to convert between raw T.35 payloads containing dynamic + HDR10+ metadata and their parsed representations as AVDynamicHDRPlus. + 2023-03-02 - xxxxxxxxxx - lavc 60.6.100 - avcodec.h Add FF_PROFILE_EAC3_DDP_ATMOS, FF_PROFILE_TRUEHD_ATMOS, FF_PROFILE_DTS_HD_MA_X and FF_PROFILE_DTS_HD_MA_X_IMAX. diff --git a/libavutil/hdr_dynamic_metadata.c b/libavutil/hdr_dynamic_metadata.c index 223db2fd66..da3c5f4947 100644 --- a/libavutil/hdr_dynamic_metadata.c +++ b/libavutil/hdr_dynamic_metadata.c @@ -20,6 +20,7 @@ #include "hdr_dynamic_metadata.h" #include "mem.h" +#include "libavcodec/defs.h" #include "libavcodec/get_bits.h" #include "libavcodec/put_bits.h" @@ -225,3 +226,150 @@ int av_dynamic_hdr_plus_from_t35(AVDynamicHDRPlus *s, const uint8_t *data, return 0; } + +int av_dynamic_hdr_plus_to_t35(const AVDynamicHDRPlus *s, uint8_t **data, size_t *size) +{ + uint8_t *buf; + size_t size_bits, size_bytes; + PutBitContext pbc, *pb = &pbc; + + if (!s || !data) + return AVERROR(EINVAL); + + /** + * Buffer size per CTA-861-H p.253-254: + * 48 bits for the header (56 minus excluded 8-bit country code) + * 2 bits for num_windows + * 937 bits for window geometry, for each window above 1 + * 27 bits for targeted_system_display_maximum_luminance + * 1-3855 bits for targeted system display peak luminance information + * 0-442 bits for intra-window pixel distribution information + * 1-3855 bits for mastering display peak luminance information + * 0-537 bits for per-window tonemapping information + * 0-21 bits for per-window color saturation mapping information + */ + size_bits = 48 + + 2 + + FFMAX((s->num_windows - 1), 0) * 937 + + 27 + + 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) + + s->num_windows * 82; + + for (int w = 0; w < s->num_windows; w++) + size_bits += s->params[w].num_distribution_maxrgb_percentiles * 24; + + 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) + + 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; + } + + 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; + + // Pad the allocated buffer to account for optimized readers that may use it directly. + buf = av_malloc(size_bytes + AV_INPUT_BUFFER_PADDING_SIZE); + if (!buf) + return AVERROR(ENOMEM); + + init_put_bits(pb, buf, size_bytes); + + // itu_t_t35_country_code shall be 0xB5 (USA) (excluded from the payload) + // 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); + + *data = buf; + if (size) + *size = size_bytes; + return 0; +} diff --git a/libavutil/hdr_dynamic_metadata.h b/libavutil/hdr_dynamic_metadata.h index 3d327241c1..52b4660f7d 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,16 @@ AVDynamicHDRPlus *av_dynamic_hdr_plus_create_side_data(AVFrame *frame); int av_dynamic_hdr_plus_from_t35(AVDynamicHDRPlus *s, const uint8_t *data, size_t size); +/** + * Serialize dynamic HDR10+ metadata to a user data registered ITU-T T.35 buffer, + * excluding the country code and beginning with the terminal provider code. + * @param s A pointer containing the decoded AVDynamicHDRPlus structure. + * @param data A pointer to a byte buffer to be allocated and filled + * with the serialized metadata. + * @param size A pointer to a size to be set to the returned buffer's size (optional). + * + * @return 0 if succeed. Otherwise, returns the appropriate AVERROR. + */ +int av_dynamic_hdr_plus_to_t35(const AVDynamicHDRPlus *s, uint8_t **data, size_t *size); + #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, \